Skip to content

Commit cff16d5

Browse files
grimmthejowgrimmthejow
committed
Merge branch 'main' of https://github.com/Yamenher/XMusic into experimental
2 parents 76680ba + f285423 commit cff16d5

45 files changed

Lines changed: 1607 additions & 42 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎app/build.gradle‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,19 +38,20 @@ dependencies {
3838
implementation 'com.github.bumptech.glide:glide:5.0.3'
3939
implementation 'com.google.code.gson:gson:2.13.1'
4040
implementation 'com.google.android.material:material:1.13.0'
41-
implementation 'com.github.mmmelik:RoundedImageView:v1.0.1'
42-
implementation 'androidx.transition:transition:1.6.0'
41+
implementation 'com.github.mmmelik:RoundedImageView:v1.0.1'
42+
implementation 'androidx.transition:transition:1.6.0'
4343
implementation 'androidx.fragment:fragment:1.8.9'
4444
implementation 'androidx.palette:palette:1.0.0'
4545
implementation 'androidx.media3:media3-common:1.8.0'
4646
implementation 'androidx.media3:media3-exoplayer:1.8.0'
4747
implementation 'androidx.media3:media3-session:1.8.0'
48-
implementation 'androidx.core:core-splashscreen:1.2.0-rc01'
48+
implementation 'androidx.core:core-splashscreen:1.2.0-rc01'
4949
implementation 'androidx.activity:activity:1.11.0'
5050
implementation 'androidx.media:media:1.7.1'
5151
implementation 'androidx.customview:customview-poolingcontainer:1.0.0'
52-
implementation 'androidx.recyclerview:recyclerview:1.4.0'
53-
implementation 'com.github.bumptech.glide:recyclerview-integration:4.14.2'
54-
implementation project(':vumeterlibrary')
52+
implementation 'androidx.recyclerview:recyclerview:1.4.0'
53+
implementation 'com.github.bumptech.glide:recyclerview-integration:4.14.2'
54+
implementation project(':vumeterlibrary')
55+
implementation project(':fastui')
5556

5657
}

‎app/src/main/res/drawable/drawable_settings_item_background.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:color="?android:attr/colorControlHighlight">
4+
5+
<item>
6+
<shape android:shape="rectangle">
7+
<corners android:radius="15dp"/>
8+
<solid android:color="?colorSurface"/>
9+
</shape>
10+
</item>
11+
12+
</ripple>

‎app/src/main/res/drawable/ic_android.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="960" android:viewportWidth="960" android:width="24dp">
2+
3+
<path android:fillColor="@android:color/white" android:pathData="M40,720Q49,613 105.5,523Q162,433 256,380L182,252Q176,243 179,233Q182,223 192,218Q200,213 210,216Q220,219 226,228L300,356Q386,320 480,320Q574,320 660,356L734,228Q740,219 750,216Q760,213 768,218Q778,223 781,233Q784,243 778,252L704,380Q798,433 854.5,523Q911,613 920,720L40,720ZM280,610Q301,610 315.5,595.5Q330,581 330,560Q330,539 315.5,524.5Q301,510 280,510Q259,510 244.5,524.5Q230,539 230,560Q230,581 244.5,595.5Q259,610 280,610ZM680,610Q701,610 715.5,595.5Q730,581 730,560Q730,539 715.5,524.5Q701,510 680,510Q659,510 644.5,524.5Q630,539 630,560Q630,581 644.5,595.5Q659,610 680,610Z"/>
4+
5+
</vector>

‎app/src/main/res/drawable/ic_arrow_back.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="24dp" android:tint="?colorOnBackground" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
2+
3+
<path android:fillColor="@android:color/white" android:pathData="M19,11H7.83l4.88,-4.88c0.39,-0.39 0.39,-1.03 0,-1.42 -0.39,-0.39 -1.02,-0.39 -1.41,0l-6.59,6.59c-0.39,0.39 -0.39,1.02 0,1.41l6.59,6.59c0.39,0.39 1.02,0.39 1.41,0 0.39,-0.39 0.39,-1.02 0,-1.41L7.83,13H19c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1z"/>
4+
5+
</vector>

‎app/src/main/res/drawable/ic_palette.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="?colorOnBackground" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
2+
3+
<path android:fillColor="@android:color/white" android:pathData="M12,2C6.49,2 2,6.49 2,12s4.49,10 10,10c1.38,0 2.5,-1.12 2.5,-2.5c0,-0.61 -0.23,-1.2 -0.64,-1.67c-0.08,-0.1 -0.13,-0.21 -0.13,-0.33c0,-0.28 0.22,-0.5 0.5,-0.5H16c3.31,0 6,-2.69 6,-6C22,6.04 17.51,2 12,2zM17.5,13c-0.83,0 -1.5,-0.67 -1.5,-1.5c0,-0.83 0.67,-1.5 1.5,-1.5s1.5,0.67 1.5,1.5C19,12.33 18.33,13 17.5,13zM14.5,9C13.67,9 13,8.33 13,7.5C13,6.67 13.67,6 14.5,6S16,6.67 16,7.5C16,8.33 15.33,9 14.5,9zM5,11.5C5,10.67 5.67,10 6.5,10S8,10.67 8,11.5C8,12.33 7.33,13 6.5,13S5,12.33 5,11.5zM11,7.5C11,8.33 10.33,9 9.5,9S8,8.33 8,7.5C8,6.67 8.67,6 9.5,6S11,6.67 11,7.5z"/>
4+
5+
</vector>

‎app/src/main/res/drawable/round_square_avd.xml‎

Lines changed: 9 additions & 10 deletions
Large diffs are not rendered by default.

‎app/src/main/res/drawable/scallop_avd.xml‎

Lines changed: 9 additions & 9 deletions
Large diffs are not rendered by default.

‎app/src/main/res/layout/settings.xml‎

Lines changed: 31 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,56 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:app="http://schemas.android.com/apk/res-auto"
4+
xmlns:tools="http://schemas.android.com/tools"
45
android:id="@+id/coordinator"
56
android:layout_width="match_parent"
67
android:layout_height="match_parent"
78
android:background="?colorSurface">
89

910
<com.google.android.material.appbar.AppBarLayout
10-
android:id="@+id/appbar"
11-
android:layout_width="match_parent"
1211
android:layout_height="wrap_content"
13-
app:layout_behavior="com.google.android.material.appbar.AppBarLayout$Behavior">
12+
android:layout_width="match_parent"
13+
app:layout_behavior="com.google.android.material.appbar.AppBarLayout$Behavior"
14+
android:fitsSystemWindows="true"
15+
android:id="@+id/appbar">
1416

15-
<com.google.android.material.appbar.MaterialToolbar
16-
android:id="@+id/toolbar"
17+
<com.google.android.material.appbar.CollapsingToolbarLayout
18+
android:layout_height="?attr/collapsingToolbarLayoutLargeSize"
1719
android:layout_width="match_parent"
18-
android:layout_height="?attr/actionBarSize" />
20+
android:id="@+id/collapsingtoolbar"
21+
app:contentScrim="@android:color/transparent"
22+
app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
23+
24+
<com.google.android.material.appbar.MaterialToolbar
25+
android:layout_height="?attr/actionBarSize"
26+
android:layout_width="match_parent"
27+
app:title="Settings"
28+
app:navigationIcon="@drawable/ic_arrow_back"
29+
app:layout_collapseMode="pin"
30+
android:id="@+id/toolbar" />
31+
32+
</com.google.android.material.appbar.CollapsingToolbarLayout>
1933

2034
</com.google.android.material.appbar.AppBarLayout>
2135

2236
<androidx.core.widget.NestedScrollView
23-
android:id="@+id/nested_scroll_view"
24-
android:layout_width="match_parent"
2537
android:layout_height="match_parent"
26-
app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
38+
android:layout_width="match_parent"
39+
app:layout_behavior="@string/appbar_scrolling_view_behavior"
40+
android:id="@+id/nested_scroll_view">
2741

2842
<LinearLayout
2943
android:layout_height="match_parent"
30-
android:layout_width="match_parent">
31-
32-
<TextView
33-
android:layout_height="wrap_content"
34-
android:layout_width="wrap_content"
35-
android:text="test" />
44+
android:layout_width="match_parent"
45+
android:padding="20dp"
46+
android:id="@+id/linear1"
47+
android:orientation="vertical">
48+
49+
50+
3651

3752
</LinearLayout>
38-
53+
3954

4055
</androidx.core.widget.NestedScrollView>
4156

‎build.gradle‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ buildscript {
66
}
77
dependencies {
88
classpath 'com.android.tools.build:gradle:8.9.1'
9+
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10'
10+
classpath 'com.google.gms:google-services:4.3.15'
911
}
1012
}
1113

‎fastui/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/build

0 commit comments

Comments
 (0)