diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index ff031b45c..ae3b9b516 100755
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -13,7 +13,7 @@ android {
buildToolsVersion = "30.0.3"
defaultConfig {
applicationId = "com.zionhuang.music"
- minSdk = 26
+ minSdk = 24
targetSdk = 32
versionCode = 11
versionName = "0.4.0"
@@ -48,6 +48,7 @@ android {
}
}
compileOptions {
+ isCoreLibraryDesugaringEnabled = true
sourceCompatibility(JavaVersion.VERSION_1_8)
targetCompatibility(JavaVersion.VERSION_1_8)
}
@@ -109,7 +110,7 @@ dependencies {
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4")
- implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.3")
+ implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.0")
// AndroidX
implementation("androidx.core:core-ktx:1.8.0")
implementation("androidx.appcompat:appcompat:1.5.1")
@@ -153,11 +154,13 @@ dependencies {
// OkHttp
implementation("com.squareup.okhttp3:okhttp:4.10.0")
// Coil
- implementation("io.coil-kt:coil:2.2.0")
+ implementation("io.coil-kt:coil:2.2.1")
// Fast Scroll
- implementation("me.zhanghai.android.fastscroll:library:1.1.7")
+ implementation("me.zhanghai.android.fastscroll:library:1.1.8")
// Markdown
implementation("org.commonmark:commonmark:0.18.2")
+ // Desugaring
+ coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.1.5")
// Test
testImplementation("junit:junit:4.13.2")
androidTestImplementation("android.arch.core:core-testing:1.1.1")
@@ -165,7 +168,7 @@ dependencies {
androidTestImplementation("androidx.test:runner:1.4.0")
androidTestImplementation("androidx.test:rules:1.4.0")
androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0")
- testImplementation("org.mockito:mockito-core:4.3.1")
+ testImplementation("org.mockito:mockito-core:4.8.0")
testImplementation("org.mockito:mockito-inline:4.3.1")
testImplementation("org.mockito:mockito-android:4.3.1")
testImplementation("com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0")
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ff0be3196..7c695bd5d 100755
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,7 +21,8 @@
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
- android:theme="@style/AppTheme">
+ android:theme="@style/AppTheme"
+ tools:targetApi="o">
diff --git a/app/src/main/java/com/zionhuang/music/db/daos/SongDao.kt b/app/src/main/java/com/zionhuang/music/db/daos/SongDao.kt
index 4576e8cd3..3d24bc47c 100644
--- a/app/src/main/java/com/zionhuang/music/db/daos/SongDao.kt
+++ b/app/src/main/java/com/zionhuang/music/db/daos/SongDao.kt
@@ -49,6 +49,7 @@ interface SongDao {
fun getPlaylistSongsAsFlow(playlistId: String): Flow>
@Transaction
+ @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH)
@Query("SELECT * FROM song WHERE download_state = $STATE_DOWNLOADED")
suspend fun getDownloadedSongsAsList(): List
diff --git a/app/src/main/java/com/zionhuang/music/ui/widgets/PlayPauseButton.kt b/app/src/main/java/com/zionhuang/music/ui/widgets/PlayPauseButton.kt
index bc035b4c3..3c823bf1c 100644
--- a/app/src/main/java/com/zionhuang/music/ui/widgets/PlayPauseButton.kt
+++ b/app/src/main/java/com/zionhuang/music/ui/widgets/PlayPauseButton.kt
@@ -28,9 +28,11 @@ class PlayPauseButton : AppCompatImageView {
constructor(context: Context) : this(context, null)
constructor(context: Context, attrs: AttributeSet?) : this(context, attrs, 0)
constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {
- val tintResId = context
- .obtainStyledAttributes(attrs, R.styleable.PlayPauseButton)
- .getColor(R.styleable.PlayPauseButton_playPauseButtonTint, resources.getColor(R.color.colorInverted, context.theme))
+ val tintResId = context.obtainStyledAttributes(attrs, R.styleable.PlayPauseButton).let {
+ val res = it.getColor(R.styleable.PlayPauseButton_playPauseButtonTint, resources.getColor(R.color.colorInverted, context.theme))
+ it.recycle()
+ res
+ }
playAnimation.setTint(tintResId)
pauseAnimation.setTint(tintResId)
playDrawable.setTint(tintResId)
diff --git a/app/src/main/res/drawable-hdpi/ic_notification.png b/app/src/main/res/drawable-hdpi/ic_notification.png
deleted file mode 100644
index a15bb6110..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_notification.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_notification.png b/app/src/main/res/drawable-mdpi/ic_notification.png
deleted file mode 100644
index 67cfadf1b..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_notification.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_notification.png b/app/src/main/res/drawable-xhdpi/ic_notification.png
deleted file mode 100644
index b69980a58..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_notification.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_notification.png b/app/src/main/res/drawable-xxhdpi/ic_notification.png
deleted file mode 100644
index fbbf4a361..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_notification.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_access_time.xml b/app/src/main/res/drawable/ic_access_time.xml
deleted file mode 100644
index 44dd535c6..000000000
--- a/app/src/main/res/drawable/ic_access_time.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
diff --git a/app/src/main/res/drawable/ic_clear.xml b/app/src/main/res/drawable/ic_clear.xml
deleted file mode 100644
index ede4b7108..000000000
--- a/app/src/main/res/drawable/ic_clear.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_language.xml b/app/src/main/res/drawable/ic_language.xml
index 5d838a551..0cbccad48 100644
--- a/app/src/main/res/drawable/ic_language.xml
+++ b/app/src/main/res/drawable/ic_language.xml
@@ -1,10 +1,12 @@
-
+ android:viewportHeight="24">
+
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100755
index eed7a4258..000000000
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable/ic_library_music.xml b/app/src/main/res/drawable/ic_library_music.xml
deleted file mode 100644
index 3de22fe82..000000000
--- a/app/src/main/res/drawable/ic_library_music.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-anydpi/ic_notification.xml b/app/src/main/res/drawable/ic_notification.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi/ic_notification.xml
rename to app/src/main/res/drawable/ic_notification.xml
diff --git a/app/src/main/res/drawable/ic_notifications.xml b/app/src/main/res/drawable/ic_notifications.xml
deleted file mode 100644
index 78b75c39b..000000000
--- a/app/src/main/res/drawable/ic_notifications.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_person.xml b/app/src/main/res/drawable/ic_person.xml
deleted file mode 100644
index 64194a275..000000000
--- a/app/src/main/res/drawable/ic_person.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_refresh.xml b/app/src/main/res/drawable/ic_refresh.xml
deleted file mode 100644
index f15525471..000000000
--- a/app/src/main/res/drawable/ic_refresh.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_save.xml b/app/src/main/res/drawable/ic_save.xml
deleted file mode 100644
index 9e2528508..000000000
--- a/app/src/main/res/drawable/ic_save.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_sort.xml b/app/src/main/res/drawable/ic_sort.xml
deleted file mode 100644
index 4158a952c..000000000
--- a/app/src/main/res/drawable/ic_sort.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_stop.xml b/app/src/main/res/drawable/ic_stop.xml
deleted file mode 100644
index 156774371..000000000
--- a/app/src/main/res/drawable/ic_stop.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_storage.xml b/app/src/main/res/drawable/ic_storage.xml
deleted file mode 100644
index bab38ce55..000000000
--- a/app/src/main/res/drawable/ic_storage.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_subscriptions.xml b/app/src/main/res/drawable/ic_subscriptions.xml
deleted file mode 100644
index d64e285a9..000000000
--- a/app/src/main/res/drawable/ic_subscriptions.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_testing.xml b/app/src/main/res/drawable/ic_testing.xml
index cf576cbce..eba9bdf66 100644
--- a/app/src/main/res/drawable/ic_testing.xml
+++ b/app/src/main/res/drawable/ic_testing.xml
@@ -1,4 +1,5 @@
+ android:pathData="M8.275,11Q7.7,11 7.4,10.488Q7.1,9.975 7.425,9.475L11.15,3.4Q11.45,2.925 12,2.925Q12.55,2.925 12.85,3.4L16.575,9.475Q16.9,9.975 16.6,10.488Q16.3,11 15.725,11ZM17.5,22Q15.625,22 14.312,20.688Q13,19.375 13,17.5Q13,15.625 14.312,14.312Q15.625,13 17.5,13Q19.375,13 20.688,14.312Q22,15.625 22,17.5Q22,19.375 20.688,20.688Q19.375,22 17.5,22ZM4,21.5Q3.575,21.5 3.288,21.212Q3,20.925 3,20.5V14.5Q3,14.075 3.288,13.787Q3.575,13.5 4,13.5H10Q10.425,13.5 10.713,13.787Q11,14.075 11,14.5V20.5Q11,20.925 10.713,21.212Q10.425,21.5 10,21.5ZM17.5,20Q18.55,20 19.275,19.275Q20,18.55 20,17.5Q20,16.45 19.275,15.725Q18.55,15 17.5,15Q16.45,15 15.725,15.725Q15,16.45 15,17.5Q15,18.55 15.725,19.275Q16.45,20 17.5,20ZM5,19.5H9V15.5H5ZM10.05,9H13.95L12,5.85ZM12,9ZM9,15.5ZM17.5,17.5Q17.5,17.5 17.5,17.5Q17.5,17.5 17.5,17.5Q17.5,17.5 17.5,17.5Q17.5,17.5 17.5,17.5Q17.5,17.5 17.5,17.5Q17.5,17.5 17.5,17.5Q17.5,17.5 17.5,17.5Q17.5,17.5 17.5,17.5Z"
+ tools:ignore="VectorPath" />
diff --git a/app/src/main/res/drawable/ic_update.xml b/app/src/main/res/drawable/ic_update.xml
deleted file mode 100644
index 2425d976a..000000000
--- a/app/src/main/res/drawable/ic_update.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_upgrade.xml b/app/src/main/res/drawable/ic_upgrade.xml
deleted file mode 100644
index db27e882a..000000000
--- a/app/src/main/res/drawable/ic_upgrade.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_vpn_key.xml b/app/src/main/res/drawable/ic_vpn_key.xml
deleted file mode 100644
index 93276f3b3..000000000
--- a/app/src/main/res/drawable/ic_vpn_key.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/round_background.xml b/app/src/main/res/drawable/round_background.xml
deleted file mode 100644
index 68c8be17f..000000000
--- a/app/src/main/res/drawable/round_background.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 17619e2e8..aaa71f359 100755
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -5,19 +5,13 @@
android:layout_height="match_parent"
tools:context=".ui.activities.MainActivity">
-
-
-
-
-
-
-
+ android:fitsSystemWindows="true"
+ tools:ignore="PrivateResource">
+ android:clickable="true"
+ android:focusable="true">
@@ -269,6 +271,7 @@
android:layout_margin="6dp"
android:background="?selectableItemBackgroundBorderless"
android:clickable="true"
+ android:focusable="true"
android:scaleType="center"
android:src="@drawable/ic_favorite_border"
android:visibility="gone" />
@@ -280,6 +283,7 @@
android:layout_margin="6dp"
android:background="?selectableItemBackgroundBorderless"
android:clickable="true"
+ android:focusable="true"
android:scaleType="center"
android:src="@drawable/ic_share" />
@@ -384,6 +388,7 @@
android:layout_width="36dp"
android:layout_height="36dp"
android:clickable="true"
+ android:focusable="true"
android:onClick="@{()->viewModel.toggleRepeatMode()}"
android:padding="4dp"
app:layout_constraintBottom_toBottomOf="@id/btn_play_pause"
diff --git a/app/src/main/res/layout/dialog_choose_playlist.xml b/app/src/main/res/layout/dialog_choose_playlist.xml
index a0f828f86..41611a1fd 100644
--- a/app/src/main/res/layout/dialog_choose_playlist.xml
+++ b/app/src/main/res/layout/dialog_choose_playlist.xml
@@ -14,6 +14,7 @@
android:layout_height="@dimen/list_item_height"
android:background="?selectableItemBackground"
android:clickable="true"
+ android:focusable="true"
android:orientation="horizontal">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/layout/fragment_youtube_suggestion.xml b/app/src/main/res/layout/fragment_youtube_suggestion.xml
index adf1bf534..62896cc6f 100644
--- a/app/src/main/res/layout/fragment_youtube_suggestion.xml
+++ b/app/src/main/res/layout/fragment_youtube_suggestion.xml
@@ -43,7 +43,7 @@
android:layout_marginEnd="12dp"
android:background="?attr/actionBarItemBackground"
android:padding="5dp"
- app:srcCompat="@drawable/ic_close" />
+ android:src="@drawable/ic_close" />
+ android:src="@drawable/ic_keyboard_voice" />
diff --git a/app/src/main/res/layout/item_album.xml b/app/src/main/res/layout/item_album.xml
index 22aede28e..155b79b0d 100644
--- a/app/src/main/res/layout/item_album.xml
+++ b/app/src/main/res/layout/item_album.xml
@@ -15,6 +15,7 @@
android:layout_height="@dimen/list_item_height"
android:background="?android:selectableItemBackground"
android:clickable="true"
+ android:focusable="true"
android:orientation="vertical"
android:paddingStart="6dp"
android:paddingEnd="6dp">
@@ -91,6 +92,7 @@
android:layout_marginEnd="6dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:clickable="true"
+ android:focusable="true"
android:padding="5dp"
android:scaleType="center"
android:tint="?android:textColorPrimary"
diff --git a/app/src/main/res/layout/item_artist.xml b/app/src/main/res/layout/item_artist.xml
index 49865566c..b4930ff44 100644
--- a/app/src/main/res/layout/item_artist.xml
+++ b/app/src/main/res/layout/item_artist.xml
@@ -15,6 +15,7 @@
android:layout_height="@dimen/list_item_height"
android:background="?android:selectableItemBackground"
android:clickable="true"
+ android:focusable="true"
android:orientation="vertical"
android:paddingStart="6dp"
android:paddingEnd="6dp">
@@ -93,6 +94,7 @@
android:layout_marginEnd="6dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:clickable="true"
+ android:focusable="true"
android:padding="5dp"
android:scaleType="center"
android:tint="?android:textColorPrimary"
diff --git a/app/src/main/res/layout/item_local_list.xml b/app/src/main/res/layout/item_local_list.xml
deleted file mode 100644
index fe7d06f33..000000000
--- a/app/src/main/res/layout/item_local_list.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/layout/item_playlist.xml b/app/src/main/res/layout/item_playlist.xml
index f5156f5d6..0f2af2620 100644
--- a/app/src/main/res/layout/item_playlist.xml
+++ b/app/src/main/res/layout/item_playlist.xml
@@ -17,6 +17,7 @@
android:layout_height="@dimen/list_item_height"
android:background="?android:selectableItemBackground"
android:clickable="true"
+ android:focusable="true"
android:orientation="vertical"
android:paddingStart="6dp"
android:paddingEnd="6dp">
@@ -38,12 +39,12 @@
android:layout_height="@dimen/list_thumbnail_size"
android:layout_marginStart="6dp"
android:layout_marginEnd="6dp"
- app:strokeWidth="0dp"
app:cardCornerRadius="@dimen/thumbnail_radius"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/content"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent">
+ app:layout_constraintTop_toTopOf="parent"
+ app:strokeWidth="0dp">
@@ -106,6 +107,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginEnd="6dp"
+ android:contentDescription="@null"
android:padding="5dp"
android:scaleType="center"
app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/item_song.xml b/app/src/main/res/layout/item_song.xml
index 06de016f3..1d1231171 100644
--- a/app/src/main/res/layout/item_song.xml
+++ b/app/src/main/res/layout/item_song.xml
@@ -19,6 +19,7 @@
android:layout_height="@dimen/list_item_height"
android:background="?android:selectableItemBackground"
android:clickable="true"
+ android:focusable="true"
android:orientation="vertical"
android:paddingStart="6dp"
android:paddingEnd="6dp">
@@ -123,6 +124,7 @@
android:layout_marginEnd="12dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:clickable="true"
+ android:focusable="true"
android:padding="5dp"
android:scaleType="center"
android:tint="?android:textColorPrimary"
diff --git a/app/src/main/res/layout/item_youtube_list.xml b/app/src/main/res/layout/item_youtube_list.xml
index f0b8352f6..06ddb530f 100644
--- a/app/src/main/res/layout/item_youtube_list.xml
+++ b/app/src/main/res/layout/item_youtube_list.xml
@@ -21,6 +21,7 @@
android:layout_height="@dimen/list_item_height"
android:background="?android:selectableItemBackground"
android:clickable="true"
+ android:focusable="true"
android:paddingStart="6dp"
android:paddingEnd="6dp">
@@ -131,6 +132,7 @@
android:layout_marginEnd="6dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:clickable="true"
+ android:focusable="true"
android:padding="5dp"
android:scaleType="center"
android:tint="?android:textColorPrimary"
diff --git a/app/src/main/res/layout/item_youtube_navigation.xml b/app/src/main/res/layout/item_youtube_navigation.xml
index d587acf85..7bd8eed7f 100644
--- a/app/src/main/res/layout/item_youtube_navigation.xml
+++ b/app/src/main/res/layout/item_youtube_navigation.xml
@@ -17,6 +17,7 @@
android:layout_height="wrap_content"
android:background="?android:selectableItemBackground"
android:clickable="true"
+ android:focusable="true"
android:orientation="horizontal"
android:padding="12dp">
diff --git a/app/src/main/res/layout/item_youtube_navigation_tile.xml b/app/src/main/res/layout/item_youtube_navigation_tile.xml
index 459b35adc..434b89e15 100644
--- a/app/src/main/res/layout/item_youtube_navigation_tile.xml
+++ b/app/src/main/res/layout/item_youtube_navigation_tile.xml
@@ -18,6 +18,7 @@
android:layout_height="54dp"
android:layout_margin="8dp"
android:clickable="true"
+ android:focusable="true"
app:strokeColor="@{item.stripeColor.intValue()}"
tools:strokeColor="?colorOnSurface">
diff --git a/app/src/main/res/layout/item_youtube_square.xml b/app/src/main/res/layout/item_youtube_square.xml
index 92864ad7b..5503b1029 100644
--- a/app/src/main/res/layout/item_youtube_square.xml
+++ b/app/src/main/res/layout/item_youtube_square.xml
@@ -17,6 +17,7 @@
android:layout_height="wrap_content"
android:background="?android:selectableItemBackground"
android:clickable="true"
+ android:focusable="true"
android:orientation="vertical"
android:padding="12dp">
diff --git a/app/src/main/res/layout/item_youtube_suggestion.xml b/app/src/main/res/layout/item_youtube_suggestion.xml
index 85d85e112..0460cc8bb 100644
--- a/app/src/main/res/layout/item_youtube_suggestion.xml
+++ b/app/src/main/res/layout/item_youtube_suggestion.xml
@@ -20,7 +20,8 @@
android:layout_width="match_parent"
android:layout_height="@dimen/suggestion_item_height"
android:background="?android:selectableItemBackground"
- android:clickable="true">
+ android:clickable="true"
+ android:focusable="true">
+
-
\ No newline at end of file
diff --git a/app/src/main/res/menu/settings.xml b/app/src/main/res/menu/settings.xml
deleted file mode 100644
index a50004f0f..000000000
--- a/app/src/main/res/menu/settings.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
\ No newline at end of file
diff --git a/app/src/main/res/menu/stream.xml b/app/src/main/res/menu/stream.xml
deleted file mode 100644
index 6683ef254..000000000
--- a/app/src/main/res/menu/stream.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
similarity index 100%
rename from app/src/main/res/mipmap-anydpi/ic_launcher.xml
rename to app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
similarity index 100%
rename from app/src/main/res/mipmap-anydpi/ic_launcher_round.xml
rename to app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/app/src/main/res/values-es-rUS/strings.xml b/app/src/main/res/values-es-rUS/strings.xml
index 985007dea..1f2b76cdc 100644
--- a/app/src/main/res/values-es-rUS/strings.xml
+++ b/app/src/main/res/values-es-rUS/strings.xml
@@ -4,7 +4,6 @@
Canciones
Artistas
Albums
- Canales
Playlists
Buscar
Configuración
@@ -234,7 +233,6 @@
Playlists
Community playlists
Featured playlists
- Canales
Predeterminado del sistema
From your library
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index bc0148367..5f6d670b4 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -4,7 +4,6 @@
Canciones
Artistas
Albums
- Canales
Listas de reproducción
Explorar
Ajustes
@@ -234,7 +233,6 @@
Listas de reproducción
Community playlists
Featured playlists
- Canales
Sistema por defecto
From your library
diff --git a/app/src/main/res/values-fi-rFI/strings.xml b/app/src/main/res/values-fi-rFI/strings.xml
index 213903313..11ea187b9 100644
--- a/app/src/main/res/values-fi-rFI/strings.xml
+++ b/app/src/main/res/values-fi-rFI/strings.xml
@@ -4,7 +4,6 @@
Kappaleet
Artistit
Albums
- Kanavat
Soittolistat
Tutustu
Asetukset
@@ -234,7 +233,6 @@
Soittolistat
Community playlists
Featured playlists
- Kanavat
Järjestelmän oletus
From your library
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index 4fa42ad27..ab16471aa 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -4,7 +4,6 @@
Chansons
Artistes
Albums
- Chaînes
Listes de lecture
Explore
Paramètres
@@ -238,7 +237,6 @@
Listes de lecture
Community playlists
Featured playlists
- Chaînes
Système par défaut
From your library
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 6b3e1e30f..eadcc1fab 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -4,7 +4,6 @@
Brani
Artisti
Albums
- Canali
Playlist
Esplora
Impostazioni
@@ -234,7 +233,6 @@
Playlist
Playlist della comunità
Playlist in rilievo
- Canali
Predefinito di sistema
Dalla tua libreria
diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml
index cd0bd2fd8..95e5b3a0c 100644
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@@ -4,7 +4,6 @@
曲
アーティスト
Albums
- チャンネル
プレイリスト
探索
設定
@@ -228,7 +227,6 @@
プレイリスト
Community playlists
Featured playlists
- チャンネル
システムに従う
From your library
diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml
index 6c3df890a..c463b567e 100644
--- a/app/src/main/res/values-ko-rKR/strings.xml
+++ b/app/src/main/res/values-ko-rKR/strings.xml
@@ -4,7 +4,6 @@
노래
아티스트
Albums
- 채널
플레이리스트
탐색
설정
@@ -228,7 +227,6 @@
플레이리스트
Community playlists
Featured playlists
- 채널
시스템 기본값
From your library
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index d58bfe46e..935d23550 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -4,7 +4,6 @@
Músicas
Artistas
Albums
- Canais
Playlists
Explorar
Configurações
@@ -234,7 +233,6 @@
Playlists
Community playlists
Featured playlists
- Canais
Padrão do sistema
From your library
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 05a4077b7..bbfb0599b 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -4,7 +4,6 @@
Låtar
Artister
Albums
- Kanaler
Spellistor
Utforska
Inställningar
@@ -234,7 +233,6 @@
Spellistor
Community playlists
Featured playlists
- Kanaler
Systemets standardinställning
From your library
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index e20151f4c..e8947a01d 100755
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -4,7 +4,6 @@
歌曲
藝人
專輯
- 頻道
播放清單
探索
設定
@@ -228,7 +227,6 @@
播放清單
社群播放清單
精選播放清單
- 頻道
系統預設
來自你的媒體庫
diff --git a/app/src/main/res/values/constants.xml b/app/src/main/res/values/constants.xml
index abf5b0f0b..44f46c569 100644
--- a/app/src/main/res/values/constants.xml
+++ b/app/src/main/res/values/constants.xml
@@ -48,24 +48,11 @@
ALBUM_SORT_DESC
PLAYLIST_SORT_TYPE
PLAYLIST_SORT_DESC
- ABOUT_CATEGORY
APP_VERSION
GITHUB
•
-
- playlist_%1$s
- youtube_playlist
- channel_%1$s
- youtube_channel
- artist_%1$d
- artist_songs
- channel_%1$s
- channel_songs
- playlist_%1$d
- playlist_songs
-
- @string/dark_theme_off
- @string/dark_theme_on
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 82db0c793..05395a111 100755
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -7,7 +7,6 @@
128dp
144dp
- 54dp
54dp
4dp
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c759c87c1..a5a2f6f5d 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -4,7 +4,6 @@
Songs
Artists
Albums
- Channels
Playlists
Explore
Settings
@@ -235,7 +234,6 @@
Playlists
Community playlists
Featured playlists
- Channels
System default
From your library
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 6a6c58912..e2b261f07 100755
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -30,12 +30,6 @@
- @style/CustomBottomSheetDialog
-
-
-
-
-
-
+ -->