Merge RetroMusicPlayer/dev into dev

Signed-off-by: Muntashir Al-Islam <muntashirakon@riseup.net>

.gitattributes

@@ -0,0 +1,4 @@
+* text=auto eol=lf
+
+*.bat text eol=crlf
+*.jar binary

.github/workflows/android.yml

@@ -7,28 +7,28 @@ on:
     branches: [ dev ]
 
 jobs:
-  build:
+  check:
-
     runs-on: ubuntu-latest
-
+    timeout-minutes: 10
     steps:
-    - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
-    - name: set up JDK 11
+      - uses: gradle/wrapper-validation-action@v1
-      uses: actions/setup-java@v2
+      - uses: actions/setup-java@v3
-      with:
+        with:
-        java-version: '11'
+          distribution: 'zulu'
-        distribution: 'temurin'
+          java-version: 17
-        cache: gradle
+      - uses: gradle/gradle-build-action@v2
+      - name: Lint Android
+        run: ./gradlew lint
 
-    - name: Generate temporary keystore
+  build:
-      run: keytool -genkey -v -storetype pkcs12 -keystore store.p12 -storepass android -alias android -keyalg RSA -keysize 2048 -validity 10000 -dname CN=CI
+    runs-on: ubuntu-latest
-    - name: Write retro.properties
+    steps:
-      run: |
+      - uses: actions/checkout@v3
-        cat >retro.properties <<EOF
+      - uses: actions/setup-java@v3
-        storeFile=$PWD/store.p12
+        with:
-        keyAlias=android
+          java-version: '17'
-        storePassword=android
+          distribution: 'zulu'
-        keyPassword=android
+      - uses: gradle/gradle-build-action@v2
-        EOF
+      - name: Build
-    - name: Build with Gradle
+        run: ./gradlew app:assemble
-      run: ./gradlew build

README.md

@@ -11,17 +11,18 @@ Material Design music player for Android music lovers
 ## Differences between Metro and [RetroMusicPlayer](https://github.com/h4h13/RetroMusicPlayer)
 - Google Play libraries removed (fully libre)
 - Pro features available for free
+- Fully offline (INTERNET permission removed)
 - Bug fixes
 - Minor differences in UI
 
 ## 📱 Screenshots
 ### App Themes
-| <img src="screenshots/home_light.jpg" width="200"/> | <img src="screenshots/home_dark.jpg" width="200"/> | <img src="screenshots/home_black.jpg" width="200"/> |
+| <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/2.jpg" width="200"/> | <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/3.jpg" width="200"/> | <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/4.jpg" width="200"/> |
 |:---:|:---:|:---:|
 |Clearly white| Kinda dark | Just black|
 
 ### Player screen
-| <img src="screenshots/home_light.jpg" width="200"/>| <img src="screenshots/songs.jpg" width="200"/>| <img src="screenshots/albums.jpg" width="200"/>| <img src="screenshots/artists.jpg" width="200"/>| <img src="screenshots/settings.jpg" width="200"/>|
+| <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/2.jpg" width="200"/>| <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/5.jpg" width="200"/>| <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/6.jpg" width="200"/>| <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/7.jpg" width="200"/>| <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/8.jpg" width="200"/>|
 |:---:|:---:|:---:|:---:|:---:|
 | Home | Songs | Albums | Artists | Settings |
 
@@ -36,7 +37,7 @@ Material Design music player for Android music lovers
 | Synced Replace Cover light | Synced Replace Cover dark | Synced Replace Cover black |
 
 ### 10+ Now playing themes
-| <img src="screenshots/normal.jpg" width="200"/>	|<img src="screenshots/fit.jpg" width="200"/>|   <img src="screenshots/flat.jpg" width="200"/>  	|    <img src="screenshots/color.jpg" width="200"/> 	|     <img src="screenshots/material.jpg" width="200"/>	|
+| <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/1.jpg" width="200"/>	|<img src="screenshots/fit.jpg" width="200"/>|   <img src="screenshots/flat.jpg" width="200"/>  	|    <img src="screenshots/color.jpg" width="200"/> 	|     <img src="screenshots/material.jpg" width="200"/>	|
 |:-----:	|:-----:	|:-----:	|:-----:	|:-----:	|
 | Normal 	| Fit 	| Flat 	| Color 	| Material 	|
 

app/build.gradle

@@ -1,23 +1,22 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-kapt'
 apply plugin: "androidx.navigation.safeargs.kotlin"
 apply plugin: 'kotlin-parcelize'
+apply plugin: 'com.google.devtools.ksp'
 
 android {
-    compileSdk 32
+    compileSdk 33
-    buildToolsVersion = '30.0.3'
+    namespace "code.name.monkey.retromusic"
 
     defaultConfig {
-        namespace 'code.name.monkey.retromusic'
         minSdk 21
         targetSdk 32
 
         vectorDrawables.useSupportLibrary = true
 
         applicationId 'io.github.muntashirakon.Music'
-        versionCode 10580
+        versionCode 10600
-        versionName '5.8.5'
+        versionName '6.0.4'
 
         multiDexEnabled true
     }
@@ -32,7 +31,7 @@ android {
         }
     }
 
-    buildFeatures{
+    buildFeatures {
         viewBinding true
     }
     packagingOptions {
@@ -41,8 +40,8 @@ android {
         }
     }
     lint {
-        abortOnError false
+        abortOnError true
-        disable 'MissingTranslation', 'InvalidPackage'
+        warning 'ImpliedQuantity', 'Instantiatable', 'MissingQuantity', 'MissingTranslation'
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -51,8 +50,11 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
-
+    dependenciesInfo {
-    configurations.all {
+        includeInApk = false
+        includeInBundle = false
+    }
+    configurations.configureEach {
         resolutionStrategy.force 'com.google.code.findbugs:jsr305:1.3.9'
     }
 }
@@ -61,13 +63,13 @@ android {
 dependencies {
     implementation project(':appthemehelper')
     implementation "androidx.gridlayout:gridlayout:1.0.0"
-    implementation "androidx.cardview:cardview:1.0.0"
+
     implementation "androidx.appcompat:appcompat:$appcompat_version"
-    implementation 'androidx.annotation:annotation:1.3.0'
+    implementation 'androidx.annotation:annotation:1.6.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.recyclerview:recyclerview:1.2.1'
+    implementation 'androidx.recyclerview:recyclerview:1.3.0'
     implementation "androidx.preference:preference-ktx:$preference_version"
-    implementation 'androidx.core:core-ktx:1.7.0'
+    implementation "androidx.core:core-ktx:$core_version"
     implementation 'androidx.palette:palette-ktx:1.0.0'
 
     implementation "androidx.media:media:1.6.0"
@@ -76,20 +78,22 @@ dependencies {
     implementation "androidx.navigation:navigation-fragment-ktx:$navigation_version"
     implementation "androidx.navigation:navigation-ui-ktx:$navigation_version"
 
-    def room_version = '2.4.2'
+    def room_version = '2.5.0'
     implementation "androidx.room:room-runtime:$room_version"
     implementation "androidx.room:room-ktx:$room_version"
-    kapt "androidx.room:room-compiler:$room_version"
+    ksp "androidx.room:room-compiler:$room_version"
 
-    def lifecycle_version = "2.5.0-rc01"
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
 
-    implementation "androidx.core:core-splashscreen:1.0.0-beta02"
+    implementation "androidx.core:core-splashscreen:1.0.0"
 
     implementation "com.google.android.material:material:$mdc_version"
-    implementation 'com.google.code.gson:gson:2.9.0'
+
+    def retrofit_version = '2.9.0'
+    implementation "com.squareup.retrofit2:retrofit:$retrofit_version"
+    implementation "com.squareup.retrofit2:converter-gson:$retrofit_version"
 
     def material_dialog_version = "3.3.0"
     implementation "com.afollestad.material-dialogs:core:$material_dialog_version"
@@ -98,19 +102,15 @@ dependencies {
 
     implementation 'com.afollestad:material-cab:2.0.1'
 
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4"
 
-    def kotlin_coroutines_version = '1.6.1'
+    def koin_version = '3.3.3'
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_version"
-
-    def koin_version = '3.2.0'
     implementation "io.insert-koin:koin-core:$koin_version"
     implementation "io.insert-koin:koin-android:$koin_version"
 
-    def glide_version = '4.13.2'
+    def glide_version = '4.15.0'
     implementation "com.github.bumptech.glide:glide:$glide_version"
-    kapt "com.github.bumptech.glide:compiler:$glide_version"
+    ksp "com.github.bumptech.glide:ksp:$glide_version"
 
     implementation 'com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:1.0.0'
 
@@ -125,8 +125,7 @@ dependencies {
     implementation 'com.r0adkll:slidableactivity:2.1.0'
     implementation 'com.heinrichreimersoftware:material-intro:2.0.0'
     implementation 'com.github.dhaval2404:imagepicker:2.1'
-    implementation 'me.zhanghai.android.fastscroll:library:1.1.8'
+    implementation 'me.zhanghai.android.fastscroll:library:1.2.0'
-    implementation 'cat.ereza:customactivityoncrash:2.3.0'
+    implementation 'cat.ereza:customactivityoncrash:2.4.0'
-    implementation 'me.tankery.lib:circularSeekBar:1.3.2'
+    implementation 'me.tankery.lib:circularSeekBar:1.4.1'
-//    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.9.1'
 }

app/src/fdroid/java/code/name/monkey/retromusic/billing/BillingManager.kt

@@ -0,0 +1,12 @@
+package code.name.monkey.retromusic.billing
+
+import android.content.Context
+
+@Suppress("UNUSED_PARAMETER")
+class BillingManager(context: Context) {
+
+    fun release() {}
+
+    val isProVersion: Boolean
+        get() = true
+}

app/src/fdroid/java/code/name/monkey/retromusic/cast/RetroWebServer.kt

@@ -0,0 +1,6 @@
+package code.name.monkey.retromusic.cast
+
+import android.content.Context
+
+@Suppress("UNUSED_PARAMETER")
+class RetroWebServer(context: Context)

app/src/fdroid/java/code/name/monkey/retromusic/extensions/extensions.kt

@@ -0,0 +1,17 @@
+@file:Suppress("UNUSED_PARAMETER", "unused")
+
+package code.name.monkey.retromusic.extensions
+
+import android.content.Context
+import android.view.Menu
+import androidx.fragment.app.FragmentActivity
+
+fun Context.setUpMediaRouteButton(menu: Menu) {}
+
+fun FragmentActivity.installLanguageAndRecreate(code: String) {
+    recreate()
+}
+
+fun Context.goToProVersion() {}
+
+fun Context.installSplitCompat() {}

app/src/fdroid/java/code/name/monkey/retromusic/service/CastPlayer.kt

@@ -0,0 +1,47 @@
+package code.name.monkey.retromusic.service
+
+import code.name.monkey.retromusic.model.Song
+import code.name.monkey.retromusic.service.playback.Playback
+
+// Empty CastPlayer implementation
+class CastPlayer : Playback {
+    override val isInitialized: Boolean
+        get() = true
+    override val isPlaying: Boolean
+        get() = true
+    override val audioSessionId: Int
+        get() = 0
+
+    override fun setDataSource(
+        song: Song,
+        force: Boolean,
+        completion: (success: Boolean) -> Unit,
+    ) {
+    }
+
+    override fun setNextDataSource(path: String?) {}
+
+    override var callbacks: Playback.PlaybackCallbacks? = null
+
+    override fun start() = true
+
+    override fun stop() {}
+
+    override fun release() {}
+
+    override fun pause(): Boolean = true
+
+    override fun duration() = 0
+
+    override fun position() = 0
+
+    override fun seek(whereto: Int) = whereto
+
+    override fun setVolume(vol: Float) = true
+
+    override fun setAudioSessionId(sessionId: Int) = true
+
+    override fun setCrossFadeDuration(duration: Int) {}
+
+    override fun setPlaybackSpeedPitch(speed: Float, pitch: Float) {}
+}

app/src/fdroid/java/code/name/monkey/retromusic/util/AppRater.kt

@@ -0,0 +1,8 @@
+package code.name.monkey.retromusic.util
+
+import android.content.Context
+
+@Suppress("UNUSED_PARAMETER")
+object AppRater {
+    fun appLaunched(context: Context) {}
+}

app/src/fdroid/res/values/donottranslate.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="download_policy">never</string>
+</resources>

app/src/main/AndroidManifest.xml

@@ -14,33 +14,37 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission
         android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-        android:maxSdkVersion="28" />
+        android:maxSdkVersion="29" />
     <uses-permission android:name="android.permission.BROADCAST_STICKY" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission
         android:name="android.permission.WRITE_SETTINGS"
         tools:ignore="ProtectedPermissions" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
+    <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />
+    <uses-permission
+        android:name="android.permission.BLUETOOTH_CONNECT"
+        android:usesPermissionFlags="neverForLocation"
+        tools:targetApi="s" />
 
     <application
-        android:name="code.name.monkey.retromusic.App"
+        android:name=".App"
         android:allowBackup="@bool/allowBackup"
         android:configChanges="locale|layoutDirection"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:requestLegacyExternalStorage="true"
         android:restoreAnyVersion="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.RetroMusic.FollowSystem"
         android:usesCleartextTraffic="true"
-        tools:ignore="AllowBackup,GoogleAppIndexingWarning"
+        tools:targetApi="m">
-        tools:targetApi="q">
         <activity
-            android:name="code.name.monkey.retromusic.activities.MainActivity"
+            android:name=".activities.MainActivity"
             android:exported="true"
             android:launchMode="singleTop"
-            android:theme="@style/SplashTheme">
+            android:theme="@style/Theme.RetroMusic.SplashScreen">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.intent.action.MUSIC_PLAYER" />
@@ -51,7 +55,6 @@
             </intent-filter>
             <intent-filter>
                 <action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH" />
-
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <intent-filter>
@@ -111,18 +114,20 @@
                 <data android:mimeType="vnd.android.cursor.dir/audio" />
             </intent-filter>
         </activity>
-        <activity android:name="code.name.monkey.retromusic.activities.SettingsActivity" />
+        <activity android:name=".activities.tageditor.AlbumTagEditorActivity" />
-        <activity android:name="code.name.monkey.retromusic.activities.tageditor.AlbumTagEditorActivity" />
+        <activity android:name=".activities.tageditor.SongTagEditorActivity" />
-        <activity android:name="code.name.monkey.retromusic.activities.tageditor.SongTagEditorActivity" />
+        <activity android:name=".activities.LicenseActivity" />
-        <activity android:name="code.name.monkey.retromusic.activities.LicenseActivity" />
+        <activity android:name=".activities.bugreport.BugReportActivity" />
-        <activity android:name="code.name.monkey.retromusic.activities.bugreport.BugReportActivity" />
+        <activity android:name=".activities.ShareInstagramStory" />
-        <activity android:name="code.name.monkey.retromusic.activities.ShareInstagramStory" />
+        <activity android:name=".activities.DriveModeActivity" />
-        <activity android:name="code.name.monkey.retromusic.activities.DriveModeActivity" />
+        <activity android:name=".activities.PermissionActivity" />
-        <activity android:name="code.name.monkey.retromusic.activities.PermissionActivity" />
-        <activity android:name="code.name.monkey.retromusic.activities.LockScreenActivity" />
-        <activity android:name="code.name.monkey.retromusic.activities.saf.SAFRequestActivity" />
         <activity
-            android:name="code.name.monkey.retromusic.fragments.backup.RestoreActivity"
+            android:name=".activities.LockScreenActivity"
+            android:excludeFromRecents="true"
+            android:launchMode="singleTask"
+            android:showOnLockScreen="true" />
+        <activity
+            android:name=".fragments.backup.RestoreActivity"
             android:excludeFromRecents="false"
             android:exported="true"
             android:label="@string/restore"
@@ -159,32 +164,22 @@
         </activity>
 
         <activity
-            android:name="code.name.monkey.retromusic.appshortcuts.AppShortcutLauncherActivity"
+            android:name=".appshortcuts.AppShortcutLauncherActivity"
             android:launchMode="singleInstance"
             android:theme="@android:style/Theme.Translucent.NoTitleBar" />
 
         <activity
-            android:name="code.name.monkey.retromusic.activities.saf.SAFGuideActivity"
+            android:name=".activities.saf.SAFGuideActivity"
             android:theme="@style/Theme.Intro" />
 
         <activity
-            android:name="code.name.monkey.retromusic.activities.ErrorActivity"
+            android:name=".activities.ErrorActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="cat.ereza.customactivityoncrash.RESTART" />
             </intent-filter>
         </activity>
 
-        <provider
-            android:name="code.name.monkey.retromusic.misc.GenericFileProvider"
-            android:authorities="${applicationId}.provider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/provider_paths" />
-        </provider>
-
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}"
@@ -196,7 +191,7 @@
         </provider>
 
         <receiver
-            android:name="androidx.media.session.MediaButtonReceiver"
+            android:name=".service.MediaButtonIntentReceiver"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MEDIA_BUTTON" />
@@ -204,7 +199,7 @@
         </receiver>
 
         <receiver
-            android:name="code.name.monkey.retromusic.appwidgets.BootReceiver"
+            android:name=".appwidgets.BootReceiver"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
@@ -213,7 +208,7 @@
         </receiver>
 
         <receiver
-            android:name="code.name.monkey.retromusic.appwidgets.AppWidgetBig"
+            android:name=".appwidgets.AppWidgetBig"
             android:exported="true"
             android:label="@string/app_widget_big_name">
             <intent-filter>
@@ -226,7 +221,7 @@
         </receiver>
 
         <receiver
-            android:name="code.name.monkey.retromusic.appwidgets.AppWidgetClassic"
+            android:name=".appwidgets.AppWidgetClassic"
             android:exported="true"
             android:label="@string/app_widget_classic_name">
             <intent-filter>
@@ -238,7 +233,7 @@
                 android:resource="@xml/app_widget_classic_info" />
         </receiver>
         <receiver
-            android:name="code.name.monkey.retromusic.appwidgets.AppWidgetSmall"
+            android:name=".appwidgets.AppWidgetSmall"
             android:exported="true"
             android:label="@string/app_widget_small_name">
             <intent-filter>
@@ -250,7 +245,7 @@
                 android:resource="@xml/app_widget_small_info" />
         </receiver>
         <receiver
-            android:name="code.name.monkey.retromusic.appwidgets.AppWidgetText"
+            android:name=".appwidgets.AppWidgetText"
             android:exported="true"
             android:label="@string/app_widget_text_name">
             <intent-filter>
@@ -262,7 +257,7 @@
                 android:resource="@xml/app_widget_text" />
         </receiver>
         <receiver
-            android:name="code.name.monkey.retromusic.appwidgets.AppWidgetCard"
+            android:name=".appwidgets.AppWidgetCard"
             android:exported="true"
             android:label="@string/app_widget_card_name">
             <intent-filter>
@@ -274,7 +269,7 @@
                 android:resource="@xml/app_widget_card_info" />
         </receiver>
         <receiver
-            android:name="code.name.monkey.retromusic.appwidgets.AppWidgetMD3"
+            android:name=".appwidgets.AppWidgetMD3"
             android:exported="true"
             android:label="@string/app_widget_md3_name">
             <intent-filter>
@@ -286,7 +281,7 @@
                 android:resource="@xml/app_widget_md3_info" />
         </receiver>
         <receiver
-            android:name="code.name.monkey.retromusic.appwidgets.AppWidgetCircle"
+            android:name=".appwidgets.AppWidgetCircle"
             android:exported="true"
             android:label="@string/app_widget_circle_name">
             <intent-filter>
@@ -299,7 +294,7 @@
         </receiver>
 
         <service
-            android:name="code.name.monkey.retromusic.service.MusicService"
+            android:name=".service.MusicService"
             android:enabled="true"
             android:exported="true"
             android:foregroundServiceType="mediaPlayback"
@@ -307,9 +302,6 @@
             <intent-filter>
                 <action android:name="android.media.browse.MediaBrowserService" />
             </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.MEDIA_BUTTON" />
-            </intent-filter>
         </service>
 
         <meta-data

app/src/main/assets/retro-changelog.html

@@ -62,6 +62,68 @@
 </head>
 
 <body>
+
+<div>
+    <h5>March 13, 2023</h5>
+    <h2>v6.0.4</h2>
+    <h3>What's New</h3>
+    <ul>
+        <li>Minor redesign in Playlist details screen</li>
+        <li>Updated translations</li>
+    </ul>
+    <h3>Fixed</h3>
+    <ul>
+        <li>Fixed file popup menu actions in Folders tab</li>
+        <li>Fixed playlist image loading</li>
+        <li>Fixed blurry album art in Android 13</li>
+        <li>Minor bug fixes and improvements</li>
+    </ul>
+</div>
+<div>
+    <h5>July 10, 2022</h5>
+    <h2>v6.0.3<span class="tag"><i>Beta</i></span></h2>
+    <h3>Fixed</h3>
+    <ul>
+        <li>Migrated icons to Material symbols</li>
+    </ul>
+</div>
+<div>
+    <h5>June 21, 2022</h5>
+    <h2>v6.0.2<span class="tag"><i>Beta</i></span></h2>
+    <h3>Fixed</h3>
+    <ul>
+        <li>Minor bug fixes and improvements</li>
+    </ul>
+</div>
+<div>
+    <h5>June 13, 2022</h5>
+    <h2>v6.0.1<span class="tag"><i>Beta</i></span></h2>
+    <h3>Fixed</h3>
+    <ul>
+        <li>Fixed ChromeCast crash</li>
+        <li>Fixed Slider crashes</li>
+        <li>Fixed storage related crashes on Android 10</li>
+        <li>Fixed CrossFade not working Fade Audio is not working</li>
+    </ul>
+</div>
+<div>
+    <h5>June 7, 2022</h5>
+    <h2>v6.0.0<span class="tag"><i>Beta</i></span></h2>
+    <h3>What's New</h3>
+    <ul>
+        <li>Better Cast</li>
+        <li>Mini player in settings screen</li>
+        <li>Changed Seekbar with Sliders</li>
+        <li>Added NavigationRailView for Landscape</li>
+        <li>Show remaining time in Sleep timer dialog</li>
+    </ul>
+    <h3>Fixed</h3>
+    <ul>
+        <li>Fixed Top/Recent Artists/Albums not updating (Wrong sort order)</li>
+        <li>Fixed all Blacklist related crashes</li>
+        <li>Fix restart button not working in crash activity</li>
+    </ul>
+</div>
 <div>
     <h5>May 25, 2022</h5>
     <h2>v5.8.5</h2>

app/src/main/java/code/name/monkey/retromusic/App.kt

@@ -10,14 +10,17 @@
  * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
+ *
  */
 package code.name.monkey.retromusic
 
 import android.app.Application
+import androidx.preference.PreferenceManager
 import cat.ereza.customactivityoncrash.config.CaocConfig
 import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.appthemehelper.util.VersionUtils
 import code.name.monkey.retromusic.activities.ErrorActivity
+import code.name.monkey.retromusic.activities.MainActivity
 import code.name.monkey.retromusic.appshortcuts.DynamicShortcutManager
 import code.name.monkey.retromusic.helper.WallpaperAccentManager
 import org.koin.android.ext.koin.androidContext
@@ -38,7 +41,7 @@ class App : Application() {
         // default theme
         if (!ThemeStore.isConfigured(this, 3)) {
             ThemeStore.editTheme(this)
-                .accentColorRes(R.color.md_deep_purple_A200)
+                .accentColorRes(code.name.monkey.appthemehelper.R.color.md_deep_purple_A200)
                 .coloredNavigationBar(true)
                 .commit()
         }
@@ -48,7 +51,12 @@ class App : Application() {
             DynamicShortcutManager(this).initDynamicShortcuts()
 
         // setting Error activity
-        CaocConfig.Builder.create().errorActivity(ErrorActivity::class.java).apply()
+        CaocConfig.Builder.create().errorActivity(ErrorActivity::class.java)
+            .restartActivity(MainActivity::class.java).apply()
+
+        // Set Default values for now playing preferences
+        // This will reduce startup time for now playing settings fragment as Preference listener of AbsSlidingMusicPanelActivity won't be called
+        PreferenceManager.setDefaultValues(this, R.xml.pref_now_playing_screen, false)
     }
 
     override fun onTerminate() {

app/src/main/java/code/name/monkey/retromusic/Constants.kt

@@ -79,12 +79,7 @@ const val CIRCULAR_ALBUM_ART = "circular_album_art"
 const val USER_NAME = "user_name"
 const val TOGGLE_FULL_SCREEN = "toggle_full_screen"
 const val TOGGLE_VOLUME = "toggle_volume"
-const val ROUND_CORNERS = "corner_window"
-const val TOGGLE_GENRE = "toggle_genre"
-const val PROFILE_IMAGE_PATH = "profile_image_path"
-const val BANNER_IMAGE_PATH = "banner_image_path"
 const val ADAPTIVE_COLOR_APP = "adaptive_color_app"
-const val TOGGLE_SEPARATE_LINE = "toggle_separate_line"
 const val HOME_ARTIST_GRID_STYLE = "home_artist_grid_style"
 const val HOME_ALBUM_GRID_STYLE = "home_album_grid_style"
 const val TOGGLE_ADD_CONTROLS = "toggle_add_controls"
@@ -99,7 +94,6 @@ const val SAF_SDCARD_URI = "saf_sdcard_uri"
 const val SONG_SORT_ORDER = "song_sort_order"
 const val SONG_GRID_SIZE = "song_grid_size"
 const val GENRE_SORT_ORDER = "genre_sort_order"
-const val LAST_PAGE = "last_start_page"
 const val BLUETOOTH_PLAYBACK = "bluetooth_playback"
 const val INITIALIZED_BLACKLIST = "initialized_blacklist"
 const val ARTIST_SORT_ORDER = "artist_sort_order"
@@ -132,7 +126,6 @@ const val ARTIST_DETAIL_SONG_SORT_ORDER = "artist_detail_song_sort_order"
 const val LYRICS_OPTIONS = "lyrics_tab_position"
 const val CHOOSE_EQUALIZER = "choose_equalizer"
 const val EQUALIZER = "equalizer"
-const val TOGGLE_SHUFFLE = "toggle_shuffle"
 const val SONG_GRID_STYLE = "song_grid_style"
 const val PAUSE_ON_ZERO_VOLUME = "pause_on_zero_volume"
 const val FILTER_SONG = "filter_song"

app/src/main/java/code/name/monkey/retromusic/LanguageContextWrapper.kt

@@ -3,7 +3,7 @@ package code.name.monkey.retromusic
 import android.content.Context
 import android.content.ContextWrapper
 import android.os.LocaleList
-import code.name.monkey.appthemehelper.util.VersionUtils.hasNougatMR
+import code.name.monkey.appthemehelper.util.VersionUtils.hasNougat
 import java.util.*
 
 class LanguageContextWrapper(base: Context?) : ContextWrapper(base) {
@@ -11,7 +11,7 @@ class LanguageContextWrapper(base: Context?) : ContextWrapper(base) {
         fun wrap(context: Context?, newLocale: Locale?): LanguageContextWrapper {
             if (context == null) return LanguageContextWrapper(context)
             val configuration = context.resources.configuration
-            if (hasNougatMR()) {
+            if (hasNougat()) {
                 configuration.setLocale(newLocale)
                 val localeList = LocaleList(newLocale)
                 LocaleList.setDefault(localeList)

app/src/main/java/code/name/monkey/retromusic/MainModule.kt

@@ -1,11 +1,8 @@
 package code.name.monkey.retromusic
 
 import androidx.room.Room
-import androidx.room.RoomDatabase
-import androidx.sqlite.db.SupportSQLiteDatabase
 import code.name.monkey.retromusic.auto.AutoMusicProvider
-import code.name.monkey.retromusic.db.BlackListStoreDao
+import code.name.monkey.retromusic.db.MIGRATION_23_24
-import code.name.monkey.retromusic.db.BlackListStoreEntity
 import code.name.monkey.retromusic.db.PlaylistWithSongs
 import code.name.monkey.retromusic.db.RetroDatabase
 import code.name.monkey.retromusic.fragments.LibraryViewModel
@@ -15,10 +12,6 @@ import code.name.monkey.retromusic.fragments.genres.GenreDetailsViewModel
 import code.name.monkey.retromusic.fragments.playlists.PlaylistDetailsViewModel
 import code.name.monkey.retromusic.model.Genre
 import code.name.monkey.retromusic.repository.*
-import code.name.monkey.retromusic.util.FilePathUtil
-import kotlinx.coroutines.Dispatchers.IO
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
 import org.koin.android.ext.koin.androidContext
 import org.koin.androidx.viewmodel.dsl.viewModel
 import org.koin.dsl.bind
@@ -28,32 +21,14 @@ private val roomModule = module {
 
     single {
         Room.databaseBuilder(androidContext(), RetroDatabase::class.java, "playlist.db")
-            .allowMainThreadQueries()
+            .addMigrations(MIGRATION_23_24)
-            .addCallback(object : RoomDatabase.Callback() {
-                override fun onOpen(db: SupportSQLiteDatabase) {
-                    super.onOpen(db)
-                    GlobalScope.launch(IO) {
-                        FilePathUtil.blacklistFilePaths().map {
-                            get<BlackListStoreDao>().insertBlacklistPath(BlackListStoreEntity(it))
-                        }
-                    }
-                }
-            })
-            .fallbackToDestructiveMigration()
             .build()
     }
-    factory {
-        get<RetroDatabase>().lyricsDao()
-    }
 
     factory {
         get<RetroDatabase>().playlistDao()
     }
 
-    factory {
-        get<RetroDatabase>().blackListStore()
-    }
-
     factory {
         get<RetroDatabase>().playCountDao()
     }
@@ -63,7 +38,7 @@ private val roomModule = module {
     }
 
     single {
-        RealRoomRepository(get(), get(), get(), get(), get())
+        RealRoomRepository(get(), get(), get())
     } bind RoomRepository::class
 }
 private val autoModule = module {
@@ -164,10 +139,10 @@ private val viewModules = module {
         )
     }
 
-    viewModel { (playlist: PlaylistWithSongs) ->
+    viewModel { (playlistId: Long) ->
         PlaylistDetailsViewModel(
             get(),
-            playlist
+            playlistId
         )
     }
 

app/src/main/java/code/name/monkey/retromusic/activities/DriveModeActivity.kt

@@ -14,13 +14,10 @@
  */
 package code.name.monkey.retromusic.activities
 
-import android.animation.ObjectAnimator
 import android.content.Intent
 import android.graphics.Color
 import android.graphics.PorterDuff
 import android.os.Bundle
-import android.view.animation.LinearInterpolator
-import android.widget.SeekBar
 import androidx.lifecycle.lifecycleScope
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.base.AbsMusicServiceActivity
@@ -28,19 +25,19 @@ import code.name.monkey.retromusic.databinding.ActivityDriveModeBinding
 import code.name.monkey.retromusic.db.toSongEntity
 import code.name.monkey.retromusic.extensions.accentColor
 import code.name.monkey.retromusic.extensions.drawAboveSystemBars
-import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
 import code.name.monkey.retromusic.glide.BlurTransformation
-import code.name.monkey.retromusic.glide.GlideApp
 import code.name.monkey.retromusic.glide.RetroGlideExtension
+import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
 import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper.Callback
 import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler
-import code.name.monkey.retromusic.misc.SimpleOnSeekbarChangeListener
 import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.repository.RealRepository
 import code.name.monkey.retromusic.service.MusicService
 import code.name.monkey.retromusic.util.MusicUtil
+import com.bumptech.glide.Glide
+import com.google.android.material.slider.Slider
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -68,7 +65,7 @@ class DriveModeActivity : AbsMusicServiceActivity(), Callback {
         progressViewUpdateHelper = MusicProgressViewUpdateHelper(this)
         lastPlaybackControlsColor = accentColor()
         binding.close.setOnClickListener {
-            onBackPressed()
+            onBackPressedDispatcher.onBackPressed()
         }
         binding.repeatButton.drawAboveSystemBars()
     }
@@ -113,17 +110,15 @@ class DriveModeActivity : AbsMusicServiceActivity(), Callback {
     }
 
     private fun setUpProgressSlider() {
-        binding.progressSlider.setOnSeekBarChangeListener(object : SimpleOnSeekbarChangeListener() {
+        binding.progressSlider.addOnChangeListener { _: Slider, progress: Float, fromUser: Boolean ->
-            override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) {
+            if (fromUser) {
-                if (fromUser) {
+                MusicPlayerRemote.seekTo(progress.toInt())
-                    MusicPlayerRemote.seekTo(progress)
+                onUpdateProgressViews(
-                    onUpdateProgressViews(
+                    MusicPlayerRemote.songProgressMillis,
-                        MusicPlayerRemote.songProgressMillis,
+                    MusicPlayerRemote.songDurationMillis
-                        MusicPlayerRemote.songDurationMillis
+                )
-                    )
-                }
             }
-        })
+        }
     }
 
     override fun onPause() {
@@ -191,6 +186,7 @@ class DriveModeActivity : AbsMusicServiceActivity(), Callback {
                 lastPlaybackControlsColor,
                 PorterDuff.Mode.SRC_IN
             )
+
             else -> binding.shuffleButton.setColorFilter(
                 lastDisabledPlaybackControlsColor,
                 PorterDuff.Mode.SRC_IN
@@ -207,6 +203,7 @@ class DriveModeActivity : AbsMusicServiceActivity(), Callback {
                     PorterDuff.Mode.SRC_IN
                 )
             }
+
             MusicService.REPEAT_MODE_ALL -> {
                 binding.repeatButton.setImageResource(R.drawable.ic_repeat)
                 binding.repeatButton.setColorFilter(
@@ -214,6 +211,7 @@ class DriveModeActivity : AbsMusicServiceActivity(), Callback {
                     PorterDuff.Mode.SRC_IN
                 )
             }
+
             MusicService.REPEAT_MODE_THIS -> {
                 binding.repeatButton.setImageResource(R.drawable.ic_repeat_one)
                 binding.repeatButton.setColorFilter(
@@ -241,7 +239,7 @@ class DriveModeActivity : AbsMusicServiceActivity(), Callback {
         binding.songTitle.text = song.title
         binding.songText.text = song.artistName
 
-        GlideApp.with(this)
+        Glide.with(this)
             .load(RetroGlideExtension.getSongModel(song))
             .songCoverOptions(song)
             .transform(BlurTransformation.Builder(this).build())
@@ -249,12 +247,10 @@ class DriveModeActivity : AbsMusicServiceActivity(), Callback {
     }
 
     override fun onUpdateProgressViews(progress: Int, total: Int) {
-        binding.progressSlider.max = total
+        binding.progressSlider.run {
-
+            valueTo = total.toFloat()
-        val animator = ObjectAnimator.ofInt(binding.progressSlider, "progress", progress)
+            value = progress.toFloat().coerceIn(valueFrom, valueTo)
-        animator.duration = AbsPlayerControlsFragment.SLIDER_ANIMATION_TIME
+        }
-        animator.interpolator = LinearInterpolator()
-        animator.start()
 
         binding.songTotalTime.text = MusicUtil.getReadableDurationString(total.toLong())
         binding.songCurrentProgress.text = MusicUtil.getReadableDurationString(progress.toLong())

app/src/main/java/code/name/monkey/retromusic/activities/ErrorActivity.kt

@@ -3,32 +3,32 @@ package code.name.monkey.retromusic.activities
 import android.os.Bundle
 import android.widget.Button
 import android.widget.ImageView
-import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import cat.ereza.customactivityoncrash.CustomActivityOnCrash
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.util.FileUtils.createFile
 import code.name.monkey.retromusic.util.Share.shareFile
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import java.text.DateFormat
 import java.text.SimpleDateFormat
 import java.util.*
 
 class ErrorActivity : AppCompatActivity() {
     private val dayFormat: DateFormat = SimpleDateFormat("yyyy-MM-dd", Locale.getDefault())
-    private val ReportPrefix = "bug_report-"
+    private val reportPrefix = "bug_report-"
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.customactivityoncrash_default_error_activity)
+        setContentView(cat.ereza.customactivityoncrash.R.layout.customactivityoncrash_default_error_activity)
 
         val restartButton =
-            findViewById<Button>(R.id.customactivityoncrash_error_activity_restart_button)
+            findViewById<Button>(cat.ereza.customactivityoncrash.R.id.customactivityoncrash_error_activity_restart_button)
 
         val config = CustomActivityOnCrash.getConfigFromIntent(intent)
         if (config == null) {
             finish()
             return
         }
-        restartButton.setText(R.string.customactivityoncrash_error_activity_restart_app)
+        restartButton.setText(cat.ereza.customactivityoncrash.R.string.customactivityoncrash_error_activity_restart_app)
         restartButton.setOnClickListener {
             CustomActivityOnCrash.restartApplication(
                 this@ErrorActivity,
@@ -36,11 +36,11 @@ class ErrorActivity : AppCompatActivity() {
             )
         }
         val moreInfoButton =
-            findViewById<Button>(R.id.customactivityoncrash_error_activity_more_info_button)
+            findViewById<Button>(cat.ereza.customactivityoncrash.R.id.customactivityoncrash_error_activity_more_info_button)
 
         moreInfoButton.setOnClickListener { //We retrieve all the error data and show it
-            AlertDialog.Builder(this@ErrorActivity)
+            MaterialAlertDialogBuilder(this@ErrorActivity)
-                .setTitle(R.string.customactivityoncrash_error_activity_error_details_title)
+                .setTitle(cat.ereza.customactivityoncrash.R.string.customactivityoncrash_error_activity_error_details_title)
                 .setMessage(
                     CustomActivityOnCrash.getAllErrorDetailsFromIntent(
                         this@ErrorActivity,
@@ -48,7 +48,7 @@ class ErrorActivity : AppCompatActivity() {
                     )
                 )
                 .setPositiveButton(
-                    R.string.customactivityoncrash_error_activity_error_details_close,
+                    cat.ereza.customactivityoncrash.R.string.customactivityoncrash_error_activity_error_details_close,
                     null
                 )
                 .setNeutralButton(
@@ -58,19 +58,19 @@ class ErrorActivity : AppCompatActivity() {
                     val bugReport = createFile(
                         context = this,
                         "Bug Report",
-                        "$ReportPrefix${dayFormat.format(Date())}",
+                        "$reportPrefix${dayFormat.format(Date())}",
                         CustomActivityOnCrash.getAllErrorDetailsFromIntent(
                             this@ErrorActivity,
                             intent
                         ), ".txt"
                     )
-                    shareFile(this, bugReport)
+                    shareFile(this, bugReport, "text/*")
                 }
                 .show()
         }
         val errorActivityDrawableId = config.errorDrawable
         val errorImageView =
-            findViewById<ImageView>(R.id.customactivityoncrash_error_activity_image)
+            findViewById<ImageView>(cat.ereza.customactivityoncrash.R.id.customactivityoncrash_error_activity_image)
         if (errorActivityDrawableId != null) {
             errorImageView.setImageResource(
                 errorActivityDrawableId

app/src/main/java/code/name/monkey/retromusic/activities/LicenseActivity.kt

@@ -77,7 +77,7 @@ class LicenseActivity : AbsThemeActivity() {
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         if (item.itemId == android.R.id.home) {
-            onBackPressed()
+            onBackPressedDispatcher.onBackPressed()
             return true
         }
         return super.onOptionsItemSelected(item)

app/src/main/java/code/name/monkey/retromusic/activities/LockScreenActivity.kt

@@ -26,11 +26,13 @@ import code.name.monkey.retromusic.extensions.hideStatusBar
 import code.name.monkey.retromusic.extensions.setTaskDescriptionColorAuto
 import code.name.monkey.retromusic.extensions.whichFragment
 import code.name.monkey.retromusic.fragments.player.lockscreen.LockScreenControlsFragment
-import code.name.monkey.retromusic.glide.GlideApp
 import code.name.monkey.retromusic.glide.RetroGlideExtension
+import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette
+import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions
 import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
+import com.bumptech.glide.Glide
 import com.r0adkll.slidr.Slidr
 import com.r0adkll.slidr.model.SlidrConfig
 import com.r0adkll.slidr.model.SlidrListener
@@ -84,12 +86,11 @@ class LockScreenActivity : AbsMusicServiceActivity() {
     private fun lockScreenInit() {
         if (VersionUtils.hasOreoMR1()) {
             setShowWhenLocked(true)
-            val keyguardManager = getSystemService<KeyguardManager>()
+            //setTurnScreenOn(true)
-            keyguardManager?.requestDismissKeyguard(this, null)
         } else {
-            this.window.addFlags(
+            window.addFlags(
-                WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD or
+                WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED
-                        WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED
+                //          or WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON
             )
         }
     }
@@ -106,7 +107,7 @@ class LockScreenActivity : AbsMusicServiceActivity() {
 
     private fun updateSongs() {
         val song = MusicPlayerRemote.currentSong
-        GlideApp.with(this)
+        Glide.with(this)
             .asBitmapPalette()
             .songCoverOptions(song)
             .load(RetroGlideExtension.getSongModel(song))

app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt

@@ -15,18 +15,15 @@
 package code.name.monkey.retromusic.activities
 
 import android.content.Intent
-import android.content.SharedPreferences
-import android.content.SharedPreferences.OnSharedPreferenceChangeListener
 import android.net.Uri
 import android.os.Bundle
 import android.provider.MediaStore
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.contains
 import androidx.navigation.ui.setupWithNavController
-import code.name.monkey.retromusic.*
+import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.base.AbsSlidingMusicPanelActivity
 import code.name.monkey.retromusic.extensions.*
-import code.name.monkey.retromusic.databinding.SlidingMusicPanelLayoutBinding
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.helper.SearchQueryHelper.getSongs
 import code.name.monkey.retromusic.interfaces.IScrollHelper
@@ -35,20 +32,17 @@ import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.repository.PlaylistSongsLoader
 import code.name.monkey.retromusic.service.MusicService
 import code.name.monkey.retromusic.util.PreferenceUtil
+import code.name.monkey.retromusic.util.logE
 import kotlinx.coroutines.Dispatchers.IO
 import kotlinx.coroutines.launch
 import org.koin.android.ext.android.get
 
-class MainActivity : AbsSlidingMusicPanelActivity(), OnSharedPreferenceChangeListener {
+class MainActivity : AbsSlidingMusicPanelActivity() {
     companion object {
         const val TAG = "MainActivity"
         const val EXPAND_PANEL = "expand_panel"
     }
 
-    override fun createContentView(): SlidingMusicPanelLayoutBinding {
-        return wrapSlidingMusicPanel()
-    }
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setTaskDescriptionColorAuto()
@@ -56,9 +50,7 @@ class MainActivity : AbsSlidingMusicPanelActivity(), OnSharedPreferenceChangeLis
         updateTabs()
 
         setupNavigationController()
-        if (!hasPermissions()) {
+
-            findNavController(R.id.fragment_container).navigate(R.id.permissionFragment)
-        }
         WhatsNewFragment.showChangeLog(this)
     }
 
@@ -84,9 +76,9 @@ class MainActivity : AbsSlidingMusicPanelActivity(), OnSharedPreferenceChangeLis
             )
         }
         navController.graph = navGraph
-        bottomNavigationView.setupWithNavController(navController)
+        navigationView.setupWithNavController(navController)
         // Scroll Fragment to top
-        bottomNavigationView.setOnItemReselectedListener {
+        navigationView.setOnItemReselectedListener {
             currentFragment(R.id.fragment_container).apply {
                 if (this is IScrollHelper) {
                     scrollToTop()
@@ -118,7 +110,9 @@ class MainActivity : AbsSlidingMusicPanelActivity(), OnSharedPreferenceChangeLis
     }
 
     private fun saveTab(id: Int) {
-        PreferenceUtil.lastTab = id
+        if (PreferenceUtil.libraryCategory.firstOrNull { it.category.id == id }?.visible == true) {
+            PreferenceUtil.lastTab = id
+        }
     }
 
     override fun onSupportNavigateUp(): Boolean =
@@ -135,22 +129,6 @@ class MainActivity : AbsSlidingMusicPanelActivity(), OnSharedPreferenceChangeLis
         }
     }
 
-    override fun onResume() {
-        super.onResume()
-        PreferenceUtil.registerOnSharedPreferenceChangedListener(this)
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        PreferenceUtil.unregisterOnSharedPreferenceChangedListener(this)
-    }
-
-    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
-        if (key == GENERAL_THEME || key == MATERIAL_YOU || key == WALLPAPER_ACCENT || key == BLACK_THEME || key == ADAPTIVE_COLOR_APP || key == USER_NAME || key == TOGGLE_FULL_SCREEN || key == TOGGLE_VOLUME || key == ROUND_CORNERS || key == CAROUSEL_EFFECT || key == NOW_PLAYING_SCREEN_ID || key == TOGGLE_GENRE || key == BANNER_IMAGE_PATH || key == PROFILE_IMAGE_PATH || key == CIRCULAR_ALBUM_ART || key == KEEP_SCREEN_ON || key == TOGGLE_SEPARATE_LINE || key == TOGGLE_HOME_BANNER || key == TOGGLE_ADD_CONTROLS || key == ALBUM_COVER_STYLE || key == HOME_ARTIST_GRID_STYLE || key == ALBUM_COVER_TRANSFORM || key == DESATURATED_COLOR || key == EXTRA_SONG_INFO || key == TAB_TEXT_MODE || key == LANGUAGE_NAME || key == LIBRARY_CATEGORIES || key == CUSTOM_FONT || key == APPBAR_MODE || key == CIRCLE_PLAY_BUTTON || key == SWIPE_DOWN_DISMISS) {
-            postRecreate()
-        }
-    }
-
     override fun onServiceConnected() {
         super.onServiceConnected()
         intent ?: return
@@ -218,7 +196,7 @@ class MainActivity : AbsSlidingMusicPanelActivity(), OnSharedPreferenceChangeLis
     private fun parseLongFromIntent(
         intent: Intent,
         longKey: String,
-        stringKey: String
+        stringKey: String,
     ): Long {
         var id = intent.getLongExtra(longKey, -1)
         if (id < 0) {
@@ -227,7 +205,7 @@ class MainActivity : AbsSlidingMusicPanelActivity(), OnSharedPreferenceChangeLis
                 try {
                     id = idString.toLong()
                 } catch (e: NumberFormatException) {
-                    println(e.message)
+                    logE(e)
                 }
             }
         }

app/src/main/java/code/name/monkey/retromusic/activities/PermissionActivity.kt

@@ -22,6 +22,7 @@ import android.content.res.ColorStateList
 import android.os.Build
 import android.os.Bundle
 import android.provider.Settings
+import androidx.activity.OnBackPressedCallback
 import androidx.annotation.RequiresApi
 import androidx.core.app.ActivityCompat
 import androidx.core.net.toUri
@@ -30,8 +31,8 @@ import androidx.core.view.isVisible
 import code.name.monkey.appthemehelper.util.VersionUtils
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.base.AbsMusicServiceActivity
-import code.name.monkey.retromusic.extensions.*
 import code.name.monkey.retromusic.databinding.ActivityPermissionBinding
+import code.name.monkey.retromusic.extensions.*
 
 class PermissionActivity : AbsMusicServiceActivity() {
     private lateinit var binding: ActivityPermissionBinding
@@ -61,10 +62,14 @@ class PermissionActivity : AbsMusicServiceActivity() {
         if (VersionUtils.hasS()) {
             binding.bluetoothPermission.show()
             binding.bluetoothPermission.setButtonClick {
-                ActivityCompat.requestPermissions(this,
+                ActivityCompat.requestPermissions(
+                    this,
                     arrayOf(BLUETOOTH_CONNECT),
-                    PERMISSION_REQUEST)
+                    BLUETOOTH_PERMISSION_REQUEST
+                )
             }
+        } else {
+            binding.audioPermission.setNumber("2")
         }
 
         binding.finish.accentBackgroundColor()
@@ -79,12 +84,20 @@ class PermissionActivity : AbsMusicServiceActivity() {
                 finish()
             }
         }
+        onBackPressedDispatcher.addCallback(object : OnBackPressedCallback(true) {
+            override fun handleOnBackPressed() {
+                finishAffinity()
+                remove()
+            }
+        })
     }
 
     private fun setupTitle() {
         val appName =
-            getString(R.string.message_welcome,
+            getString(
-                "<b>Metro</b>")
+                R.string.message_welcome,
+                "<b>Metro</b>"
+            )
                 .parseAsHtml()
         binding.appNameText.text = appName
     }
@@ -114,23 +127,22 @@ class PermissionActivity : AbsMusicServiceActivity() {
     }
 
     private fun hasStoragePermission(): Boolean {
-        return ActivityCompat.checkSelfPermission(this,
+        return ActivityCompat.checkSelfPermission(
-            Manifest.permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED
+            this,
+            Manifest.permission.READ_EXTERNAL_STORAGE
+        ) == PackageManager.PERMISSION_GRANTED
     }
 
     @RequiresApi(Build.VERSION_CODES.S)
     private fun hasBluetoothPermission(): Boolean {
-        return ActivityCompat.checkSelfPermission(this,
+        return ActivityCompat.checkSelfPermission(
-            BLUETOOTH_CONNECT) == PackageManager.PERMISSION_GRANTED
+            this,
+            BLUETOOTH_CONNECT
+        ) == PackageManager.PERMISSION_GRANTED
     }
 
     @RequiresApi(Build.VERSION_CODES.M)
     private fun hasAudioPermission(): Boolean {
         return Settings.System.canWrite(this)
     }
-
-    override fun onBackPressed() {
-        super.onBackPressed()
-        finishAffinity()
-    }
 }

app/src/main/java/code/name/monkey/retromusic/activities/ShareInstagramStory.kt

@@ -22,26 +22,28 @@ import android.os.Bundle
 import android.provider.MediaStore.Images.Media
 import android.view.MenuItem
 import androidx.core.net.toUri
+import androidx.core.os.BundleCompat
 import androidx.core.view.drawToBitmap
 import code.name.monkey.appthemehelper.util.ColorUtil
 import code.name.monkey.appthemehelper.util.MaterialValueHelper
-import code.name.monkey.retromusic.activities.base.AbsBaseActivity
+import code.name.monkey.retromusic.activities.base.AbsThemeActivity
 import code.name.monkey.retromusic.databinding.ActivityShareInstagramBinding
 import code.name.monkey.retromusic.extensions.accentColor
-import code.name.monkey.retromusic.extensions.setLightStatusBar
 import code.name.monkey.retromusic.extensions.setStatusBarColor
-import code.name.monkey.retromusic.glide.GlideApp
 import code.name.monkey.retromusic.glide.RetroGlideExtension
+import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette
+import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions
 import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
 import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.util.Share
 import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
+import com.bumptech.glide.Glide
 
 /**
  * Created by hemanths on 2020-02-02.
  */
 
-class ShareInstagramStory : AbsBaseActivity() {
+class ShareInstagramStory : AbsThemeActivity() {
 
     private lateinit var binding: ActivityShareInstagramBinding
 
@@ -51,7 +53,7 @@ class ShareInstagramStory : AbsBaseActivity() {
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         if (item.itemId == android.R.id.home) {
-            onBackPressed()
+            onBackPressedDispatcher.onBackPressed()
             return true
         }
         return super.onOptionsItemSelected(item)
@@ -66,16 +68,15 @@ class ShareInstagramStory : AbsBaseActivity() {
         binding.toolbar.setBackgroundColor(Color.TRANSPARENT)
         setSupportActionBar(binding.toolbar)
 
-        val song = intent.extras?.getParcelable<Song>(EXTRA_SONG)
+        val song = intent.extras?.let { BundleCompat.getParcelable(it, EXTRA_SONG, Song::class.java) }
         song?.let { songFinal ->
-            GlideApp.with(this)
+            Glide.with(this)
                 .asBitmapPalette()
                 .songCoverOptions(songFinal)
                 .load(RetroGlideExtension.getSongModel(songFinal))
                 .into(object : RetroMusicColoredTarget(binding.image) {
                     override fun onColorReady(colors: MediaNotificationProcessor) {
-                        val isColorLight = ColorUtil.isColorLight(colors.backgroundColor)
+                        setColors(colors.backgroundColor)
-                        setColors(isColorLight, colors.backgroundColor)
                     }
                 })
 
@@ -103,22 +104,7 @@ class ShareInstagramStory : AbsBaseActivity() {
             ColorStateList.valueOf(accentColor())
     }
 
-    private fun setColors(colorLight: Boolean, color: Int) {
+    private fun setColors(color: Int) {
-        setLightStatusBar(colorLight)
-        binding.toolbar.setTitleTextColor(
-            MaterialValueHelper.getPrimaryTextColor(
-                this@ShareInstagramStory,
-                colorLight
-            )
-        )
-        binding.toolbar.navigationIcon?.setTintList(
-            ColorStateList.valueOf(
-                MaterialValueHelper.getPrimaryTextColor(
-                    this@ShareInstagramStory,
-                    colorLight
-                )
-            )
-        )
         binding.mainContent.background =
             GradientDrawable(
                 GradientDrawable.Orientation.TOP_BOTTOM,

app/src/main/java/code/name/monkey/retromusic/activities/WhatsNewFragment.kt

@@ -1,12 +1,17 @@
 package code.name.monkey.retromusic.activities
 
 import android.content.Context
+import android.content.Intent
 import android.content.pm.PackageManager
 import android.graphics.Color
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.webkit.WebResourceRequest
+import android.webkit.WebView
+import android.webkit.WebViewClient
+import androidx.core.content.PackageManagerCompat
 import androidx.core.content.pm.PackageInfoCompat
 import androidx.core.widget.NestedScrollView
 import androidx.fragment.app.FragmentActivity
@@ -22,7 +27,7 @@ import code.name.monkey.retromusic.extensions.openUrl
 import code.name.monkey.retromusic.util.PreferenceUtil.lastVersion
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import java.nio.charset.StandardCharsets
-import java.util.*
+import java.util.Locale
 
 class WhatsNewFragment : BottomSheetDialogFragment() {
     private var _binding: FragmentWhatsNewBinding? = null
@@ -41,7 +46,7 @@ class WhatsNewFragment : BottomSheetDialogFragment() {
         super.onViewCreated(view, savedInstanceState)
         try {
             val buf = StringBuilder()
-            val stream= requireContext().assets.open("retro-changelog.html")
+            val stream = requireContext().assets.open("retro-changelog.html")
             stream.reader(StandardCharsets.UTF_8).buffered().use { br ->
                 var str: String?
                 while (br.readLine().also { str = it } != null) {
@@ -76,6 +81,17 @@ class WhatsNewFragment : BottomSheetDialogFragment() {
                     )
                 )
             binding.webView.loadData(changeLog, "text/html", "UTF-8")
+            binding.webView.webViewClient = object : WebViewClient() {
+                override fun shouldOverrideUrlLoading(
+                    view: WebView?,
+                    request: WebResourceRequest?
+                ): Boolean {
+                    val url = request?.url ?: return false
+                    //you can do checks here e.g. url.host equals to target one
+                    startActivity(Intent(Intent.ACTION_VIEW, url))
+                    return true
+                }
+            }
         } catch (e: Throwable) {
             binding.webView.loadData(
                 "<h1>Unable to load</h1><p>" + e.localizedMessage + "</p>", "text/html", "UTF-8"

app/src/main/java/code/name/monkey/retromusic/activities/base/AbsBaseActivity.kt

@@ -32,6 +32,8 @@ import androidx.core.content.getSystemService
 import code.name.monkey.appthemehelper.util.VersionUtils
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.extensions.accentColor
+import code.name.monkey.retromusic.extensions.rootView
+import code.name.monkey.retromusic.util.logD
 import com.google.android.material.snackbar.Snackbar
 
 abstract class AbsBaseActivity : AbsThemeActivity() {
@@ -52,7 +54,7 @@ abstract class AbsBaseActivity : AbsThemeActivity() {
     }
 
     private val snackBarContainer: View
-        get() = window.decorView
+        get() = rootView
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -75,7 +77,7 @@ abstract class AbsBaseActivity : AbsThemeActivity() {
 
     protected open fun onHasPermissionsChanged(hasPermissions: Boolean) {
         // implemented by sub classes
-        println(hasPermissions)
+        logD(hasPermissions)
     }
 
     override fun dispatchKeyEvent(event: KeyEvent): Boolean {
@@ -114,33 +116,19 @@ abstract class AbsBaseActivity : AbsThemeActivity() {
             for (grantResult in grantResults) {
                 if (grantResult != PackageManager.PERMISSION_GRANTED) {
                     if (ActivityCompat.shouldShowRequestPermissionRationale(
-                            this@AbsBaseActivity, Manifest.permission.WRITE_EXTERNAL_STORAGE
+                            this@AbsBaseActivity, Manifest.permission.READ_EXTERNAL_STORAGE,
+                        ) || ActivityCompat.shouldShowRequestPermissionRationale(
+                            this@AbsBaseActivity, Manifest.permission.WRITE_EXTERNAL_STORAGE,
                         )
                     ) {
                         // User has deny from permission dialog
                         Snackbar.make(
                             snackBarContainer,
                             permissionDeniedMessage!!,
-                            Snackbar.LENGTH_INDEFINITE
+                            Snackbar.LENGTH_SHORT
                         )
                             .setAction(R.string.action_grant) { requestPermissions() }
                             .setActionTextColor(accentColor()).show()
-                    } else if (ActivityCompat.shouldShowRequestPermissionRationale(
-                            this@AbsBaseActivity, Manifest.permission.BLUETOOTH_CONNECT
-                        )
-                    ) {
-                        // User has deny from permission dialog
-                        Snackbar.make(
-                            snackBarContainer,
-                            R.string.permission_bluetooth_denied,
-                            Snackbar.LENGTH_INDEFINITE
-                        )
-                            .setAction(R.string.action_grant) {
-                                ActivityCompat.requestPermissions(this,
-                                    arrayOf(Manifest.permission.BLUETOOTH_CONNECT),
-                                    PERMISSION_REQUEST)
-                            }
-                            .setActionTextColor(accentColor()).show()
                     } else {
                         // User has deny permission and checked never show permission dialog so you can redirect to Application settings page
                         Snackbar.make(
@@ -165,11 +153,34 @@ abstract class AbsBaseActivity : AbsThemeActivity() {
             }
             hadPermissions = true
             onHasPermissionsChanged(true)
+        } else if (requestCode == BLUETOOTH_PERMISSION_REQUEST) {
+            for (grantResult in grantResults) {
+                if (grantResult != PackageManager.PERMISSION_GRANTED) {
+                    if (ActivityCompat.shouldShowRequestPermissionRationale(
+                            this@AbsBaseActivity, Manifest.permission.BLUETOOTH_CONNECT
+                        )
+                    ) {
+                        // User has deny from permission dialog
+                        Snackbar.make(
+                            snackBarContainer,
+                            R.string.permission_bluetooth_denied,
+                            Snackbar.LENGTH_SHORT
+                        )
+                            .setAction(R.string.action_grant) {
+                                ActivityCompat.requestPermissions(this,
+                                    arrayOf(Manifest.permission.BLUETOOTH_CONNECT),
+                                    BLUETOOTH_PERMISSION_REQUEST)
+                            }
+                            .setActionTextColor(accentColor()).show()
+                    }
+                }
+            }
         }
     }
 
     companion object {
         const val PERMISSION_REQUEST = 100
+        const val BLUETOOTH_PERMISSION_REQUEST = 101
     }
 
     // this lets keyboard close when clicked in background

app/src/main/java/code/name/monkey/retromusic/activities/base/AbsMusicServiceActivity.kt

@@ -33,6 +33,7 @@ import code.name.monkey.retromusic.service.MusicService.Companion.QUEUE_CHANGED
 import code.name.monkey.retromusic.service.MusicService.Companion.REPEAT_MODE_CHANGED
 import code.name.monkey.retromusic.service.MusicService.Companion.SHUFFLE_MODE_CHANGED
 import code.name.monkey.retromusic.util.PreferenceUtil
+import code.name.monkey.retromusic.util.logD
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.koin.android.ext.android.inject
@@ -185,12 +186,12 @@ abstract class AbsMusicServiceActivity : AbsBaseActivity(), IMusicServiceEventLi
             true
         ) // just in case we need to know this at some point
         sendBroadcast(intent)
-        println("sendBroadcast $hasPermissions")
+        logD("sendBroadcast $hasPermissions")
     }
 
     override fun getPermissionsToRequest(): Array<String> {
         return mutableListOf(Manifest.permission.READ_EXTERNAL_STORAGE).apply {
-            if (!VersionUtils.hasQ()) {
+            if (!VersionUtils.hasR()) {
                 add(Manifest.permission.WRITE_EXTERNAL_STORAGE)
             }
         }.toTypedArray()

app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt

@@ -16,6 +16,8 @@ package code.name.monkey.retromusic.activities.base
 
 import android.animation.ArgbEvaluator
 import android.animation.ValueAnimator
+import android.content.Intent
+import android.content.SharedPreferences
 import android.content.res.ColorStateList
 import android.graphics.Color
 import android.os.Bundle
@@ -24,14 +26,31 @@ import android.view.ViewGroup
 import android.view.ViewTreeObserver
 import android.view.animation.PathInterpolator
 import android.widget.FrameLayout
+import androidx.activity.OnBackPressedCallback
 import androidx.core.animation.doOnEnd
 import androidx.core.view.*
-import androidx.fragment.app.Fragment
 import androidx.fragment.app.commit
 import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.extensions.*
+import code.name.monkey.retromusic.ADAPTIVE_COLOR_APP
+import code.name.monkey.retromusic.ALBUM_COVER_STYLE
+import code.name.monkey.retromusic.ALBUM_COVER_TRANSFORM
+import code.name.monkey.retromusic.CAROUSEL_EFFECT
+import code.name.monkey.retromusic.CIRCLE_PLAY_BUTTON
+import code.name.monkey.retromusic.EXTRA_SONG_INFO
+import code.name.monkey.retromusic.KEEP_SCREEN_ON
+import code.name.monkey.retromusic.LIBRARY_CATEGORIES
+import code.name.monkey.retromusic.NOW_PLAYING_SCREEN_ID
 import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.SCREEN_ON_LYRICS
+import code.name.monkey.retromusic.SWIPE_ANYWHERE_NOW_PLAYING
+import code.name.monkey.retromusic.SWIPE_DOWN_DISMISS
+import code.name.monkey.retromusic.TAB_TEXT_MODE
+import code.name.monkey.retromusic.TOGGLE_ADD_CONTROLS
+import code.name.monkey.retromusic.TOGGLE_FULL_SCREEN
+import code.name.monkey.retromusic.TOGGLE_VOLUME
+import code.name.monkey.retromusic.activities.PermissionActivity
 import code.name.monkey.retromusic.databinding.SlidingMusicPanelLayoutBinding
+import code.name.monkey.retromusic.extensions.*
 import code.name.monkey.retromusic.fragments.LibraryViewModel
 import code.name.monkey.retromusic.fragments.NowPlayingScreen
 import code.name.monkey.retromusic.fragments.NowPlayingScreen.*
@@ -60,12 +79,21 @@ import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.model.CategoryInfo
 import code.name.monkey.retromusic.util.PreferenceUtil
 import code.name.monkey.retromusic.util.ViewUtil
+import code.name.monkey.retromusic.util.logD
+import com.google.android.material.bottomnavigation.BottomNavigationView
 import com.google.android.material.bottomsheet.BottomSheetBehavior
-import com.google.android.material.bottomsheet.BottomSheetBehavior.*
+import com.google.android.material.bottomsheet.BottomSheetBehavior.BottomSheetCallback
+import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_COLLAPSED
+import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_DRAGGING
+import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_EXPANDED
+import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_HIDDEN
+import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_SETTLING
+import com.google.android.material.bottomsheet.BottomSheetBehavior.from
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
 
-abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity() {
+abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(),
+    SharedPreferences.OnSharedPreferenceChangeListener {
     companion object {
         val TAG: String = AbsSlidingMusicPanelActivity::class.java.simpleName
     }
@@ -74,13 +102,13 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity() {
     private var windowInsets: WindowInsetsCompat? = null
     protected val libraryViewModel by viewModel<LibraryViewModel>()
     private lateinit var bottomSheetBehavior: BottomSheetBehavior<FrameLayout>
-    private var playerFragment: AbsPlayerFragment? = null
+    private lateinit var playerFragment: AbsPlayerFragment
     private var miniPlayerFragment: MiniPlayerFragment? = null
     private var nowPlayingScreen: NowPlayingScreen? = null
     private var taskColor: Int = 0
     private var paletteColor: Int = Color.WHITE
     private var navigationBarColor = 0
-    protected abstract fun createContentView(): SlidingMusicPanelLayoutBinding
+
     private val panelState: Int
         get() = bottomSheetBehavior.state
     private lateinit var binding: SlidingMusicPanelLayoutBinding
@@ -89,45 +117,51 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity() {
     private var navigationBarColorAnimator: ValueAnimator? = null
     private val argbEvaluator: ArgbEvaluator = ArgbEvaluator()
 
-    private val bottomSheetCallbackList = object : BottomSheetCallback() {
+    private val bottomSheetCallbackList by lazy {
+        object : BottomSheetCallback() {
 
-        override fun onSlide(bottomSheet: View, slideOffset: Float) {
+            override fun onSlide(bottomSheet: View, slideOffset: Float) {
-            setMiniPlayerAlphaProgress(slideOffset)
+                setMiniPlayerAlphaProgress(slideOffset)
-            navigationBarColorAnimator?.cancel()
+                navigationBarColorAnimator?.cancel()
-            setNavigationBarColorPreOreo(
+                setNavigationBarColorPreOreo(
-                argbEvaluator.evaluate(
+                    argbEvaluator.evaluate(
-                    slideOffset,
+                        slideOffset,
-                    surfaceColor(),
+                        surfaceColor(),
-                    navigationBarColor
+                        navigationBarColor
-                ) as Int
+                    ) as Int
-            )
+                )
-        }
+            }
 
-        override fun onStateChanged(bottomSheet: View, newState: Int) {
+            override fun onStateChanged(bottomSheet: View, newState: Int) {
-            when (newState) {
+                when (newState) {
-                STATE_EXPANDED -> {
+                    STATE_EXPANDED -> {
-                    onPanelExpanded()
+                        onPanelExpanded()
-                    if (PreferenceUtil.lyricsScreenOn && PreferenceUtil.showLyrics) {
+                        if (PreferenceUtil.lyricsScreenOn && PreferenceUtil.showLyrics) {
-                        keepScreenOn(true)
+                            keepScreenOn(true)
+                        }
                     }
-                }
+
-                STATE_COLLAPSED -> {
+                    STATE_COLLAPSED -> {
-                    onPanelCollapsed()
+                        onPanelCollapsed()
-                    if ((PreferenceUtil.lyricsScreenOn && PreferenceUtil.showLyrics) || !PreferenceUtil.isScreenOnEnabled) {
+                        if ((PreferenceUtil.lyricsScreenOn && PreferenceUtil.showLyrics) || !PreferenceUtil.isScreenOnEnabled) {
-                        keepScreenOn(false)
+                            keepScreenOn(false)
+                        }
                     }
-                }
+
-                STATE_SETTLING, STATE_DRAGGING -> {
+                    STATE_SETTLING, STATE_DRAGGING -> {
-                    if (fromNotification) {
+                        if (fromNotification) {
-                        binding.bottomNavigationView.bringToFront()
+                            binding.navigationView.bringToFront()
-                        fromNotification = false
+                            fromNotification = false
+                        }
+                    }
+
+                    STATE_HIDDEN -> {
+                        MusicPlayerRemote.clearQueue()
+                    }
+
+                    else -> {
+                        logD("Do a flip")
                     }
-                }
-                STATE_HIDDEN -> {
-                    MusicPlayerRemote.clearQueue()
-                }
-                else -> {
-                    println("Do a flip")
                 }
             }
         }
@@ -137,12 +171,14 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        binding = createContentView()
+        if (!hasPermissions()) {
+            startActivity(Intent(this, PermissionActivity::class.java))
+            finish()
+        }
+        binding = SlidingMusicPanelLayoutBinding.inflate(layoutInflater)
         setContentView(binding.root)
-        ViewCompat.setOnApplyWindowInsetsListener(
+        binding.root.setOnApplyWindowInsetsListener { _, insets ->
-            binding.root
+            windowInsets = WindowInsetsCompat.toWindowInsetsCompat(insets)
-        ) { _, insets ->
-            windowInsets = insets
             insets
         }
         chooseFragmentForTheme()
@@ -151,7 +187,7 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity() {
         updateColor()
         if (!PreferenceUtil.materialYou) {
             binding.slidingPanel.backgroundTintList = ColorStateList.valueOf(darkAccentColor())
-            bottomNavigationView.backgroundTintList = ColorStateList.valueOf(darkAccentColor())
+            navigationView.backgroundTintList = ColorStateList.valueOf(darkAccentColor())
         }
 
         navigationBarColor = surfaceColor()
@@ -161,11 +197,13 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity() {
         bottomSheetBehavior = from(binding.slidingPanel)
         bottomSheetBehavior.addBottomSheetCallback(bottomSheetCallbackList)
         bottomSheetBehavior.isHideable = PreferenceUtil.swipeDownToDismiss
+        bottomSheetBehavior.significantVelocityThreshold = 300
         setMiniPlayerAlphaProgress(0F)
     }
 
     override fun onResume() {
         super.onResume()
+        PreferenceUtil.registerOnSharedPreferenceChangedListener(this)
         if (nowPlayingScreen != PreferenceUtil.nowPlayingScreen) {
             postRecreate()
         }
@@ -177,10 +215,69 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity() {
     override fun onDestroy() {
         super.onDestroy()
         bottomSheetBehavior.removeBottomSheetCallback(bottomSheetCallbackList)
+        PreferenceUtil.unregisterOnSharedPreferenceChangedListener(this)
     }
 
-    protected fun wrapSlidingMusicPanel(): SlidingMusicPanelLayoutBinding {
+    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
-        return SlidingMusicPanelLayoutBinding.inflate(layoutInflater)
+        when (key) {
+            SWIPE_DOWN_DISMISS -> {
+                bottomSheetBehavior.isHideable = PreferenceUtil.swipeDownToDismiss
+            }
+
+            TOGGLE_ADD_CONTROLS -> {
+                miniPlayerFragment?.setUpButtons()
+            }
+
+            NOW_PLAYING_SCREEN_ID -> {
+                chooseFragmentForTheme()
+                binding.slidingPanel.updateLayoutParams<ViewGroup.LayoutParams> {
+                    height = if (nowPlayingScreen != Peek) {
+                        ViewGroup.LayoutParams.MATCH_PARENT
+                    } else {
+                        ViewGroup.LayoutParams.WRAP_CONTENT
+                    }
+                    onServiceConnected()
+                }
+            }
+
+            ALBUM_COVER_TRANSFORM, CAROUSEL_EFFECT,
+            ALBUM_COVER_STYLE, TOGGLE_VOLUME, EXTRA_SONG_INFO, CIRCLE_PLAY_BUTTON,
+            -> {
+                chooseFragmentForTheme()
+                onServiceConnected()
+            }
+
+            SWIPE_ANYWHERE_NOW_PLAYING -> {
+                playerFragment.addSwipeDetector()
+            }
+
+            ADAPTIVE_COLOR_APP -> {
+                if (PreferenceUtil.nowPlayingScreen in listOf(Normal, Material, Flat)) {
+                    chooseFragmentForTheme()
+                    onServiceConnected()
+                }
+            }
+
+            LIBRARY_CATEGORIES -> {
+                updateTabs()
+            }
+
+            TAB_TEXT_MODE -> {
+                navigationView.labelVisibilityMode = PreferenceUtil.tabTitleMode
+            }
+
+            TOGGLE_FULL_SCREEN -> {
+                recreate()
+            }
+
+            SCREEN_ON_LYRICS -> {
+                keepScreenOn(bottomSheetBehavior.state == STATE_EXPANDED && PreferenceUtil.lyricsScreenOn && PreferenceUtil.showLyrics || PreferenceUtil.isScreenOnEnabled)
+            }
+
+            KEEP_SCREEN_ON -> {
+                maybeSetScreenOn()
+            }
+        }
     }
 
     fun collapsePanel() {
@@ -196,8 +293,10 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity() {
         val alpha = 1 - progress
         miniPlayerFragment?.view?.alpha = 1 - (progress / 0.2F)
         miniPlayerFragment?.view?.isGone = alpha == 0f
-        binding.bottomNavigationView.translationY = progress * 500
+        if (!isLandscape) {
-        binding.bottomNavigationView.alpha = alpha
+            binding.navigationView.translationY = progress * 500
+            binding.navigationView.alpha = alpha
+        }
         binding.playerFragmentContainer.alpha = (progress - 0.2F) / 0.2F
     }
 
@@ -224,13 +323,13 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity() {
         setLightStatusBarAuto()
         setLightNavigationBarAuto()
         setTaskDescriptionColor(taskColor)
-        playerFragment?.onHide()
+        //playerFragment?.onHide()
     }
 
     open fun onPanelExpanded() {
         setMiniPlayerAlphaProgress(1F)
         onPaletteColorChanged()
-        playerFragment?.onShow()
+        //playerFragment?.onShow()
     }
 
     private fun setupSlidingUpPanel() {
@@ -254,21 +353,15 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity() {
         })
     }
 
-    val bottomNavigationView get() = binding.bottomNavigationView
+    val navigationView get() = binding.navigationView
 
     val slidingPanel get() = binding.slidingPanel
 
+    val isBottomNavVisible get() = navigationView.isVisible && navigationView is BottomNavigationView
+
     override fun onServiceConnected() {
         super.onServiceConnected()
-        if (MusicPlayerRemote.playingQueue.isNotEmpty()) {
+        hideBottomSheet(false)
-            binding.slidingPanel.viewTreeObserver.addOnGlobalLayoutListener(object :
-                ViewTreeObserver.OnGlobalLayoutListener {
-                override fun onGlobalLayout() {
-                    binding.slidingPanel.viewTreeObserver.removeOnGlobalLayoutListener(this)
-                    hideBottomSheet(false)
-                }
-            })
-        } // don't call hideBottomSheet(true) here as it causes a bug with the SlidingUpPanelLayout
     }
 
     override fun onQueueChanged() {
@@ -280,12 +373,8 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity() {
         }
     }
 
-    override fun onBackPressed() {
-        if (!handleBackPress()) super.onBackPressed()
-    }
-
     private fun handleBackPress(): Boolean {
-        if (bottomSheetBehavior.peekHeight != 0 && playerFragment!!.onBackPressed()) return true
+        if (bottomSheetBehavior.peekHeight != 0 && playerFragment.onBackPressed()) return true
         if (panelState == STATE_EXPANDED) {
             collapsePanel()
             return true
@@ -332,18 +421,20 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity() {
     }
 
     fun updateTabs() {
-        binding.bottomNavigationView.menu.clear()
+        binding.navigationView.menu.clear()
         val currentTabs: List<CategoryInfo> = PreferenceUtil.libraryCategory
         for (tab in currentTabs) {
             if (tab.visible) {
                 val menu = tab.category
-                binding.bottomNavigationView.menu.add(0, menu.id, 0, menu.stringRes)
+                binding.navigationView.menu.add(0, menu.id, 0, menu.stringRes)
                     .setIcon(menu.icon)
             }
         }
-        if (binding.bottomNavigationView.menu.size() == 1) {
+        if (binding.navigationView.menu.size() == 1) {
             isInOneTabMode = true
-            binding.bottomNavigationView.hide()
+            binding.navigationView.isVisible = false
+        } else {
+            isInOneTabMode = false
         }
     }
 
@@ -359,7 +450,7 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity() {
         animate: Boolean = false,
         hideBottomSheet: Boolean = MusicPlayerRemote.playingQueue.isEmpty(),
     ) {
-        if (!ViewCompat.isLaidOut(bottomNavigationView)) {
+        if (!ViewCompat.isLaidOut(navigationView)) {
             return
         }
         if (isInOneTabMode) {
@@ -370,38 +461,38 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity() {
             )
             return
         }
-        val mAnimate = animate && bottomSheetBehavior.state == STATE_COLLAPSED
+        if (visible xor navigationView.isVisible) {
-        if (mAnimate) {
+            val mAnimate = animate && bottomSheetBehavior.state == STATE_COLLAPSED
-            if (visible) {
+            if (mAnimate) {
-                binding.bottomNavigationView.bringToFront()
+                if (visible) {
-                binding.bottomNavigationView.show()
+                    binding.navigationView.bringToFront()
+                    binding.navigationView.show()
+                } else {
+                    binding.navigationView.hide()
+                }
             } else {
-                binding.bottomNavigationView.hide()
+                binding.navigationView.isVisible = visible
-            }
+                if (visible && bottomSheetBehavior.state != STATE_EXPANDED) {
-        } else {
+                    binding.navigationView.bringToFront()
-            binding.bottomNavigationView.isVisible = false
+                }
-            if (visible && bottomSheetBehavior.state != STATE_EXPANDED) {
-                binding.bottomNavigationView.bringToFront()
             }
         }
         hideBottomSheet(
             hide = hideBottomSheet,
             animate = animate,
-            isBottomNavVisible = visible
+            isBottomNavVisible = visible && navigationView is BottomNavigationView
         )
     }
 
     fun hideBottomSheet(
         hide: Boolean,
         animate: Boolean = false,
-        isBottomNavVisible: Boolean = bottomNavigationView.isVisible,
+        isBottomNavVisible: Boolean = navigationView.isVisible && navigationView is BottomNavigationView,
     ) {
-        val heightOfBar =
+        val heightOfBar = windowInsets.getBottomInsets() + dip(R.dimen.mini_player_height)
-            windowInsets.safeGetBottomInsets() +
-                    if (MusicPlayerRemote.isCasting) dip(R.dimen.cast_mini_player_height) else dip(R.dimen.mini_player_height)
         val heightOfBarWithTabs = heightOfBar + dip(R.dimen.bottom_nav_height)
         if (hide) {
-            bottomSheetBehavior.peekHeight = -windowInsets.safeGetBottomInsets()
+            bottomSheetBehavior.peekHeight = -windowInsets.getBottomInsets()
             bottomSheetBehavior.state = STATE_COLLAPSED
             libraryViewModel.setFabMargin(
                 this,
@@ -410,17 +501,20 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity() {
         } else {
             if (MusicPlayerRemote.playingQueue.isNotEmpty()) {
                 binding.slidingPanel.elevation = 0F
-                binding.bottomNavigationView.elevation = 5F
+                binding.navigationView.elevation = 5F
                 if (isBottomNavVisible) {
-                    println("List")
+                    logD("List")
                     if (animate) {
                         bottomSheetBehavior.peekHeightAnimate(heightOfBarWithTabs)
                     } else {
                         bottomSheetBehavior.peekHeight = heightOfBarWithTabs
                     }
-                    libraryViewModel.setFabMargin(this, dip(R.dimen.mini_player_height_expanded))
+                    libraryViewModel.setFabMargin(
+                        this,
+                        dip(R.dimen.bottom_nav_mini_player_height)
+                    )
                 } else {
-                    println("Details")
+                    logD("Details")
                     if (animate) {
                         bottomSheetBehavior.peekHeightAnimate(heightOfBar).doOnEnd {
                             binding.slidingPanel.bringToFront()
@@ -443,7 +537,7 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity() {
     private fun chooseFragmentForTheme() {
         nowPlayingScreen = PreferenceUtil.nowPlayingScreen
 
-        val fragment: Fragment = when (nowPlayingScreen) {
+        val fragment: AbsPlayerFragment = when (nowPlayingScreen) {
             Blur -> BlurPlayerFragment()
             Adaptive -> AdaptiveFragment()
             Normal -> PlayerFragment()
@@ -463,12 +557,12 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity() {
             Classic -> ClassicPlayerFragment()
             MD3 -> MD3PlayerFragment()
             else -> PlayerFragment()
-        } // must implement AbsPlayerFragment
+        } // must extend AbsPlayerFragment
         supportFragmentManager.commit {
             replace(R.id.playerFragmentContainer, fragment)
         }
         supportFragmentManager.executePendingTransactions()
-        playerFragment = whichFragment<AbsPlayerFragment>(R.id.playerFragmentContainer)
+        playerFragment = whichFragment(R.id.playerFragmentContainer)
         miniPlayerFragment = whichFragment<MiniPlayerFragment>(R.id.miniPlayerFragment)
         miniPlayerFragment?.view?.setOnClickListener { expandPanel() }
     }

app/src/main/java/code/name/monkey/retromusic/activities/base/AbsThemeActivity.kt

@@ -20,15 +20,15 @@ import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
 import android.view.KeyEvent
-import android.view.View
 import androidx.appcompat.app.AppCompatDelegate.setDefaultNightMode
 import androidx.core.os.ConfigurationCompat
 import code.name.monkey.appthemehelper.common.ATHToolbarActivity
 import code.name.monkey.appthemehelper.util.VersionUtils
 import code.name.monkey.retromusic.LanguageContextWrapper
-import code.name.monkey.retromusic.extensions.*
 import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.extensions.*
 import code.name.monkey.retromusic.util.PreferenceUtil
+import code.name.monkey.retromusic.util.maybeShowAnnoyingToasts
 import code.name.monkey.retromusic.util.theme.getNightMode
 import code.name.monkey.retromusic.util.theme.getThemeResValue
 import java.util.*
@@ -42,13 +42,13 @@ abstract class AbsThemeActivity : ATHToolbarActivity(), Runnable {
         hideStatusBar()
         super.onCreate(savedInstanceState)
         setEdgeToEdgeOrImmersive()
-        registerSystemUiVisibility()
+        maybeSetScreenOn()
-        toggleScreenOn()
         setLightNavigationBarAuto()
         setLightStatusBarAuto(surfaceColor())
         if (VersionUtils.hasQ()) {
             window.decorView.isForceDarkAllowed = false
         }
+        maybeShowAnnoyingToasts()
     }
 
     private fun updateTheme() {
@@ -60,9 +60,6 @@ abstract class AbsThemeActivity : ATHToolbarActivity(), Runnable {
         if (PreferenceUtil.isCustomFont) {
             setTheme(R.style.FontThemeOverlay)
         }
-        if (PreferenceUtil.circlePlayButton) {
-            setTheme(R.style.CircleFABOverlay)
-        }
     }
 
     override fun onWindowFocusChanged(hasFocus: Boolean) {
@@ -76,20 +73,6 @@ abstract class AbsThemeActivity : ATHToolbarActivity(), Runnable {
         }
     }
 
-    private fun registerSystemUiVisibility() {
-        val decorView = window.decorView
-        decorView.setOnSystemUiVisibilityChangeListener { visibility ->
-            if (visibility and View.SYSTEM_UI_FLAG_FULLSCREEN == 0) {
-                setImmersiveFullscreen()
-            }
-        }
-    }
-
-    private fun unregisterSystemUiVisibility() {
-        val decorView = window.decorView
-        decorView.setOnSystemUiVisibilityChangeListener(null)
-    }
-
     override fun run() {
         setImmersiveFullscreen()
     }
@@ -101,7 +84,6 @@ abstract class AbsThemeActivity : ATHToolbarActivity(), Runnable {
 
     public override fun onDestroy() {
         super.onDestroy()
-        unregisterSystemUiVisibility()
         exitFullscreen()
     }
 

app/src/main/java/code/name/monkey/retromusic/activities/bugreport/BugReportActivity.kt

@@ -64,7 +64,6 @@ open class BugReportActivity : AbsThemeActivity() {
 
     private fun reportIssue() {
         copyDeviceInfoToClipBoard()
-
         val i = Intent(Intent.ACTION_VIEW)
         i.data = ISSUE_TRACKER_LINK.toUri()
         i.flags = Intent.FLAG_ACTIVITY_NEW_TASK
@@ -80,17 +79,11 @@ open class BugReportActivity : AbsThemeActivity() {
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         if (item.itemId == android.R.id.home) {
-            onBackPressed()
+            onBackPressedDispatcher.onBackPressed()
         }
         return super.onOptionsItemSelected(item)
     }
 
-    private fun tryToFinishActivity() {
-        if (!isFinishing) {
-            finish()
-        }
-    }
-
     companion object {
         private const val ISSUE_TRACKER_LINK =
             "https://github.com/MuntashirAkon/Metro/issues/new"

app/src/main/java/code/name/monkey/retromusic/activities/saf/SAFGuideActivity.java

@@ -50,8 +50,8 @@ public class SAFGuideActivity extends IntroActivity {
                     ? R.string.saf_guide_slide1_description_before_o
                     : R.string.saf_guide_slide1_description)
             .image(R.drawable.saf_guide_1)
-            .background(R.color.md_deep_purple_300)
+            .background(code.name.monkey.appthemehelper.R.color.md_deep_purple_300)
-            .backgroundDark(R.color.md_deep_purple_400)
+            .backgroundDark(code.name.monkey.appthemehelper.R.color.md_deep_purple_400)
             .layout(R.layout.fragment_simple_slide_large_image)
             .build());
     addSlide(
@@ -59,8 +59,8 @@ public class SAFGuideActivity extends IntroActivity {
             .title(R.string.saf_guide_slide2_title)
             .description(R.string.saf_guide_slide2_description)
             .image(R.drawable.saf_guide_2)
-            .background(R.color.md_deep_purple_500)
+            .background(code.name.monkey.appthemehelper.R.color.md_deep_purple_500)
-            .backgroundDark(R.color.md_deep_purple_600)
+            .backgroundDark(code.name.monkey.appthemehelper.R.color.md_deep_purple_600)
             .layout(R.layout.fragment_simple_slide_large_image)
             .build());
     addSlide(
@@ -68,8 +68,8 @@ public class SAFGuideActivity extends IntroActivity {
             .title(R.string.saf_guide_slide3_title)
             .description(R.string.saf_guide_slide3_description)
             .image(R.drawable.saf_guide_3)
-            .background(R.color.md_deep_purple_700)
+            .background(code.name.monkey.appthemehelper.R.color.md_deep_purple_700)
-            .backgroundDark(R.color.md_deep_purple_800)
+            .backgroundDark(code.name.monkey.appthemehelper.R.color.md_deep_purple_800)
             .layout(R.layout.fragment_simple_slide_large_image)
             .build());
   }

app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AbsTagEditorActivity.kt

@@ -33,11 +33,10 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AlertDialog
 import androidx.lifecycle.lifecycleScope
 import androidx.viewbinding.ViewBinding
-import code.name.monkey.appthemehelper.ThemeStore
-import code.name.monkey.appthemehelper.util.TintHelper
 import code.name.monkey.appthemehelper.util.VersionUtils
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.base.AbsBaseActivity
+import code.name.monkey.retromusic.activities.saf.SAFGuideActivity
 import code.name.monkey.retromusic.extensions.accentColor
 import code.name.monkey.retromusic.extensions.colorButtons
 import code.name.monkey.retromusic.extensions.hideSoftKeyboard
@@ -46,6 +45,7 @@ import code.name.monkey.retromusic.model.ArtworkInfo
 import code.name.monkey.retromusic.model.AudioTagInfo
 import code.name.monkey.retromusic.repository.Repository
 import code.name.monkey.retromusic.util.SAFUtil
+import code.name.monkey.retromusic.util.logD
 import com.google.android.material.button.MaterialButton
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import kotlinx.coroutines.GlobalScope
@@ -55,7 +55,7 @@ import org.jaudiotagger.audio.AudioFileIO
 import org.jaudiotagger.tag.FieldKey
 import org.koin.android.ext.android.inject
 import java.io.File
-import java.util.*
+import java.util.Collections
 
 abstract class AbsTagEditorActivity<VB : ViewBinding> : AbsBaseActivity() {
     abstract val editorImage: ImageView
@@ -221,7 +221,7 @@ abstract class AbsTagEditorActivity<VB : ViewBinding> : AbsBaseActivity() {
         getIntentExtras()
 
         songPaths = getSongPaths()
-        println(songPaths?.size)
+        logD(songPaths?.size)
         if (songPaths!!.isEmpty()) {
             finish()
         }
@@ -274,7 +274,6 @@ abstract class AbsTagEditorActivity<VB : ViewBinding> : AbsBaseActivity() {
             scaleY = 0f
             isEnabled = false
             setOnClickListener { save() }
-            TintHelper.setTintAuto(this, ThemeStore.accentColor(this@AbsTagEditorActivity), true)
         }
     }
 
@@ -307,7 +306,7 @@ abstract class AbsTagEditorActivity<VB : ViewBinding> : AbsBaseActivity() {
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
             android.R.id.home -> {
-                super.onBackPressed()
+                onBackPressedDispatcher.onBackPressed()
                 return true
             }
         }
@@ -350,7 +349,7 @@ abstract class AbsTagEditorActivity<VB : ViewBinding> : AbsBaseActivity() {
         hideSoftKeyboard()
 
         hideFab()
-        println(fieldKeyValueMap)
+        logD(fieldKeyValueMap)
         GlobalScope.launch {
             if (VersionUtils.hasR()) {
                 cacheFiles = TagWriter.writeTagsToFilesR(
@@ -409,15 +408,18 @@ abstract class AbsTagEditorActivity<VB : ViewBinding> : AbsBaseActivity() {
                     loadImageFromFile(it)
                 }
             }
-            code.name.monkey.retromusic.activities.saf.SAFGuideActivity.REQUEST_CODE_SAF_GUIDE -> {
+
+            SAFGuideActivity.REQUEST_CODE_SAF_GUIDE -> {
                 SAFUtil.openTreePicker(this)
             }
+
             SAFUtil.REQUEST_SAF_PICK_TREE -> {
                 if (resultCode == Activity.RESULT_OK) {
                     SAFUtil.saveTreeUri(this, intent)
                     writeTags(savedSongPaths)
                 }
             }
+
             SAFUtil.REQUEST_SAF_PICK_FILE -> {
                 if (resultCode == Activity.RESULT_OK) {
                     writeTags(Collections.singletonList(currentSongPath + SAFUtil.SEPARATOR + intent!!.dataString))

app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AlbumTagEditorActivity.kt

@@ -30,8 +30,12 @@ import androidx.core.widget.doAfterTextChanged
 import code.name.monkey.appthemehelper.util.MaterialValueHelper
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.databinding.ActivityAlbumTagEditorBinding
-import code.name.monkey.retromusic.extensions.*
+import code.name.monkey.retromusic.extensions.appHandleColor
-import code.name.monkey.retromusic.glide.GlideApp
+import code.name.monkey.retromusic.extensions.defaultFooterColor
+import code.name.monkey.retromusic.extensions.isColorLight
+import code.name.monkey.retromusic.extensions.setTint
+import code.name.monkey.retromusic.extensions.showToast
+import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette
 import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper
 import code.name.monkey.retromusic.model.ArtworkInfo
 import code.name.monkey.retromusic.model.Song
@@ -39,12 +43,14 @@ import code.name.monkey.retromusic.util.ImageUtil
 import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.RetroColorUtil.generatePalette
 import code.name.monkey.retromusic.util.RetroColorUtil.getColor
+import code.name.monkey.retromusic.util.logD
+import com.bumptech.glide.Glide
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.bumptech.glide.request.target.ImageViewTarget
 import com.bumptech.glide.request.transition.Transition
 import com.google.android.material.shape.MaterialShapeDrawable
 import org.jaudiotagger.tag.FieldKey
-import java.util.*
+import java.util.EnumMap
 
 class AlbumTagEditorActivity : AbsTagEditorActivity<ActivityAlbumTagEditorBinding>() {
 
@@ -98,7 +104,7 @@ class AlbumTagEditorActivity : AbsTagEditorActivity<ActivityAlbumTagEditorBindin
         binding.albumArtistText.setText(albumArtistName)
         binding.genreTitle.setText(genreName)
         binding.yearTitle.setText(songYear)
-        println(albumTitle + albumArtistName)
+        logD(albumTitle + albumArtistName)
     }
 
     override fun loadCurrentImage() {
@@ -131,7 +137,9 @@ class AlbumTagEditorActivity : AbsTagEditorActivity<ActivityAlbumTagEditorBindin
     }
 
     override fun loadImageFromFile(selectedFile: Uri?) {
-        GlideApp.with(this@AlbumTagEditorActivity).asBitmapPalette().load(selectedFile)
+        Glide.with(this@AlbumTagEditorActivity)
+            .asBitmapPalette()
+            .load(selectedFile)
             .diskCacheStrategy(DiskCacheStrategy.NONE).skipMemoryCache(true)
             .into(object : ImageViewTarget<BitmapPaletteWrapper>(binding.editorImage) {
                 override fun onResourceReady(

app/src/main/java/code/name/monkey/retromusic/activities/tageditor/SongTagEditorActivity.kt

@@ -31,13 +31,15 @@ import code.name.monkey.appthemehelper.util.MaterialValueHelper
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.databinding.ActivitySongTagEditorBinding
 import code.name.monkey.retromusic.extensions.*
-import code.name.monkey.retromusic.glide.GlideApp
+import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette
 import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper
 import code.name.monkey.retromusic.model.ArtworkInfo
 import code.name.monkey.retromusic.repository.SongRepository
 import code.name.monkey.retromusic.util.ImageUtil
 import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.RetroColorUtil
+import code.name.monkey.retromusic.util.logD
+import com.bumptech.glide.Glide
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.bumptech.glide.request.target.ImageViewTarget
 import com.bumptech.glide.request.transition.Transition
@@ -102,7 +104,7 @@ class SongTagEditorActivity : AbsTagEditorActivity<ActivitySongTagEditorBinding>
         binding.discNumberText.setText(discNumber)
         binding.lyricsText.setText(lyrics)
         binding.songComposerText.setText(composer)
-        println(songTitle + songYear)
+        logD(songTitle + songYear)
     }
 
     override fun loadCurrentImage() {
@@ -170,8 +172,11 @@ class SongTagEditorActivity : AbsTagEditorActivity<ActivitySongTagEditorBinding>
     override fun getSongUris(): List<Uri> = listOf(MusicUtil.getSongFileUri(id))
 
     override fun loadImageFromFile(selectedFile: Uri?) {
-        GlideApp.with(this@SongTagEditorActivity).asBitmapPalette().load(selectedFile)
+        Glide.with(this@SongTagEditorActivity)
-            .diskCacheStrategy(DiskCacheStrategy.NONE).skipMemoryCache(true)
+            .asBitmapPalette()
+            .load(selectedFile)
+            .diskCacheStrategy(DiskCacheStrategy.NONE)
+            .skipMemoryCache(true)
             .into(object : ImageViewTarget<BitmapPaletteWrapper>(binding.editorImage) {
                 override fun onResourceReady(
                     resource: BitmapPaletteWrapper,

app/src/main/java/code/name/monkey/retromusic/adapter/GenreAdapter.kt

@@ -23,13 +23,15 @@ import androidx.fragment.app.FragmentActivity
 import androidx.recyclerview.widget.RecyclerView
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.databinding.ItemGenreBinding
-import code.name.monkey.retromusic.glide.GlideApp
 import code.name.monkey.retromusic.glide.RetroGlideExtension
+import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette
+import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions
 import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
 import code.name.monkey.retromusic.interfaces.IGenreClickListener
 import code.name.monkey.retromusic.model.Genre
 import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
+import com.bumptech.glide.Glide
 import java.util.*
 
 /**
@@ -68,10 +70,10 @@ class GenreAdapter(
 
     private fun loadGenreImage(genre: Genre, holder: GenreAdapter.ViewHolder) {
         val genreSong = MusicUtil.songByGenre(genre.id)
-        GlideApp.with(activity)
+        Glide.with(activity)
             .asBitmapPalette()
-            .load(RetroGlideExtension.getSongModel(genreSong))
             .songCoverOptions(genreSong)
+            .load(RetroGlideExtension.getSongModel(genreSong))
             .into(object : RetroMusicColoredTarget(holder.binding.image) {
                 override fun onColorReady(colors: MediaNotificationProcessor) {
                     setColors(holder, colors)

app/src/main/java/code/name/monkey/retromusic/adapter/HomeAdapter.kt

@@ -18,7 +18,6 @@ import android.annotation.SuppressLint
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.ImageView
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.AppCompatTextView
 import androidx.core.os.bundleOf
@@ -35,14 +34,14 @@ import code.name.monkey.retromusic.adapter.song.SongAdapter
 import code.name.monkey.retromusic.fragments.home.HomeFragment
 import code.name.monkey.retromusic.interfaces.IAlbumClickListener
 import code.name.monkey.retromusic.interfaces.IArtistClickListener
-import code.name.monkey.retromusic.interfaces.IGenreClickListener
+import code.name.monkey.retromusic.model.Album
-import code.name.monkey.retromusic.model.*
+import code.name.monkey.retromusic.model.Artist
+import code.name.monkey.retromusic.model.Home
+import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.util.PreferenceUtil
 
-class HomeAdapter(
+class HomeAdapter(private val activity: AppCompatActivity) :
-    private val activity: AppCompatActivity
+    RecyclerView.Adapter<RecyclerView.ViewHolder>(), IArtistClickListener, IAlbumClickListener {
-) : RecyclerView.Adapter<RecyclerView.ViewHolder>(), IArtistClickListener, IAlbumClickListener,
-    IGenreClickListener {
 
     private var list = listOf<Home>()
 
@@ -134,6 +133,7 @@ class HomeAdapter(
         notifyDataSetChanged()
     }
 
+    @Suppress("UNCHECKED_CAST")
     private inner class AlbumViewHolder(view: View) : AbsHomeViewItem(view) {
         fun bindView(home: Home) {
             title.setText(home.titleRes)
@@ -144,6 +144,7 @@ class HomeAdapter(
         }
     }
 
+    @Suppress("UNCHECKED_CAST")
     private inner class ArtistViewHolder(view: View) : AbsHomeViewItem(view) {
         fun bindView(home: Home) {
             title.setText(home.titleRes)
@@ -154,6 +155,7 @@ class HomeAdapter(
         }
     }
 
+    @Suppress("UNCHECKED_CAST")
     private inner class PlaylistViewHolder(view: View) : AbsHomeViewItem(view) {
         fun bindView(home: Home) {
             title.setText(home.titleRes)
@@ -161,7 +163,7 @@ class HomeAdapter(
                 val songAdapter = SongAdapter(
                     activity,
                     home.arrayList as MutableList<Song>,
-                    R.layout.item_favourite_card, null
+                    R.layout.item_favourite_card
                 )
                 layoutManager = linearLayoutManager()
                 adapter = songAdapter
@@ -172,15 +174,14 @@ class HomeAdapter(
     open class AbsHomeViewItem(itemView: View) : RecyclerView.ViewHolder(itemView) {
         val recyclerView: RecyclerView = itemView.findViewById(R.id.recyclerView)
         val title: AppCompatTextView = itemView.findViewById(R.id.title)
-        val arrow: ImageView = itemView.findViewById(R.id.arrow)
         val clickableArea: ViewGroup = itemView.findViewById(R.id.clickable_area)
     }
 
     private fun artistsAdapter(artists: List<Artist>) =
-        ArtistAdapter(activity, artists, PreferenceUtil.homeArtistGridStyle, null, this)
+        ArtistAdapter(activity, artists, PreferenceUtil.homeArtistGridStyle, this)
 
     private fun albumAdapter(albums: List<Album>) =
-        AlbumAdapter(activity, albums, PreferenceUtil.homeAlbumGridStyle, null, this)
+        AlbumAdapter(activity, albums, PreferenceUtil.homeAlbumGridStyle, this)
 
     private fun gridLayoutManager() =
         GridLayoutManager(activity, 1, GridLayoutManager.HORIZONTAL, false)
@@ -209,16 +210,4 @@ class HomeAdapter(
             )
         )
     }
-
+}
-    override fun onClickGenre(genre: Genre, view: View) {
-        activity.findNavController(R.id.fragment_container).navigate(
-            R.id.genreDetailsFragment,
-            bundleOf(EXTRA_GENRE to genre),
-            null,
-            FragmentNavigatorExtras(
-                view to "genre"
-            )
-        )
-    }
-
-}

app/src/main/java/code/name/monkey/retromusic/adapter/SearchAdapter.kt

@@ -27,9 +27,12 @@ import androidx.navigation.findNavController
 import androidx.recyclerview.widget.RecyclerView
 import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.retromusic.*
+import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder
 import code.name.monkey.retromusic.db.PlaylistWithSongs
-import code.name.monkey.retromusic.glide.GlideApp
 import code.name.monkey.retromusic.glide.RetroGlideExtension
+import code.name.monkey.retromusic.glide.RetroGlideExtension.albumCoverOptions
+import code.name.monkey.retromusic.glide.RetroGlideExtension.artistImageOptions
+import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.helper.menu.SongMenuHelper
 import code.name.monkey.retromusic.model.Album
@@ -37,6 +40,7 @@ import code.name.monkey.retromusic.model.Artist
 import code.name.monkey.retromusic.model.Genre
 import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.util.MusicUtil
+import com.bumptech.glide.Glide
 import java.util.*
 
 class SearchAdapter(
@@ -59,26 +63,28 @@ class SearchAdapter(
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        return if (viewType == HEADER) ViewHolder(
+        return when (viewType) {
-            LayoutInflater.from(activity).inflate(
+            HEADER -> ViewHolder(
-                R.layout.sub_header,
+                LayoutInflater.from(activity).inflate(
-                parent,
+                    R.layout.sub_header,
-                false
+                    parent,
-            ), viewType
+                    false
-        )
+                ), viewType
-        else if (viewType == ALBUM || viewType == ARTIST || viewType== ALBUM_ARTIST)
+            )
-            ViewHolder(
+
+            ALBUM, ARTIST, ALBUM_ARTIST -> ViewHolder(
                 LayoutInflater.from(activity).inflate(
                     R.layout.item_list_big,
                     parent,
                     false
                 ), viewType
             )
-        else
+
-            ViewHolder(
+            else -> ViewHolder(
                 LayoutInflater.from(activity).inflate(R.layout.item_list, parent, false),
                 viewType
             )
+        }
     }
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
@@ -88,25 +94,30 @@ class SearchAdapter(
                 val album = dataSet[position] as Album
                 holder.title?.text = album.title
                 holder.text?.text = album.artistName
-                GlideApp.with(activity).asDrawable().albumCoverOptions(album.safeGetFirstSong()).load(
+                Glide.with(activity).asDrawable().albumCoverOptions(album.safeGetFirstSong())
-                    RetroGlideExtension.getSongModel(album.safeGetFirstSong()))
+                    .load(RetroGlideExtension.getSongModel(album.safeGetFirstSong()))
                     .into(holder.image!!)
             }
+
             ARTIST -> {
                 holder.imageTextContainer?.isVisible = true
                 val artist = dataSet[position] as Artist
                 holder.title?.text = artist.name
                 holder.text?.text = MusicUtil.getArtistInfoString(activity, artist)
-                GlideApp.with(activity).asDrawable().artistImageOptions(artist).load(
+                Glide.with(activity).asDrawable().artistImageOptions(artist).load(
-                    RetroGlideExtension.getArtistModel(artist)).into(holder.image!!)
+                    RetroGlideExtension.getArtistModel(artist)
+                ).into(holder.image!!)
             }
+
             SONG -> {
                 holder.imageTextContainer?.isVisible = true
                 val song = dataSet[position] as Song
                 holder.title?.text = song.title
                 holder.text?.text = song.albumName
-                GlideApp.with(activity).asDrawable().songCoverOptions(song).load(RetroGlideExtension.getSongModel(song)).into(holder.image!!)
+                Glide.with(activity).asDrawable().songCoverOptions(song)
+                    .load(RetroGlideExtension.getSongModel(song)).into(holder.image!!)
             }
+
             GENRE -> {
                 val genre = dataSet[position] as Genre
                 holder.title?.text = genre.name
@@ -119,19 +130,23 @@ class SearchAdapter(
                     )
                 )
             }
+
             PLAYLIST -> {
                 val playlist = dataSet[position] as PlaylistWithSongs
                 holder.title?.text = playlist.playlistEntity.playlistName
                 //holder.text?.text = MusicUtil.playlistInfoString(activity, playlist.songs)
             }
+
             ALBUM_ARTIST -> {
                 holder.imageTextContainer?.isVisible = true
                 val artist = dataSet[position] as Artist
                 holder.title?.text = artist.name
                 holder.text?.text = MusicUtil.getArtistInfoString(activity, artist)
-                GlideApp.with(activity).asDrawable().artistImageOptions(artist).load(
+                Glide.with(activity).asDrawable().artistImageOptions(artist).load(
-                    RetroGlideExtension.getArtistModel(artist)).into(holder.image!!)
+                    RetroGlideExtension.getArtistModel(artist)
+                ).into(holder.image!!)
             }
+
             else -> {
                 holder.title?.text = dataSet[position].toString()
                 holder.title?.setTextColor(ThemeStore.accentColor(activity))
@@ -143,7 +158,7 @@ class SearchAdapter(
         return dataSet.size
     }
 
-    inner class ViewHolder(itemView: View, itemViewType: Int) : code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder(itemView) {
+    inner class ViewHolder(itemView: View, itemViewType: Int) : MediaEntryViewHolder(itemView) {
         init {
             itemView.setOnLongClickListener(null)
             imageTextContainer?.isInvisible = true
@@ -177,30 +192,35 @@ class SearchAdapter(
                         bundleOf(EXTRA_ALBUM_ID to (item as Album).id)
                     )
                 }
+
                 ARTIST -> {
                     activity.findNavController(R.id.fragment_container).navigate(
                         R.id.artistDetailsFragment,
                         bundleOf(EXTRA_ARTIST_ID to (item as Artist).id)
                     )
                 }
-                ALBUM_ARTIST ->{
+
+                ALBUM_ARTIST -> {
                     activity.findNavController(R.id.fragment_container).navigate(
                         R.id.albumArtistDetailsFragment,
                         bundleOf(EXTRA_ARTIST_NAME to (item as Artist).name)
                     )
                 }
+
                 GENRE -> {
                     activity.findNavController(R.id.fragment_container).navigate(
                         R.id.genreDetailsFragment,
                         bundleOf(EXTRA_GENRE to (item as Genre))
                     )
                 }
+
                 PLAYLIST -> {
                     activity.findNavController(R.id.fragment_container).navigate(
                         R.id.playlistDetailsFragment,
-                        bundleOf(EXTRA_PLAYLIST to (item as PlaylistWithSongs))
+                        bundleOf(EXTRA_PLAYLIST_ID to (item as PlaylistWithSongs).playlistEntity.playListId)
                     )
                 }
+
                 SONG -> {
                     MusicPlayerRemote.playNext(item as Song)
                     MusicPlayerRemote.playNextSong()

app/src/main/java/code/name/monkey/retromusic/adapter/SongFileAdapter.kt

@@ -25,12 +25,11 @@ import code.name.monkey.appthemehelper.util.ATHUtil
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.adapter.base.AbsMultiSelectAdapter
 import code.name.monkey.retromusic.extensions.getTintedDrawable
-import code.name.monkey.retromusic.glide.GlideApp
 import code.name.monkey.retromusic.glide.RetroGlideExtension
 import code.name.monkey.retromusic.glide.audiocover.AudioFileCover
-import code.name.monkey.retromusic.interfaces.ICabHolder
 import code.name.monkey.retromusic.interfaces.ICallbacks
 import code.name.monkey.retromusic.util.MusicUtil
+import com.bumptech.glide.Glide
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.bumptech.glide.signature.MediaStoreSignature
 import me.zhanghai.android.fastscroll.PopupTextProvider
@@ -43,10 +42,9 @@ class SongFileAdapter(
     override val activity: AppCompatActivity,
     private var dataSet: List<File>,
     private val itemLayoutRes: Int,
-    private val iCallbacks: ICallbacks?,
+    private val iCallbacks: ICallbacks?
-    iCabHolder: ICabHolder?,
 ) : AbsMultiSelectAdapter<SongFileAdapter.ViewHolder, File>(
-    activity, iCabHolder, R.menu.menu_media_selection
+    activity, R.menu.menu_media_selection
 ), PopupTextProvider {
 
     init {
@@ -96,7 +94,7 @@ class SongFileAdapter(
     }
 
     private fun loadFileImage(file: File, holder: ViewHolder) {
-        val iconColor = ATHUtil.resolveColor(activity, R.attr.colorControlNormal)
+        val iconColor = ATHUtil.resolveColor(activity, androidx.appcompat.R.attr.colorControlNormal)
         if (file.isDirectory) {
             holder.image?.let {
                 it.setColorFilter(iconColor, PorterDuff.Mode.SRC_IN)
@@ -105,12 +103,12 @@ class SongFileAdapter(
             holder.imageTextContainer?.setCardBackgroundColor(
                 ATHUtil.resolveColor(
                     activity,
-                    R.attr.colorSurface
+                    com.google.android.material.R.attr.colorSurface
                 )
             )
         } else {
-            val error = activity.getTintedDrawable(R.drawable.ic_file_music, iconColor)
+            val error = activity.getTintedDrawable(R.drawable.ic_audio_file, iconColor)
-            GlideApp.with(activity)
+            Glide.with(activity)
                 .load(AudioFileCover(file.path))
                 .diskCacheStrategy(DiskCacheStrategy.NONE)
                 .error(error)

app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumAdapter.kt

@@ -23,29 +23,29 @@ import androidx.core.view.isVisible
 import androidx.fragment.app.FragmentActivity
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.adapter.base.AbsMultiSelectAdapter
-import code.name.monkey.retromusic.glide.GlideApp
+import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder
 import code.name.monkey.retromusic.glide.RetroGlideExtension
+import code.name.monkey.retromusic.glide.RetroGlideExtension.albumCoverOptions
+import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette
 import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
 import code.name.monkey.retromusic.helper.SortOrder
 import code.name.monkey.retromusic.helper.menu.SongsMenuHelper
 import code.name.monkey.retromusic.interfaces.IAlbumClickListener
-import code.name.monkey.retromusic.interfaces.ICabHolder
 import code.name.monkey.retromusic.model.Album
 import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.PreferenceUtil
 import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
+import com.bumptech.glide.Glide
 import me.zhanghai.android.fastscroll.PopupTextProvider
 
 open class AlbumAdapter(
     override val activity: FragmentActivity,
     var dataSet: List<Album>,
     var itemLayoutRes: Int,
-    iCabHolder: ICabHolder?,
     val listener: IAlbumClickListener?
 ) : AbsMultiSelectAdapter<AlbumAdapter.ViewHolder, Album>(
     activity,
-    iCabHolder,
     R.menu.menu_media_selection
 ), PopupTextProvider {
 
@@ -112,7 +112,9 @@ open class AlbumAdapter(
             return
         }
         val song = album.safeGetFirstSong()
-        GlideApp.with(activity).asBitmapPalette().albumCoverOptions(song)
+        Glide.with(activity)
+            .asBitmapPalette()
+            .albumCoverOptions(song)
             //.checkIgnoreMediaStore()
             .load(RetroGlideExtension.getSongModel(song))
             .into(object : RetroMusicColoredTarget(holder.image!!) {
@@ -162,6 +164,7 @@ open class AlbumAdapter(
         when (PreferenceUtil.albumSortOrder) {
             SortOrder.AlbumSortOrder.ALBUM_A_Z, SortOrder.AlbumSortOrder.ALBUM_Z_A -> sectionName =
                 dataSet[position].title
+
             SortOrder.AlbumSortOrder.ALBUM_ARTIST -> sectionName = dataSet[position].albumArtist
             SortOrder.AlbumSortOrder.ALBUM_YEAR -> return MusicUtil.getYearString(
                 dataSet[position].year
@@ -170,7 +173,7 @@ open class AlbumAdapter(
         return MusicUtil.getSectionName(sectionName)
     }
 
-    inner class ViewHolder(itemView: View) : code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder(itemView) {
+    inner class ViewHolder(itemView: View) : MediaEntryViewHolder(itemView) {
 
         init {
             menu?.isVisible = false

app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumCoverPagerAdapter.kt

@@ -19,6 +19,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
+import androidx.core.os.BundleCompat
 import androidx.core.os.bundleOf
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
@@ -26,16 +27,24 @@ import androidx.lifecycle.lifecycleScope
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.MainActivity
 import code.name.monkey.retromusic.fragments.AlbumCoverStyle
-import code.name.monkey.retromusic.fragments.NowPlayingScreen.*
+import code.name.monkey.retromusic.fragments.NowPlayingScreen.Card
+import code.name.monkey.retromusic.fragments.NowPlayingScreen.Classic
+import code.name.monkey.retromusic.fragments.NowPlayingScreen.Fit
+import code.name.monkey.retromusic.fragments.NowPlayingScreen.Full
+import code.name.monkey.retromusic.fragments.NowPlayingScreen.Gradient
+import code.name.monkey.retromusic.fragments.NowPlayingScreen.Peek
+import code.name.monkey.retromusic.fragments.NowPlayingScreen.Tiny
 import code.name.monkey.retromusic.fragments.base.goToLyrics
-import code.name.monkey.retromusic.glide.GlideApp
 import code.name.monkey.retromusic.glide.RetroGlideExtension
+import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette
+import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions
 import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
 import code.name.monkey.retromusic.misc.CustomFragmentStatePagerAdapter
 import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.PreferenceUtil
 import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
+import com.bumptech.glide.Glide
 import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_EXPANDED
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import kotlinx.coroutines.Dispatchers
@@ -95,7 +104,7 @@ class AlbumCoverPagerAdapter(
         override fun onCreate(savedInstanceState: Bundle?) {
             super.onCreate(savedInstanceState)
             if (arguments != null) {
-                song = requireArguments().getParcelable(SONG_ARG)!!
+                song = BundleCompat.getParcelable(requireArguments(), SONG_ARG, Song::class.java)!!
             }
         }
 
@@ -119,7 +128,7 @@ class AlbumCoverPagerAdapter(
                 withContext(Dispatchers.Main) {
                     MaterialAlertDialogBuilder(
                         requireContext(),
-                        R.style.ThemeOverlay_MaterialComponents_Dialog_Alert
+                        com.google.android.material.R.style.ThemeOverlay_MaterialComponents_Dialog_Alert
                     ).apply {
                         setTitle(song.title)
                         setMessage(if (data.isNullOrEmpty()) "No lyrics found" else data)
@@ -164,7 +173,9 @@ class AlbumCoverPagerAdapter(
         }
 
         private fun loadAlbumCover(albumCover: ImageView) {
-            GlideApp.with(this).asBitmapPalette().songCoverOptions(song)
+            Glide.with(this)
+                .asBitmapPalette()
+                .songCoverOptions(song)
                 //.checkIgnoreMediaStore()
                 .load(RetroGlideExtension.getSongModel(song))
                 .dontAnimate()

app/src/main/java/code/name/monkey/retromusic/adapter/album/HorizontalAlbumAdapter.kt

@@ -17,23 +17,23 @@ package code.name.monkey.retromusic.adapter.album
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.FragmentActivity
-import code.name.monkey.retromusic.glide.GlideApp
 import code.name.monkey.retromusic.glide.RetroGlideExtension
+import code.name.monkey.retromusic.glide.RetroGlideExtension.albumCoverOptions
+import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette
 import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
 import code.name.monkey.retromusic.helper.HorizontalAdapterHelper
 import code.name.monkey.retromusic.interfaces.IAlbumClickListener
-import code.name.monkey.retromusic.interfaces.ICabHolder
 import code.name.monkey.retromusic.model.Album
 import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
+import com.bumptech.glide.Glide
 
 class HorizontalAlbumAdapter(
     activity: FragmentActivity,
     dataSet: List<Album>,
-    ICabHolder: ICabHolder?,
     albumClickListener: IAlbumClickListener
 ) : AlbumAdapter(
-    activity, dataSet, HorizontalAdapterHelper.LAYOUT_RES, ICabHolder, albumClickListener
+    activity, dataSet, HorizontalAdapterHelper.LAYOUT_RES, albumClickListener
 ) {
 
     override fun createViewHolder(view: View, viewType: Int): ViewHolder {
@@ -49,7 +49,9 @@ class HorizontalAlbumAdapter(
 
     override fun loadAlbumCover(album: Album, holder: ViewHolder) {
         if (holder.image == null) return
-        GlideApp.with(activity).asBitmapPalette().albumCoverOptions(album.safeGetFirstSong())
+        Glide.with(activity)
+            .asBitmapPalette()
+            .albumCoverOptions(album.safeGetFirstSong())
             .load(RetroGlideExtension.getSongModel(album.safeGetFirstSong()))
             .into(object : RetroMusicColoredTarget(holder.image!!) {
                 override fun onColorReady(colors: MediaNotificationProcessor) {

app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt

@@ -26,30 +26,29 @@ import androidx.fragment.app.FragmentActivity
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.adapter.base.AbsMultiSelectAdapter
 import code.name.monkey.retromusic.extensions.hide
-import code.name.monkey.retromusic.glide.GlideApp
 import code.name.monkey.retromusic.glide.RetroGlideExtension
+import code.name.monkey.retromusic.glide.RetroGlideExtension.artistImageOptions
+import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette
 import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
 import code.name.monkey.retromusic.helper.menu.SongsMenuHelper
 import code.name.monkey.retromusic.interfaces.IAlbumArtistClickListener
 import code.name.monkey.retromusic.interfaces.IArtistClickListener
-import code.name.monkey.retromusic.interfaces.ICabHolder
 import code.name.monkey.retromusic.model.Artist
 import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.PreferenceUtil
 import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
+import com.bumptech.glide.Glide
 import me.zhanghai.android.fastscroll.PopupTextProvider
 
 class ArtistAdapter(
     override val activity: FragmentActivity,
     var dataSet: List<Artist>,
     var itemLayoutRes: Int,
-    val ICabHolder: ICabHolder?,
     val IArtistClickListener: IArtistClickListener,
     val IAlbumArtistClickListener: IAlbumArtistClickListener? = null
-) : AbsMultiSelectAdapter<ArtistAdapter.ViewHolder, Artist>(
+) : AbsMultiSelectAdapter<ArtistAdapter.ViewHolder, Artist>(activity, R.menu.menu_media_selection),
-    activity, ICabHolder, R.menu.menu_media_selection
+    PopupTextProvider {
-), PopupTextProvider {
 
     var albumArtistsOnly = false
 
@@ -111,10 +110,10 @@ class ArtistAdapter(
         if (holder.image == null) {
             return
         }
-        GlideApp.with(activity)
+        Glide.with(activity)
             .asBitmapPalette()
-            .load(RetroGlideExtension.getArtistModel(artist))
             .artistImageOptions(artist)
+            .load(RetroGlideExtension.getArtistModel(artist))
             .transition(RetroGlideExtension.getDefaultTransition())
             .into(object : RetroMusicColoredTarget(holder.image!!) {
                 override fun onColorReady(colors: MediaNotificationProcessor) {

app/src/main/java/code/name/monkey/retromusic/adapter/base/AbsMultiSelectAdapter.kt

@@ -1,56 +1,58 @@
 package code.name.monkey.retromusic.adapter.base
 
-import android.annotation.SuppressLint
 import android.graphics.Color
+import android.view.ActionMode
 import android.view.Menu
 import android.view.MenuItem
+import androidx.activity.OnBackPressedCallback
 import androidx.annotation.MenuRes
 import androidx.fragment.app.FragmentActivity
 import androidx.recyclerview.widget.RecyclerView
 import code.name.monkey.appthemehelper.util.VersionUtils
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.extensions.surfaceColor
+import code.name.monkey.retromusic.databinding.NumberRollViewBinding
-import code.name.monkey.retromusic.interfaces.ICabCallback
+import code.name.monkey.retromusic.views.NumberRollView
-import code.name.monkey.retromusic.interfaces.ICabHolder
-import code.name.monkey.retromusic.util.RetroColorUtil
-import com.afollestad.materialcab.attached.AttachedCab
-import com.afollestad.materialcab.attached.destroy
-import com.afollestad.materialcab.attached.isActive
 
 abstract class AbsMultiSelectAdapter<V : RecyclerView.ViewHolder?, I>(
-    open val activity: FragmentActivity, private val ICabHolder: ICabHolder?, @MenuRes menuRes: Int
+    open val activity: FragmentActivity, @MenuRes menuRes: Int,
-) : RecyclerView.Adapter<V>(), ICabCallback {
+) : RecyclerView.Adapter<V>(), ActionMode.Callback {
-    private var cab: AttachedCab? = null
+    var actionMode: ActionMode? = null
     private val checked: MutableList<I>
     private var menuRes: Int
-    override fun onCabCreated(cab: AttachedCab, menu: Menu): Boolean {
+
-        activity.window.statusBarColor =
+    override fun onCreateActionMode(mode: ActionMode?, menu: Menu?): Boolean {
-            RetroColorUtil.shiftBackgroundColor(activity.surfaceColor())
+        val inflater = mode?.menuInflater
+        inflater?.inflate(menuRes, menu)
         return true
     }
 
-    override fun onCabFinished(cab: AttachedCab): Boolean {
+    override fun onPrepareActionMode(mode: ActionMode?, menu: Menu?): Boolean {
-        clearChecked()
+        return false
-        activity.window.statusBarColor = when {
-            VersionUtils.hasMarshmallow() -> Color.TRANSPARENT
-            else -> Color.BLACK
-        }
-        return true
     }
 
-    override fun onCabItemClicked(item: MenuItem): Boolean {
+    override fun onActionItemClicked(mode: ActionMode?, item: MenuItem?): Boolean {
-        if (item.itemId == R.id.action_multi_select_adapter_check_all) {
+        if (item?.itemId == R.id.action_multi_select_adapter_check_all) {
             checkAll()
         } else {
-            onMultipleItemAction(item, ArrayList(checked))
+            onMultipleItemAction(item!!, ArrayList(checked))
-            cab?.destroy()
+            actionMode?.finish()
             clearChecked()
         }
         return true
     }
 
+    override fun onDestroyActionMode(mode: ActionMode?) {
+        clearChecked()
+        activity.window.statusBarColor = when {
+            VersionUtils.hasMarshmallow() -> Color.TRANSPARENT
+            else -> Color.BLACK
+        }
+        actionMode = null
+        onBackPressedCallback.remove()
+    }
+
     private fun checkAll() {
-        if (ICabHolder != null) {
+        if (actionMode != null) {
             checked.clear()
             for (i in 0 until itemCount) {
                 val identifier = getIdentifier(i)
@@ -72,7 +74,7 @@ abstract class AbsMultiSelectAdapter<V : RecyclerView.ViewHolder?, I>(
     }
 
     protected val isInQuickSelectMode: Boolean
-        get() = cab != null && cab!!.isActive()
+        get() = actionMode != null
 
     protected abstract fun onMultipleItemAction(menuItem: MenuItem, selection: List<I>)
     protected fun setMultiSelectMenuRes(@MenuRes menuRes: Int) {
@@ -80,16 +82,13 @@ abstract class AbsMultiSelectAdapter<V : RecyclerView.ViewHolder?, I>(
     }
 
     protected fun toggleChecked(position: Int): Boolean {
-        if (ICabHolder != null) {
+        val identifier = getIdentifier(position) ?: return false
-            val identifier = getIdentifier(position) ?: return false
+        if (!checked.remove(identifier)) {
-            if (!checked.remove(identifier)) {
+            checked.add(identifier)
-                checked.add(identifier)
-            }
-            notifyItemChanged(position)
-            updateCab()
-            return true
         }
-        return false
+        notifyItemChanged(position)
+        updateCab()
+        return true
     }
 
     private fun clearChecked() {
@@ -97,23 +96,21 @@ abstract class AbsMultiSelectAdapter<V : RecyclerView.ViewHolder?, I>(
         notifyDataSetChanged()
     }
 
-    @SuppressLint("StringFormatInvalid", "StringFormatMatches")
     private fun updateCab() {
-        if (ICabHolder != null) {
+        if (actionMode == null) {
-            if (cab == null || !cab!!.isActive()) {
+            actionMode = activity.startActionMode(this)?.apply {
-                cab = ICabHolder.openCab(menuRes, this)
+                customView = NumberRollViewBinding.inflate(activity.layoutInflater).root
             }
-            val size = checked.size
+            activity.onBackPressedDispatcher.addCallback(onBackPressedCallback)
-            when {
+        }
-                size <= 0 -> {
+        val size = checked.size
-                    cab?.destroy()
+        when {
-                }
+            size <= 0 -> {
-                size == 1 -> {
+                actionMode?.finish()
-                    cab?.title(literal = getName(checked[0]))
+            }
-                }
+            else -> {
-                else -> {
+                actionMode?.customView?.findViewById<NumberRollView>(R.id.selection_mode_number)
-                    cab?.title(literal = activity.getString(R.string.x_selected, size))
+                    ?.setNumber(size, true)
-                }
             }
         }
     }
@@ -122,4 +119,13 @@ abstract class AbsMultiSelectAdapter<V : RecyclerView.ViewHolder?, I>(
         checked = ArrayList()
         this.menuRes = menuRes
     }
+
+    private val onBackPressedCallback = object : OnBackPressedCallback(true) {
+        override fun handleOnBackPressed() {
+            if (actionMode != null) {
+                actionMode?.finish()
+                remove()
+            }
+        }
+    }
 }

app/src/main/java/code/name/monkey/retromusic/adapter/playlist/PlaylistAdapter.kt

@@ -15,6 +15,7 @@
 package code.name.monkey.retromusic.adapter.playlist
 
 import android.graphics.Color
+import android.graphics.drawable.Drawable
 import android.view.LayoutInflater
 import android.view.MenuItem
 import android.view.View
@@ -23,33 +24,33 @@ import androidx.appcompat.widget.PopupMenu
 import androidx.core.view.isGone
 import androidx.core.view.setPadding
 import androidx.fragment.app.FragmentActivity
+import code.name.monkey.appthemehelper.util.ATHUtil
+import code.name.monkey.appthemehelper.util.TintHelper
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.adapter.base.AbsMultiSelectAdapter
 import code.name.monkey.retromusic.db.PlaylistEntity
 import code.name.monkey.retromusic.db.PlaylistWithSongs
 import code.name.monkey.retromusic.db.toSongs
 import code.name.monkey.retromusic.extensions.dipToPix
-import code.name.monkey.retromusic.glide.GlideApp
+import code.name.monkey.retromusic.glide.RetroGlideExtension.playlistOptions
 import code.name.monkey.retromusic.glide.playlistPreview.PlaylistPreview
 import code.name.monkey.retromusic.helper.SortOrder.PlaylistSortOrder
 import code.name.monkey.retromusic.helper.menu.PlaylistMenuHelper
 import code.name.monkey.retromusic.helper.menu.SongsMenuHelper
-import code.name.monkey.retromusic.interfaces.ICabHolder
 import code.name.monkey.retromusic.interfaces.IPlaylistClickListener
 import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.PreferenceUtil
+import com.bumptech.glide.Glide
 import me.zhanghai.android.fastscroll.PopupTextProvider
 
 class PlaylistAdapter(
     override val activity: FragmentActivity,
     var dataSet: List<PlaylistWithSongs>,
     private var itemLayoutRes: Int,
-    ICabHolder: ICabHolder?,
     private val listener: IPlaylistClickListener
 ) : AbsMultiSelectAdapter<PlaylistAdapter.ViewHolder, PlaylistWithSongs>(
     activity,
-    ICabHolder,
     R.menu.menu_playlists_selection
 ), PopupTextProvider {
 
@@ -71,7 +72,7 @@ class PlaylistAdapter(
         return createViewHolder(view)
     }
 
-    fun createViewHolder(view: View): ViewHolder {
+    private fun createViewHolder(view: View): ViewHolder {
         return ViewHolder(view)
     }
 
@@ -100,17 +101,23 @@ class PlaylistAdapter(
         holder.title?.text = getPlaylistTitle(playlist.playlistEntity)
         holder.text?.text = getPlaylistText(playlist)
         holder.menu?.isGone = isChecked(playlist)
-        GlideApp.with(activity)
+        if (itemLayoutRes == R.layout.item_list) {
-            .load(
+            holder.image?.setPadding(activity.dipToPix(8F).toInt())
-                if (itemLayoutRes == R.layout.item_list) {
+            holder.image?.setImageDrawable(getIconRes())
-                    holder.image?.setPadding(activity.dipToPix(8F).toInt())
+        } else {
-                    R.drawable.ic_playlist_play
+            Glide.with(activity)
-                } else PlaylistPreview(playlist)
+                .load(PlaylistPreview(playlist))
-            )
+                .playlistOptions()
-            .playlistOptions()
+                .into(holder.image!!)
-            .into(holder.image!!)
+        }
     }
 
+    private fun getIconRes(): Drawable = TintHelper.createTintedDrawable(
+        activity,
+        R.drawable.ic_playlist_play,
+        ATHUtil.resolveColor(activity, android.R.attr.colorControlNormal)
+    )
+
     override fun getItemCount(): Int {
         return dataSet.size
     }

app/src/main/java/code/name/monkey/retromusic/adapter/song/AbsOffsetSongAdapter.kt

@@ -21,15 +21,13 @@ import androidx.annotation.LayoutRes
 import androidx.fragment.app.FragmentActivity
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.interfaces.ICabHolder
 import code.name.monkey.retromusic.model.Song
 
 abstract class AbsOffsetSongAdapter(
     activity: FragmentActivity,
     dataSet: MutableList<Song>,
-    @LayoutRes itemLayoutRes: Int,
+    @LayoutRes itemLayoutRes: Int
-    ICabHolder: ICabHolder?
+) : SongAdapter(activity, dataSet, itemLayoutRes) {
-) : SongAdapter(activity, dataSet, itemLayoutRes, ICabHolder) {
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SongAdapter.ViewHolder {
         if (viewType == OFFSET_ITEM) {

app/src/main/java/code/name/monkey/retromusic/adapter/song/OrderablePlaylistSongAdapter.kt

@@ -24,13 +24,8 @@ import code.name.monkey.retromusic.db.PlaylistEntity
 import code.name.monkey.retromusic.db.toSongEntity
 import code.name.monkey.retromusic.db.toSongsEntity
 import code.name.monkey.retromusic.dialogs.RemoveSongFromPlaylistDialog
-import code.name.monkey.retromusic.extensions.accentColor
-import code.name.monkey.retromusic.extensions.accentOutlineColor
 import code.name.monkey.retromusic.fragments.LibraryViewModel
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.interfaces.ICabHolder
 import code.name.monkey.retromusic.model.Song
-import com.google.android.material.button.MaterialButton
 import com.h6ah4i.android.widget.advrecyclerview.draggable.DraggableItemAdapter
 import com.h6ah4i.android.widget.advrecyclerview.draggable.ItemDraggableRange
 import kotlinx.coroutines.Dispatchers
@@ -38,12 +33,11 @@ import kotlinx.coroutines.launch
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
 class OrderablePlaylistSongAdapter(
-    private val playlist: PlaylistEntity,
+    private val playlistId: Long,
     activity: FragmentActivity,
     dataSet: MutableList<Song>,
     itemLayoutRes: Int,
-    ICabHolder: ICabHolder?,
+) : SongAdapter(activity, dataSet, itemLayoutRes),
-) : AbsOffsetSongAdapter(activity, dataSet, itemLayoutRes, ICabHolder),
     DraggableItemAdapter<OrderablePlaylistSongAdapter.ViewHolder> {
 
     val libraryViewModel: LibraryViewModel by activity.viewModel()
@@ -67,45 +61,20 @@ class OrderablePlaylistSongAdapter(
         return ViewHolder(view)
     }
 
-    override fun getItemViewType(position: Int): Int {
-        return if (position == 0) OFFSET_ITEM else SONG
-    }
-
-    override fun onBindViewHolder(holder: SongAdapter.ViewHolder, position: Int) {
-        if (holder.itemViewType == OFFSET_ITEM) {
-            val viewHolder = holder as ViewHolder
-            viewHolder.playAction?.let {
-                it.setOnClickListener {
-                    MusicPlayerRemote.openQueue(dataSet, 0, true)
-                }
-                it.accentOutlineColor()
-            }
-            viewHolder.shuffleAction?.let {
-                it.setOnClickListener {
-                    MusicPlayerRemote.openAndShuffleQueue(dataSet, true)
-                }
-                it.accentColor()
-            }
-        } else {
-            super.onBindViewHolder(holder, position - 1)
-        }
-    }
-
     override fun onMultipleItemAction(menuItem: MenuItem, selection: List<Song>) {
         when (menuItem.itemId) {
             R.id.action_remove_from_playlist -> RemoveSongFromPlaylistDialog.create(
                 selection.toSongsEntity(
-                    playlist
+                    playlistId
                 )
             )
                 .show(activity.supportFragmentManager, "REMOVE_FROM_PLAYLIST")
+
             else -> super.onMultipleItemAction(menuItem, selection)
         }
     }
 
-    inner class ViewHolder(itemView: View) : AbsOffsetSongAdapter.ViewHolder(itemView) {
+    inner class ViewHolder(itemView: View) : SongAdapter.ViewHolder(itemView) {
-        val playAction: MaterialButton? = itemView.findViewById(R.id.playAction)
-        val shuffleAction: MaterialButton? = itemView.findViewById(R.id.shuffleAction)
 
         override var songMenuRes: Int
             get() = R.menu.menu_item_playlist_song
@@ -116,7 +85,7 @@ class OrderablePlaylistSongAdapter(
         override fun onSongMenuItemClick(item: MenuItem): Boolean {
             when (item.itemId) {
                 R.id.action_remove_from_playlist -> {
-                    RemoveSongFromPlaylistDialog.create(song.toSongEntity(playlist.playListId))
+                    RemoveSongFromPlaylistDialog.create(song.toSongEntity(playlistId))
                         .show(activity.supportFragmentManager, "REMOVE_FROM_PLAYLIST")
                     return true
                 }
@@ -149,7 +118,7 @@ class OrderablePlaylistSongAdapter(
     }
 
     override fun onGetItemDraggableRange(holder: ViewHolder, position: Int): ItemDraggableRange {
-        return ItemDraggableRange(1, itemCount - 1)
+        return ItemDraggableRange(0, itemCount - 1)
     }
 
     override fun onCheckCanDrop(draggingPosition: Int, dropPosition: Int): Boolean {

app/src/main/java/code/name/monkey/retromusic/adapter/song/PlayingQueueAdapter.kt

@@ -19,8 +19,8 @@ import android.view.View
 import androidx.core.view.isVisible
 import androidx.fragment.app.FragmentActivity
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.glide.GlideApp
 import code.name.monkey.retromusic.glide.RetroGlideExtension
+import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.helper.MusicPlayerRemote.isPlaying
 import code.name.monkey.retromusic.helper.MusicPlayerRemote.playNextSong
@@ -28,6 +28,7 @@ import code.name.monkey.retromusic.helper.MusicPlayerRemote.removeFromQueue
 import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.ViewUtil
+import com.bumptech.glide.Glide
 import com.h6ah4i.android.widget.advrecyclerview.draggable.DraggableItemAdapter
 import com.h6ah4i.android.widget.advrecyclerview.draggable.ItemDraggableRange
 import com.h6ah4i.android.widget.advrecyclerview.draggable.annotation.DraggableItemStateFlags
@@ -42,10 +43,9 @@ class PlayingQueueAdapter(
     activity: FragmentActivity,
     dataSet: MutableList<Song>,
     private var current: Int,
-    itemLayoutRes: Int
+    itemLayoutRes: Int,
-) : SongAdapter(
+) : SongAdapter(activity, dataSet, itemLayoutRes),
-    activity, dataSet, itemLayoutRes, null
+    DraggableItemAdapter<PlayingQueueAdapter.ViewHolder>,
-), DraggableItemAdapter<PlayingQueueAdapter.ViewHolder>,
     SwipeableItemAdapter<PlayingQueueAdapter.ViewHolder>,
     PopupTextProvider {
 
@@ -77,7 +77,7 @@ class PlayingQueueAdapter(
         if (holder.image == null) {
             return
         }
-        GlideApp.with(activity)
+        Glide.with(activity)
             .load(RetroGlideExtension.getSongModel(song))
             .songCoverOptions(song)
             .into(holder.image!!)
@@ -153,6 +153,14 @@ class PlayingQueueAdapter(
             dragView?.isVisible = true
         }
 
+        override fun onClick(v: View?) {
+            if (isInQuickSelectMode) {
+                toggleChecked(layoutPosition)
+            } else {
+                MusicPlayerRemote.playSongAt(layoutPosition)
+            }
+        }
+
         override fun onSongMenuItemClick(item: MenuItem): Boolean {
             when (item.itemId) {
                 R.id.action_remove_from_playing_queue -> {
@@ -188,7 +196,7 @@ class PlayingQueueAdapter(
         return if (result == SwipeableItemConstants.RESULT_CANCELED) {
             SwipeResultActionDefault()
         } else {
-            SwipedResultActionRemoveItem(this, position, activity)
+            SwipedResultActionRemoveItem(this, position)
         }
     }
 
@@ -209,12 +217,9 @@ class PlayingQueueAdapter(
     internal class SwipedResultActionRemoveItem(
         private val adapter: PlayingQueueAdapter,
         private val position: Int,
-        private val activity: FragmentActivity
     ) : SwipeResultActionRemoveItem() {
 
         private var songToRemove: Song? = null
-        private val isPlaying: Boolean = MusicPlayerRemote.isPlaying
-        private val songProgressMillis = 0
         override fun onPerformAction() {
             // currentlyShownSnackbar = null
         }

app/src/main/java/code/name/monkey/retromusic/adapter/song/ShuffleButtonSongAdapter.kt

@@ -21,7 +21,6 @@ import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.extensions.accentColor
 import code.name.monkey.retromusic.extensions.accentOutlineColor
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.interfaces.ICabHolder
 import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.util.PreferenceUtil
 import code.name.monkey.retromusic.util.RetroUtil
@@ -30,9 +29,8 @@ import com.google.android.material.button.MaterialButton
 class ShuffleButtonSongAdapter(
     activity: FragmentActivity,
     dataSet: MutableList<Song>,
-    itemLayoutRes: Int,
+    itemLayoutRes: Int
-    ICabHolder: ICabHolder?
+) : AbsOffsetSongAdapter(activity, dataSet, itemLayoutRes) {
-) : AbsOffsetSongAdapter(activity, dataSet, itemLayoutRes, ICabHolder) {
 
 
     override fun createViewHolder(view: View): SongAdapter.ViewHolder {

app/src/main/java/code/name/monkey/retromusic/adapter/song/SimpleSongAdapter.kt

@@ -17,16 +17,14 @@ package code.name.monkey.retromusic.adapter.song
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.fragment.app.FragmentActivity
-import code.name.monkey.retromusic.interfaces.ICabHolder
 import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.util.MusicUtil
 
 class SimpleSongAdapter(
     context: FragmentActivity,
     songs: ArrayList<Song>,
-    layoutRes: Int,
+    layoutRes: Int
-    ICabHolder: ICabHolder?
+) : SongAdapter(context, songs, layoutRes) {
-) : SongAdapter(context, songs, layoutRes, ICabHolder) {
 
     override fun swapDataSet(dataSet: List<Song>) {
         this.dataSet = dataSet.toMutableList()

app/src/main/java/code/name/monkey/retromusic/adapter/song/SongAdapter.kt

@@ -28,20 +28,21 @@ import androidx.navigation.findNavController
 import code.name.monkey.retromusic.EXTRA_ALBUM_ID
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.adapter.base.AbsMultiSelectAdapter
-import code.name.monkey.retromusic.glide.GlideApp
+import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder
 import code.name.monkey.retromusic.glide.RetroGlideExtension
+import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette
+import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions
 import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.helper.SortOrder
 import code.name.monkey.retromusic.helper.menu.SongMenuHelper
 import code.name.monkey.retromusic.helper.menu.SongsMenuHelper
-import code.name.monkey.retromusic.interfaces.ICabCallback
-import code.name.monkey.retromusic.interfaces.ICabHolder
 import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.PreferenceUtil
 import code.name.monkey.retromusic.util.RetroUtil
 import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
+import com.bumptech.glide.Glide
 import me.zhanghai.android.fastscroll.PopupTextProvider
 
 /**
@@ -52,13 +53,11 @@ open class SongAdapter(
     override val activity: FragmentActivity,
     var dataSet: MutableList<Song>,
     protected var itemLayoutRes: Int,
-    ICabHolder: ICabHolder?,
     showSectionName: Boolean = true
 ) : AbsMultiSelectAdapter<SongAdapter.ViewHolder, Song>(
     activity,
-    ICabHolder,
     R.menu.menu_media_selection
-), ICabCallback, PopupTextProvider {
+), PopupTextProvider {
 
     private var showSectionName = true
 
@@ -119,7 +118,9 @@ open class SongAdapter(
         if (holder.image == null) {
             return
         }
-        GlideApp.with(activity).asBitmapPalette().songCoverOptions(song)
+        Glide.with(activity)
+            .asBitmapPalette()
+            .songCoverOptions(song)
             .load(RetroGlideExtension.getSongModel(song))
             .into(object : RetroMusicColoredTarget(holder.image!!) {
                 override fun onColorReady(colors: MediaNotificationProcessor) {
@@ -158,6 +159,11 @@ open class SongAdapter(
 
     override fun getPopupText(position: Int): String {
         val sectionName: String? = when (PreferenceUtil.songSortOrder) {
+            SortOrder.SongSortOrder.SONG_DEFAULT -> return MusicUtil.getSectionName(
+                dataSet[position].title,
+                true
+            )
+
             SortOrder.SongSortOrder.SONG_A_Z, SortOrder.SongSortOrder.SONG_Z_A -> dataSet[position].title
             SortOrder.SongSortOrder.SONG_ALBUM -> dataSet[position].albumName
             SortOrder.SongSortOrder.SONG_ARTIST -> dataSet[position].artistName
@@ -171,7 +177,7 @@ open class SongAdapter(
         return MusicUtil.getSectionName(sectionName)
     }
 
-    open inner class ViewHolder(itemView: View) : code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder(itemView) {
+    open inner class ViewHolder(itemView: View) : MediaEntryViewHolder(itemView) {
         protected open var songMenuRes = SongMenuHelper.MENU_RES
         protected open val song: Song
             get() = dataSet[layoutPosition]
@@ -215,6 +221,7 @@ open class SongAdapter(
         }
 
         override fun onLongClick(v: View?): Boolean {
+            println("Long click")
             return toggleChecked(layoutPosition)
         }
     }

app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetBig.kt

@@ -29,7 +29,6 @@ import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.MainActivity
 import code.name.monkey.retromusic.appwidgets.base.BaseAppWidget
 import code.name.monkey.retromusic.extensions.getTintedDrawable
-import code.name.monkey.retromusic.glide.GlideApp
 import code.name.monkey.retromusic.glide.RetroGlideExtension
 import code.name.monkey.retromusic.service.MusicService
 import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_REWIND
@@ -152,7 +151,7 @@ class AppWidgetBig : BaseAppWidget() {
             if (target != null) {
                 Glide.with(service).clear(target)
             }
-            target = GlideApp.with(appContext)
+            target = Glide.with(appContext)
                 .asBitmap()
                 //.checkIgnoreMediaStore()
                 .load(RetroGlideExtension.getSongModel(song))

app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetCard.kt

@@ -29,8 +29,9 @@ import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.MainActivity
 import code.name.monkey.retromusic.appwidgets.base.BaseAppWidget
 import code.name.monkey.retromusic.extensions.getTintedDrawable
-import code.name.monkey.retromusic.glide.GlideApp
 import code.name.monkey.retromusic.glide.RetroGlideExtension
+import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette
+import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions
 import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper
 import code.name.monkey.retromusic.service.MusicService
 import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_REWIND
@@ -143,7 +144,9 @@ class AppWidgetCard : BaseAppWidget() {
             if (target != null) {
                 Glide.with(service).clear(target)
             }
-            target = GlideApp.with(service).asBitmapPalette().songCoverOptions(song)
+            target = Glide.with(service)
+                .asBitmapPalette()
+                .songCoverOptions(song)
                 .load(RetroGlideExtension.getSongModel(song))
                 .centerCrop()
                 .into(object : CustomTarget<BitmapPaletteWrapper>(imageSize, imageSize) {

app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetCircle.kt

@@ -28,8 +28,9 @@ import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.MainActivity
 import code.name.monkey.retromusic.appwidgets.base.BaseAppWidget
 import code.name.monkey.retromusic.extensions.getTintedDrawable
-import code.name.monkey.retromusic.glide.GlideApp
 import code.name.monkey.retromusic.glide.RetroGlideExtension
+import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette
+import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions
 import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper
 import code.name.monkey.retromusic.service.MusicService
 import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_TOGGLE_PAUSE
@@ -89,7 +90,7 @@ class AppWidgetCircle : BaseAppWidget() {
             ).toBitmap()
         )
         val isFavorite = runBlocking(Dispatchers.IO) {
-            return@runBlocking MusicUtil.repository.isSongFavorite(song.id)
+            return@runBlocking MusicUtil.isFavorite(song)
         }
         val favoriteRes =
             if (isFavorite) R.drawable.ic_favorite else R.drawable.ic_favorite_border
@@ -114,7 +115,9 @@ class AppWidgetCircle : BaseAppWidget() {
             if (target != null) {
                 Glide.with(service).clear(target)
             }
-            target = GlideApp.with(service).asBitmapPalette().songCoverOptions(song)
+            target = Glide.with(service)
+                .asBitmapPalette()
+                .songCoverOptions(song)
                 .load(RetroGlideExtension.getSongModel(song))
                 .apply(RequestOptions.circleCropTransform())
                 .into(object : CustomTarget<BitmapPaletteWrapper>(imageSize, imageSize) {

app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetClassic.kt

@@ -30,8 +30,9 @@ import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.MainActivity
 import code.name.monkey.retromusic.appwidgets.base.BaseAppWidget
 import code.name.monkey.retromusic.extensions.getTintedDrawable
-import code.name.monkey.retromusic.glide.GlideApp
 import code.name.monkey.retromusic.glide.RetroGlideExtension
+import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette
+import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions
 import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper
 import code.name.monkey.retromusic.service.MusicService
 import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_REWIND
@@ -119,7 +120,9 @@ class AppWidgetClassic : BaseAppWidget() {
             if (target != null) {
                 Glide.with(service).clear(target)
             }
-            target = GlideApp.with(service).asBitmapPalette().songCoverOptions(song)
+            target = Glide.with(service)
+                .asBitmapPalette()
+                .songCoverOptions(song)
                 .load(RetroGlideExtension.getSongModel(song))
                 //.checkIgnoreMediaStore()
                 .centerCrop()

app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetMD3.kt

@@ -29,8 +29,9 @@ import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.MainActivity
 import code.name.monkey.retromusic.appwidgets.base.BaseAppWidget
 import code.name.monkey.retromusic.extensions.getTintedDrawable
-import code.name.monkey.retromusic.glide.GlideApp
 import code.name.monkey.retromusic.glide.RetroGlideExtension
+import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette
+import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions
 import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper
 import code.name.monkey.retromusic.service.MusicService
 import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_REWIND
@@ -144,7 +145,9 @@ class AppWidgetMD3 : BaseAppWidget() {
             if (target != null) {
                 Glide.with(service).clear(target)
             }
-            target = GlideApp.with(service).asBitmapPalette().songCoverOptions(song)
+            target = Glide.with(service)
+                .asBitmapPalette()
+                .songCoverOptions(song)
                 .load(RetroGlideExtension.getSongModel(song))
                 .centerCrop()
                 .into(object : CustomTarget<BitmapPaletteWrapper>(imageSize, imageSize) {

app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetSmall.kt

@@ -29,8 +29,9 @@ import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.MainActivity
 import code.name.monkey.retromusic.appwidgets.base.BaseAppWidget
 import code.name.monkey.retromusic.extensions.getTintedDrawable
-import code.name.monkey.retromusic.glide.GlideApp
 import code.name.monkey.retromusic.glide.RetroGlideExtension
+import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette
+import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions
 import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper
 import code.name.monkey.retromusic.service.MusicService
 import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_REWIND
@@ -122,7 +123,9 @@ class AppWidgetSmall : BaseAppWidget() {
             if (target != null) {
                 Glide.with(service).clear(target)
             }
-            target = GlideApp.with(service).asBitmapPalette().songCoverOptions(song)
+            target = Glide.with(service)
+                .asBitmapPalette()
+                .songCoverOptions(song)
                 //.checkIgnoreMediaStore()
                 .load(RetroGlideExtension.getSongModel(song))
                 .centerCrop()

app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetText.kt

@@ -40,29 +40,29 @@ class AppWidgetText : BaseAppWidget() {
         appWidgetView.setImageViewBitmap(
             R.id.button_next,
             context.getTintedDrawable(R.drawable.ic_skip_next, ContextCompat.getColor(
-                context, R.color.md_white_1000
+                context, code.name.monkey.appthemehelper.R.color.md_white_1000
             )).toBitmap()
         )
         appWidgetView.setImageViewBitmap(
             R.id.button_prev,
             context.getTintedDrawable(R.drawable.ic_skip_previous, ContextCompat.getColor(
-                context, R.color.md_white_1000
+                context, code.name.monkey.appthemehelper.R.color.md_white_1000
             )
             ).toBitmap()
         )
         appWidgetView.setImageViewBitmap(
             R.id.button_toggle_play_pause,
             context.getTintedDrawable(R.drawable.ic_play_arrow_white_32dp, ContextCompat.getColor(
-                context, R.color.md_white_1000
+                context, code.name.monkey.appthemehelper.R.color.md_white_1000
             )
             ).toBitmap()
         )
 
         appWidgetView.setTextColor(
-            R.id.title, ContextCompat.getColor(context, R.color.md_white_1000)
+            R.id.title, ContextCompat.getColor(context, code.name.monkey.appthemehelper.R.color.md_white_1000)
         )
         appWidgetView.setTextColor(
-            R.id.text, ContextCompat.getColor(context, R.color.md_white_1000)
+            R.id.text, ContextCompat.getColor(context, code.name.monkey.appthemehelper.R.color.md_white_1000)
         )
 
         linkButtons(context, appWidgetView)
@@ -127,7 +127,7 @@ class AppWidgetText : BaseAppWidget() {
         appWidgetView.setImageViewBitmap(
             R.id.button_toggle_play_pause,
             service.getTintedDrawable(playPauseRes, ContextCompat.getColor(
-                service, R.color.md_white_1000)
+                service, code.name.monkey.appthemehelper.R.color.md_white_1000)
             ).toBitmap()
         )
         appWidgetView.setImageViewBitmap(
@@ -136,7 +136,7 @@ class AppWidgetText : BaseAppWidget() {
                 R.drawable.ic_skip_next,
                 ContextCompat.getColor(
                     service,
-                    R.color.md_white_1000
+                    code.name.monkey.appthemehelper.R.color.md_white_1000
                 )
             ).toBitmap()
         )
@@ -145,7 +145,7 @@ class AppWidgetText : BaseAppWidget() {
             service.getTintedDrawable(
                 R.drawable.ic_skip_previous,
                 ContextCompat.getColor(
-                    service, R.color.md_white_1000
+                    service, code.name.monkey.appthemehelper.R.color.md_white_1000
                 )
             ).toBitmap()
         )

app/src/main/java/code/name/monkey/retromusic/auto/AutoMusicProvider.kt

@@ -31,7 +31,7 @@ import java.lang.ref.WeakReference
  * Created by Beesham Sarendranauth (Beesham)
  */
 class AutoMusicProvider(
-    val mContext: Context,
+    private val mContext: Context,
     private val songsRepository: SongRepository,
     private val albumsRepository: AlbumRepository,
     private val artistsRepository: ArtistRepository,
@@ -138,7 +138,7 @@ class AutoMusicProvider(
                 topPlayedRepository.notRecentlyPlayedTracks().take(8)
             }
             else -> {
-                    emptyList()
+                emptyList()
             }
         }
         songs.forEach { song ->

app/src/main/java/code/name/monkey/retromusic/db/PlaylistDao.kt

@@ -41,6 +41,10 @@ interface PlaylistDao {
     @Query("SELECT * FROM PlaylistEntity")
     suspend fun playlistsWithSongs(): List<PlaylistWithSongs>
 
+    @Transaction
+    @Query("SELECT * FROM PlaylistEntity WHERE playlist_id= :playlistId")
+    fun getPlaylist(playlistId: Long): LiveData<PlaylistWithSongs>
+
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertSongsToPlaylist(songEntities: List<SongEntity>)
 
@@ -59,8 +63,9 @@ interface PlaylistDao {
     @Delete
     suspend fun deletePlaylistSongs(songs: List<SongEntity>)
 
-    @Query("SELECT * FROM SongEntity WHERE playlist_creator_id= :playlistId")
+    @RewriteQueriesToDropUnusedColumns
-    fun favoritesSongsLiveData(playlistId: Long): LiveData<List<SongEntity>>
+    @Query("SELECT * FROM SongEntity ,(SELECT playlist_id FROM PlaylistEntity WHERE playlist_name= :playlistName LIMIT 1) AS playlist WHERE playlist_creator_id= playlist.playlist_id")
+    fun favoritesSongsLiveData(playlistName: String): LiveData<List<SongEntity>>
 
     @Query("SELECT * FROM SongEntity WHERE playlist_creator_id= :playlistId")
     fun favoritesSongs(playlistId: Long): List<SongEntity>

app/src/main/java/code/name/monkey/retromusic/db/RetroDatabase.kt

@@ -18,14 +18,12 @@ import androidx.room.Database
 import androidx.room.RoomDatabase
 
 @Database(
-    entities = [PlaylistEntity::class, SongEntity::class, HistoryEntity::class, PlayCountEntity::class, BlackListStoreEntity::class, LyricsEntity::class],
+    entities = [PlaylistEntity::class, SongEntity::class, HistoryEntity::class, PlayCountEntity::class],
-    version = 23,
+    version = 24,
     exportSchema = false
 )
 abstract class RetroDatabase : RoomDatabase() {
     abstract fun playlistDao(): PlaylistDao
-    abstract fun blackListStore(): BlackListStoreDao
     abstract fun playCountDao(): PlayCountDao
     abstract fun historyDao(): HistoryDao
-    abstract fun lyricsDao(): LyricsDao
 }

app/src/main/java/code/name/monkey/retromusic/db/RoomMigrations.kt

@@ -0,0 +1,11 @@
+package code.name.monkey.retromusic.db
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+val MIGRATION_23_24 = object : Migration(23, 24) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("DROP TABLE LyricsEntity")
+        database.execSQL("DROP TABLE BlackListStoreEntity")
+    }
+}

app/src/main/java/code/name/monkey/retromusic/db/SongExtension.kt

@@ -145,3 +145,9 @@ fun List<Song>.toSongsEntity(playlistEntity: PlaylistEntity): List<SongEntity> {
         it.toSongEntity(playlistEntity.playListId)
     }
 }
+
+fun List<Song>.toSongsEntity(playlistId: Long): List<SongEntity> {
+    return map {
+        it.toSongEntity(playlistId)
+    }
+}

app/src/main/java/code/name/monkey/retromusic/dialogs/AddToPlaylistDialog.kt

@@ -27,10 +27,10 @@ import code.name.monkey.retromusic.extensions.extraNotNull
 import code.name.monkey.retromusic.extensions.materialDialog
 import code.name.monkey.retromusic.fragments.LibraryViewModel
 import code.name.monkey.retromusic.model.Song
-import org.koin.androidx.viewmodel.ext.android.sharedViewModel
+import org.koin.androidx.viewmodel.ext.android.activityViewModel
 
 class AddToPlaylistDialog : DialogFragment() {
-    private val libraryViewModel by sharedViewModel<LibraryViewModel>()
+    private val libraryViewModel by activityViewModel<LibraryViewModel>()
 
     companion object {
         fun create(playlistEntities: List<PlaylistEntity>, song: Song): AddToPlaylistDialog {
@@ -58,8 +58,8 @@ class AddToPlaylistDialog : DialogFragment() {
             playlistNames.add(entity.playlistName)
         }
         return materialDialog(R.string.add_playlist_title)
-            .setItems(playlistNames.toTypedArray()) { dialog, which->
+            .setItems(playlistNames.toTypedArray()) { dialog, which ->
-                 if (which == 0) {
+                if (which == 0) {
                     showCreateDialog(songs)
                 } else {
                     libraryViewModel.addToPlaylist(requireContext(), playlistNames[which], songs)

app/src/main/java/code/name/monkey/retromusic/dialogs/CreatePlaylistDialog.kt

@@ -29,12 +29,12 @@ import code.name.monkey.retromusic.fragments.LibraryViewModel
 import code.name.monkey.retromusic.model.Song
 import com.google.android.material.textfield.TextInputEditText
 import com.google.android.material.textfield.TextInputLayout
-import org.koin.androidx.viewmodel.ext.android.sharedViewModel
+import org.koin.androidx.viewmodel.ext.android.activityViewModel
 
 class CreatePlaylistDialog : DialogFragment() {
     private var _binding: DialogPlaylistBinding? = null
     private val binding get() = _binding!!
-    private val libraryViewModel by sharedViewModel<LibraryViewModel>()
+    private val libraryViewModel by activityViewModel<LibraryViewModel>()
 
     companion object {
         fun create(song: Song): CreatePlaylistDialog {

app/src/main/java/code/name/monkey/retromusic/dialogs/DeletePlaylistDialog.kt

@@ -27,11 +27,11 @@ import code.name.monkey.retromusic.extensions.extraNotNull
 import code.name.monkey.retromusic.extensions.materialDialog
 import code.name.monkey.retromusic.fragments.LibraryViewModel
 import code.name.monkey.retromusic.fragments.ReloadType
-import org.koin.androidx.viewmodel.ext.android.sharedViewModel
+import org.koin.androidx.viewmodel.ext.android.activityViewModel
 
 class DeletePlaylistDialog : DialogFragment() {
 
-    private val libraryViewModel by sharedViewModel<LibraryViewModel>()
+    private val libraryViewModel by activityViewModel<LibraryViewModel>()
 
     companion object {
 
@@ -55,10 +55,13 @@ class DeletePlaylistDialog : DialogFragment() {
         //noinspection ConstantConditions
         if (playlists.size > 1) {
             title = R.string.delete_playlists_title
-            message = String.format(getString(R.string.delete_x_playlists), playlists.size).parseAsHtml()
+            message =
+                String.format(getString(R.string.delete_x_playlists), playlists.size).parseAsHtml()
         } else {
             title = R.string.delete_playlist_title
-            message = String.format(getString(R.string.delete_playlist_x), playlists[0].playlistName).parseAsHtml()
+            message =
+                String.format(getString(R.string.delete_playlist_x), playlists[0].playlistName)
+                    .parseAsHtml()
         }
 
         return materialDialog(title)

app/src/main/java/code/name/monkey/retromusic/dialogs/ImportPlaylistDialog.kt

@@ -21,10 +21,10 @@ import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.extensions.colorButtons
 import code.name.monkey.retromusic.extensions.materialDialog
 import code.name.monkey.retromusic.fragments.LibraryViewModel
-import org.koin.androidx.viewmodel.ext.android.sharedViewModel
+import org.koin.androidx.viewmodel.ext.android.activityViewModel
 
 class ImportPlaylistDialog : DialogFragment() {
-    private val libraryViewModel by sharedViewModel<LibraryViewModel>()
+    private val libraryViewModel by activityViewModel<LibraryViewModel>()
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         return materialDialog(R.string.import_playlist)

app/src/main/java/code/name/monkey/retromusic/dialogs/RemoveSongFromPlaylistDialog.kt

@@ -26,10 +26,10 @@ import code.name.monkey.retromusic.extensions.colorButtons
 import code.name.monkey.retromusic.extensions.extraNotNull
 import code.name.monkey.retromusic.extensions.materialDialog
 import code.name.monkey.retromusic.fragments.LibraryViewModel
-import org.koin.androidx.viewmodel.ext.android.sharedViewModel
+import org.koin.androidx.viewmodel.ext.android.activityViewModel
 
 class RemoveSongFromPlaylistDialog : DialogFragment() {
-    private val libraryViewModel by sharedViewModel<LibraryViewModel>()
+    private val libraryViewModel by activityViewModel<LibraryViewModel>()
 
     companion object {
         fun create(song: SongEntity): RemoveSongFromPlaylistDialog {

app/src/main/java/code/name/monkey/retromusic/dialogs/RenamePlaylistDialog.kt

@@ -29,11 +29,11 @@ import code.name.monkey.retromusic.fragments.LibraryViewModel
 import code.name.monkey.retromusic.fragments.ReloadType
 import com.google.android.material.textfield.TextInputEditText
 import com.google.android.material.textfield.TextInputLayout
-import org.koin.androidx.viewmodel.ext.android.sharedViewModel
+import org.koin.androidx.viewmodel.ext.android.activityViewModel
 
 class RenamePlaylistDialog : DialogFragment() {
 
-    private val libraryViewModel by sharedViewModel<LibraryViewModel>()
+    private val libraryViewModel by activityViewModel<LibraryViewModel>()
 
     companion object {
         fun create(playlistEntity: PlaylistEntity): RenamePlaylistDialog {

app/src/main/java/code/name/monkey/retromusic/dialogs/SleepTimerDialog.kt

@@ -17,6 +17,7 @@ package code.name.monkey.retromusic.dialogs
 import android.app.AlarmManager
 import android.app.Dialog
 import android.app.PendingIntent
+import android.content.DialogInterface
 import android.content.Intent
 import android.os.Bundle
 import android.os.CountDownTimer
@@ -25,43 +26,45 @@ import android.widget.CheckBox
 import android.widget.SeekBar
 import android.widget.TextView
 import android.widget.Toast
+import androidx.appcompat.app.AlertDialog
 import androidx.core.content.getSystemService
+import androidx.core.view.isVisible
 import androidx.fragment.app.DialogFragment
 import code.name.monkey.appthemehelper.util.VersionUtils
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.databinding.DialogSleepTimerBinding
 import code.name.monkey.retromusic.extensions.addAccentColor
-import code.name.monkey.retromusic.extensions.colorButtons
 import code.name.monkey.retromusic.extensions.materialDialog
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.service.MusicService
 import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_PENDING_QUIT
 import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_QUIT
+import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.PreferenceUtil
-import com.afollestad.materialdialogs.MaterialDialog
-import com.afollestad.materialdialogs.WhichButton
-import com.afollestad.materialdialogs.actions.getActionButton
 
 class SleepTimerDialog : DialogFragment() {
 
     private var seekArcProgress: Int = 0
     private lateinit var timerUpdater: TimerUpdater
-    private lateinit var dialog: MaterialDialog
+    private lateinit var dialog: AlertDialog
-    private lateinit var shouldFinishLastSong: CheckBox
+
-    private lateinit var timerDisplay: TextView
+    private var _binding: DialogSleepTimerBinding? = null
+    private val binding get() = _binding!!
+
+    private val shouldFinishLastSong: CheckBox get() = binding.shouldFinishLastSong
+    private val seekBar: SeekBar get() = binding.seekBar
+    private val timerDisplay: TextView get() = binding.timerDisplay
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         timerUpdater = TimerUpdater()
-        val binding = DialogSleepTimerBinding.inflate(layoutInflater)
+        _binding = DialogSleepTimerBinding.inflate(layoutInflater)
-        shouldFinishLastSong = binding.shouldFinishLastSong
-        timerDisplay = binding.timerDisplay
 
         val finishMusic = PreferenceUtil.isSleepTimerFinishMusic
         shouldFinishLastSong.apply {
             addAccentColor()
             isChecked = finishMusic
         }
-        binding.seekBar.apply {
+        seekBar.apply {
             addAccentColor()
             seekArcProgress = PreferenceUtil.lastSleepTimerValue
             updateTimeDisplayTime()
@@ -85,47 +88,65 @@ class SleepTimerDialog : DialogFragment() {
                 PreferenceUtil.lastSleepTimerValue = seekArcProgress
             }
         })
-        return materialDialog(R.string.action_sleep_timer)
-            .setView(binding.root)
-            .setPositiveButton(R.string.action_set) { _, _ ->
-                PreferenceUtil.isSleepTimerFinishMusic = shouldFinishLastSong.isChecked
-                val minutes = seekArcProgress
-                val pi = makeTimerPendingIntent(PendingIntent.FLAG_CANCEL_CURRENT)
-                val nextSleepTimerElapsedTime = SystemClock.elapsedRealtime() + minutes * 60 * 1000
-                PreferenceUtil.nextSleepTimerElapsedRealTime = nextSleepTimerElapsedTime.toInt()
-                val am = requireContext().getSystemService<AlarmManager>()
-                am?.setExact(AlarmManager.ELAPSED_REALTIME_WAKEUP, nextSleepTimerElapsedTime, pi)
 
-                Toast.makeText(
+        materialDialog(R.string.action_sleep_timer).apply {
-                    requireContext(),
+            if (PreferenceUtil.nextSleepTimerElapsedRealTime > System.currentTimeMillis()) {
-                    requireContext().resources.getString(R.string.sleep_timer_set, minutes),
+                seekBar.isVisible = false
-                    Toast.LENGTH_SHORT
+                shouldFinishLastSong.isVisible = false
-                ).show()
+                timerUpdater.start()
-            }
+                setPositiveButton(android.R.string.ok, null)
-            .setNegativeButton(android.R.string.cancel) { _, _ ->
+                setNegativeButton(R.string.action_cancel) { _, _ ->
-                val previous = makeTimerPendingIntent(PendingIntent.FLAG_NO_CREATE)
+                    timerUpdater.cancel()
-                if (previous != null) {
+                    val previous = makeTimerPendingIntent(PendingIntent.FLAG_NO_CREATE)
-                    val am = requireContext().getSystemService<AlarmManager>()
+                    if (previous != null) {
-                    am?.cancel(previous)
+                        val am = requireContext().getSystemService<AlarmManager>()
-                    previous.cancel()
+                        am?.cancel(previous)
-                    Toast.makeText(
+                        previous.cancel()
-                        requireContext(),
-                        requireContext().resources.getString(R.string.sleep_timer_canceled),
-                        Toast.LENGTH_SHORT
-                    ).show()
-                    val musicService = MusicPlayerRemote.musicService
-                    if (musicService != null && musicService.pendingQuit) {
-                        musicService.pendingQuit = false
                         Toast.makeText(
                             requireContext(),
                             requireContext().resources.getString(R.string.sleep_timer_canceled),
                             Toast.LENGTH_SHORT
                         ).show()
+                        val musicService = MusicPlayerRemote.musicService
+                        if (musicService != null && musicService.pendingQuit) {
+                            musicService.pendingQuit = false
+                            Toast.makeText(
+                                requireContext(),
+                                requireContext().resources.getString(R.string.sleep_timer_canceled),
+                                Toast.LENGTH_SHORT
+                            ).show()
+                        }
                     }
                 }
+            } else {
+                seekBar.isVisible = true
+                shouldFinishLastSong.isVisible = true
+                setPositiveButton(R.string.action_set) { _, _ ->
+                    PreferenceUtil.isSleepTimerFinishMusic = shouldFinishLastSong.isChecked
+                    val minutes = seekArcProgress
+                    val pi = makeTimerPendingIntent(PendingIntent.FLAG_CANCEL_CURRENT)
+                    val nextSleepTimerElapsedTime =
+                        SystemClock.elapsedRealtime() + minutes * 60 * 1000
+                    PreferenceUtil.nextSleepTimerElapsedRealTime = nextSleepTimerElapsedTime.toInt()
+                    val am = requireContext().getSystemService<AlarmManager>()
+                    am?.setExact(
+                        AlarmManager.ELAPSED_REALTIME_WAKEUP,
+                        nextSleepTimerElapsedTime,
+                        pi
+                    )
+
+                    Toast.makeText(
+                        requireContext(),
+                        requireContext().resources.getString(R.string.sleep_timer_set, minutes),
+                        Toast.LENGTH_SHORT
+                    ).show()
+                }
             }
-            .create()
+            setView(binding.root)
-            .colorButtons()
+            dialog = create()
+
+        }
+        return dialog
     }
 
     private fun updateTimeDisplayTime() {
@@ -147,14 +168,10 @@ class SleepTimerDialog : DialogFragment() {
         } else intent.setAction(ACTION_QUIT)
     }
 
-    private fun updateCancelButton() {
+    override fun onDismiss(dialog: DialogInterface) {
-        val musicService = MusicPlayerRemote.musicService
+        super.onDismiss(dialog)
-        if (musicService != null && musicService.pendingQuit) {
+        timerUpdater.cancel()
-            dialog.getActionButton(WhichButton.NEUTRAL).text =
+        _binding = null
-                dialog.context.getString(R.string.cancel_current_timer)
-        } else {
-            dialog.getActionButton(WhichButton.NEUTRAL).text = null
-        }
     }
 
     private inner class TimerUpdater :
@@ -164,10 +181,9 @@ class SleepTimerDialog : DialogFragment() {
         ) {
 
         override fun onTick(millisUntilFinished: Long) {
+            timerDisplay.text = MusicUtil.getReadableDurationString(millisUntilFinished)
         }
 
-        override fun onFinish() {
+        override fun onFinish() {}
-            updateCancelButton()
-        }
     }
 }

app/src/main/java/code/name/monkey/retromusic/dialogs/SongDetailDialog.kt

@@ -19,6 +19,7 @@ import android.content.Context
 import android.os.Bundle
 import android.text.Spanned
 import android.util.Log
+import androidx.core.os.BundleCompat
 import androidx.core.os.bundleOf
 import androidx.core.text.parseAsHtml
 import androidx.fragment.app.DialogFragment
@@ -38,7 +39,7 @@ class SongDetailDialog : DialogFragment() {
         val context: Context = requireContext()
         val binding = DialogFileDetailsBinding.inflate(layoutInflater)
 
-        val song = requireArguments().getParcelable<Song>(EXTRA_SONG)
+        val song = BundleCompat.getParcelable(requireArguments(), EXTRA_SONG, Song::class.java)
         with(binding) {
             fileName.text = makeTextWithTitle(context, R.string.label_file_name, "-")
             filePath.text = makeTextWithTitle(context, R.string.label_file_path, "-")

app/src/main/java/code/name/monkey/retromusic/dialogs/SongShareDialog.kt

@@ -17,6 +17,7 @@ package code.name.monkey.retromusic.dialogs
 import android.app.Dialog
 import android.content.Intent
 import android.os.Bundle
+import androidx.core.os.BundleCompat
 import androidx.core.os.bundleOf
 import androidx.fragment.app.DialogFragment
 import code.name.monkey.retromusic.EXTRA_SONG
@@ -29,7 +30,7 @@ import code.name.monkey.retromusic.util.MusicUtil
 
 class SongShareDialog : DialogFragment() {
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        val song: Song? = requireArguments().getParcelable(EXTRA_SONG)
+        val song: Song? = BundleCompat.getParcelable(requireArguments(), EXTRA_SONG, Song::class.java)
         val listening: String =
             String.format(
                 getString(R.string.currently_listening_to_x_by_x),
@@ -60,8 +61,7 @@ class SongShareDialog : DialogFragment() {
             0 -> {
                 startActivity(Intent.createChooser(song?.let {
                     MusicUtil.createShareSongFileIntent(
-                        it,
+                        requireContext(), it
-                        requireContext()
                     )
                 }, null))
             }

app/src/main/java/code/name/monkey/retromusic/extensions/ActivityExtensions.kt

@@ -20,6 +20,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.annotation.DimenRes
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.os.BundleCompat
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
 import com.google.android.material.appbar.MaterialToolbar
 

app/src/main/java/code/name/monkey/retromusic/extensions/ActivityThemeExtensions.kt

@@ -16,7 +16,7 @@ import code.name.monkey.appthemehelper.util.VersionUtils
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.util.PreferenceUtil
 
-fun AppCompatActivity.toggleScreenOn() {
+fun AppCompatActivity.maybeSetScreenOn() {
     if (PreferenceUtil.isScreenOnEnabled) {
         window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
     } else {

app/src/main/java/code/name/monkey/retromusic/extensions/ColorExtensions.kt

@@ -52,7 +52,7 @@ fun Int.ripAlpha(): Int {
 fun Dialog.colorControlNormal() = resolveColor(android.R.attr.colorControlNormal)
 
 fun Toolbar.backgroundTintList() {
-    val surfaceColor = ATHUtil.resolveColor(context, R.attr.colorSurface, Color.BLACK)
+    val surfaceColor = ATHUtil.resolveColor(context, com.google.android.material.R.attr.colorSurface, Color.BLACK)
     val colorStateList = ColorStateList.valueOf(surfaceColor)
     backgroundTintList = colorStateList
 }
@@ -61,13 +61,13 @@ fun Context.accentColor() = ThemeStore.accentColor(this)
 
 fun Fragment.accentColor() = ThemeStore.accentColor(requireContext())
 
-fun Context.surfaceColor() = resolveColor(R.attr.colorSurface, Color.WHITE)
+fun Context.surfaceColor() = resolveColor(com.google.android.material.R.attr.colorSurface, Color.WHITE)
 
-fun Fragment.surfaceColor() = resolveColor(R.attr.colorSurface, Color.WHITE)
+fun Fragment.surfaceColor() = resolveColor(com.google.android.material.R.attr.colorSurface, Color.WHITE)
 
-fun Context.surfaceColor(fallBackColor: Int) = resolveColor(R.attr.colorSurface, fallBackColor)
+fun Context.surfaceColor(fallBackColor: Int) = resolveColor(com.google.android.material.R.attr.colorSurface, fallBackColor)
 
-fun Fragment.surfaceColor(fallBackColor: Int) = resolveColor(R.attr.colorSurface, fallBackColor)
+fun Fragment.surfaceColor(fallBackColor: Int) = resolveColor(com.google.android.material.R.attr.colorSurface, fallBackColor)
 
 fun Context.textColorSecondary() = resolveColor(android.R.attr.textColorSecondary)
 
@@ -135,7 +135,9 @@ fun Button.accentTextColor() {
 
 fun MaterialButton.accentBackgroundColor() {
     if (materialYou) return
-    backgroundTintList = ColorStateList.valueOf(context.accentColor())
+    backgroundTintList = ColorStateList(
+        arrayOf(intArrayOf(android.R.attr.state_enabled), intArrayOf()),
+            intArrayOf(context.accentColor(), context.accentColor().addAlpha(0.12f)))
 }
 
 fun MaterialButton.accentOutlineColor() {
@@ -163,6 +165,15 @@ fun SeekBar.applyColor(@ColorInt color: Int) {
     progressBackgroundTintList = ColorStateList.valueOf(color)
 }
 
+fun Slider.applyColor(@ColorInt color: Int) {
+    ColorStateList.valueOf(color).run {
+        thumbTintList = this
+        trackActiveTintList = this
+        trackInactiveTintList = ColorStateList.valueOf(color.addAlpha(0.1f))
+        haloTintList = this
+    }
+}
+
 fun ExtendedFloatingActionButton.accentColor() {
     if (materialYou) return
     val color = ThemeStore.accentColor(context)
@@ -301,5 +312,9 @@ inline val @receiver:ColorInt Int.lighterColor
 inline val @receiver:ColorInt Int.darkerColor
     get() = ColorUtil.darkenColor(this)
 
-inline val Int.colorStateList : ColorStateList
+inline val Int.colorStateList: ColorStateList
-    get() = ColorStateList.valueOf(this)
+    get() = ColorStateList.valueOf(this)
+
+fun @receiver:ColorInt Int.addAlpha(alpha: Float): Int {
+    return ColorUtil.withAlpha(this, alpha)
+}

app/src/main/java/code/name/monkey/retromusic/extensions/InsetsExtensions.kt

@@ -4,7 +4,7 @@ import androidx.core.view.WindowInsetsCompat
 import code.name.monkey.retromusic.util.PreferenceUtil
 import code.name.monkey.retromusic.util.RetroUtil
 
-fun WindowInsetsCompat?.safeGetBottomInsets(): Int {
+fun WindowInsetsCompat?.getBottomInsets(): Int {
     return if (PreferenceUtil.isFullScreenMode) {
         return 0
     } else {

app/src/main/java/code/name/monkey/retromusic/extensions/NavigationExtensions.kt

@@ -21,6 +21,7 @@ import androidx.navigation.NavController
 import androidx.navigation.findNavController
 import androidx.navigation.fragment.NavHostFragment
 import androidx.navigation.fragment.findNavController
+import androidx.navigation.navOptions
 
 fun Fragment.navigate(@IdRes id: Int) = findNavController().navigate(id)
 
@@ -37,3 +38,13 @@ fun AppCompatActivity.findNavController(@IdRes id: Int): NavController {
     val fragment = supportFragmentManager.findFragmentById(id) as NavHostFragment
     return fragment.navController
 }
+
+val fadeNavOptions
+    get() = navOptions {
+        anim {
+            enter = android.R.anim.fade_in
+            exit = android.R.anim.fade_out
+            popEnter = android.R.anim.fade_in
+            popExit = android.R.anim.fade_out
+        }
+    }

app/src/main/java/code/name/monkey/retromusic/extensions/SongExtensions.kt

@@ -3,17 +3,20 @@ package code.name.monkey.retromusic.extensions
 import android.support.v4.media.MediaDescriptionCompat
 import android.support.v4.media.session.MediaSessionCompat.QueueItem
 import code.name.monkey.retromusic.model.Song
+import code.name.monkey.retromusic.util.MusicUtil
 
-val Song.uri get() = code.name.monkey.retromusic.util.MusicUtil.getSongFileUri(songId = id)
+val Song.uri get() = MusicUtil.getSongFileUri(songId = id)
 
+val Song.albumArtUri get() = MusicUtil.getMediaStoreAlbumCoverUri(albumId)
 
 fun ArrayList<Song>.toMediaSessionQueue(): List<QueueItem> {
-    return map {
+    return map { song ->
         val mediaDescription = MediaDescriptionCompat.Builder()
-            .setMediaId(it.id.toString())
+            .setMediaId(song.id.toString())
-            .setTitle(it.title)
+            .setTitle(song.title)
-            .setSubtitle(it.artistName)
+            .setSubtitle(song.artistName)
+            .setIconUri(song.albumArtUri)
             .build()
-        QueueItem(mediaDescription, it.hashCode().toLong())
+        QueueItem(mediaDescription, song.hashCode().toLong())
     }
 }

app/src/main/java/code/name/monkey/retromusic/extensions/ViewExtensions.kt

@@ -16,6 +16,7 @@ package code.name.monkey.retromusic.extensions
 import android.animation.Animator
 import android.animation.ObjectAnimator
 import android.animation.ValueAnimator
+import android.content.res.ColorStateList
 import android.graphics.drawable.BitmapDrawable
 import android.view.LayoutInflater
 import android.view.View
@@ -24,6 +25,7 @@ import android.view.ViewTreeObserver
 import android.view.animation.AnimationUtils
 import android.view.inputmethod.InputMethodManager
 import android.widget.EditText
+import androidx.annotation.ColorInt
 import androidx.annotation.LayoutRes
 import androidx.annotation.Px
 import androidx.core.animation.doOnEnd
@@ -37,8 +39,12 @@ import code.name.monkey.retromusic.util.RetroUtil
 import com.google.android.material.bottomnavigation.BottomNavigationView
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.card.MaterialCardView
+import com.google.android.material.navigation.NavigationBarView
+import com.google.android.material.navigationrail.NavigationRailView
 import dev.chrisbanes.insetter.applyInsetter
 
+const val ANIM_DURATION = 300L
+
 @Suppress("UNCHECKED_CAST")
 fun <T : View> ViewGroup.inflate(@LayoutRes layout: Int): T {
     return LayoutInflater.from(context).inflate(layout, this, false) as T
@@ -62,6 +68,15 @@ fun EditText.appHandleColor(): EditText {
     return this
 }
 
+fun NavigationBarView.setItemColors(@ColorInt normalColor: Int, @ColorInt selectedColor: Int) {
+    val csl = ColorStateList(
+        arrayOf(intArrayOf(-android.R.attr.state_checked), intArrayOf(android.R.attr.state_checked)),
+        intArrayOf(normalColor, selectedColor)
+    )
+    itemIconTintList = csl
+    itemTextColor = csl
+}
+
 /**
  * Potentially animate showing a [BottomNavigationView].
  *
@@ -71,7 +86,8 @@ fun EditText.appHandleColor(): EditText {
  * Instead, take a snapshot of the view, and animate this in, only changing the visibility (and
  * thus layout) when the animation completes.
  */
-fun BottomNavigationView.show() {
+fun NavigationBarView.show() {
+    if (this is NavigationRailView) return
     if (isVisible) return
 
     val parent = parent as ViewGroup
@@ -89,10 +105,10 @@ fun BottomNavigationView.show() {
     drawable.setBounds(left, parent.height, right, parent.height + height)
     parent.overlay.add(drawable)
     ValueAnimator.ofInt(parent.height, top).apply {
-        duration = 300
+        duration = ANIM_DURATION
         interpolator = AnimationUtils.loadInterpolator(
             context,
-            android.R.interpolator.linear_out_slow_in
+            android.R.interpolator.accelerate_decelerate
         )
         addUpdateListener {
             val newTop = it.animatedValue as Int
@@ -115,19 +131,25 @@ fun BottomNavigationView.show() {
  * Instead, take a snapshot, instantly hide the view (so content lays out to fill), then animate
  * out the snapshot.
  */
-fun BottomNavigationView.hide() {
+fun NavigationBarView.hide() {
+    if (this is NavigationRailView) return
     if (isGone) return
 
+    if (!isLaidOut) {
+        isGone = true
+        return
+    }
+
     val drawable = BitmapDrawable(context.resources, drawToBitmap())
     val parent = parent as ViewGroup
     drawable.setBounds(left, top, right, bottom)
     parent.overlay.add(drawable)
     isGone = true
     ValueAnimator.ofInt(top, parent.height).apply {
-        duration = 300L
+        duration = ANIM_DURATION
         interpolator = AnimationUtils.loadInterpolator(
             context,
-            android.R.interpolator.fast_out_linear_in
+            android.R.interpolator.accelerate_decelerate
         )
         addUpdateListener {
             val newTop = it.animatedValue as Int
@@ -158,7 +180,7 @@ fun View.translateYAnimate(value: Float): Animator {
 fun BottomSheetBehavior<*>.peekHeightAnimate(value: Int): Animator {
     return ObjectAnimator.ofInt(this, "peekHeight", value)
         .apply {
-            duration = 300
+            duration = ANIM_DURATION
             start()
         }
 }
@@ -254,7 +276,7 @@ fun View.updateMargin(
     @Px left: Int = marginLeft,
     @Px top: Int = marginTop,
     @Px right: Int = marginRight,
-    @Px bottom: Int = marginBottom
+    @Px bottom: Int = marginBottom,
 ) {
     (layoutParams as ViewGroup.MarginLayoutParams).updateMargins(left, top, right, bottom)
 }
@@ -295,7 +317,7 @@ fun View.requestApplyInsetsWhenAttached() {
 
 data class InitialPadding(
     val left: Int, val top: Int,
-    val right: Int, val bottom: Int
+    val right: Int, val bottom: Int,
 )
 
 fun recordInitialPaddingForView(view: View) = InitialPadding(

app/src/main/java/code/name/monkey/retromusic/fragments/LibraryViewModel.kt

@@ -16,7 +16,6 @@ package code.name.monkey.retromusic.fragments
 
 import android.animation.ValueAnimator
 import android.content.Context
-import android.widget.Toast
 import androidx.core.animation.doOnEnd
 import androidx.lifecycle.*
 import code.name.monkey.retromusic.RECENT_ALBUMS
@@ -34,6 +33,7 @@ import code.name.monkey.retromusic.model.*
 import code.name.monkey.retromusic.repository.RealRepository
 import code.name.monkey.retromusic.util.DensityUtil
 import code.name.monkey.retromusic.util.PreferenceUtil
+import code.name.monkey.retromusic.util.logD
 import kotlinx.coroutines.Dispatchers.IO
 import kotlinx.coroutines.Dispatchers.Main
 import kotlinx.coroutines.launch
@@ -145,48 +145,47 @@ class LibraryViewModel(
     }
 
     override fun onMediaStoreChanged() {
-        println("onMediaStoreChanged")
+        logD("onMediaStoreChanged")
         loadLibraryContent()
     }
 
     override fun onServiceConnected() {
-        println("onServiceConnected")
+        logD("onServiceConnected")
     }
 
     override fun onServiceDisconnected() {
-        println("onServiceDisconnected")
+        logD("onServiceDisconnected")
     }
 
     override fun onQueueChanged() {
-        println("onQueueChanged")
+        logD("onQueueChanged")
     }
 
     override fun onPlayingMetaChanged() {
-        println("onPlayingMetaChanged")
+        logD("onPlayingMetaChanged")
     }
 
     override fun onPlayStateChanged() {
-        println("onPlayStateChanged")
+        logD("onPlayStateChanged")
     }
 
     override fun onRepeatModeChanged() {
-        println("onRepeatModeChanged")
+        logD("onRepeatModeChanged")
     }
 
     override fun onShuffleModeChanged() {
-        println("onShuffleModeChanged")
+        logD("onShuffleModeChanged")
     }
 
     override fun onFavoriteStateChanged() {
-        println("onFavoriteStateChanged")
+        logD("onFavoriteStateChanged")
     }
 
     fun shuffleSongs() = viewModelScope.launch(IO) {
         val songs = repository.allSongs()
-        MusicPlayerRemote.openAndShuffleQueue(
+        withContext(Main) {
-            songs,
+            MusicPlayerRemote.openAndShuffleQueue(songs, true)
-            true
+        }
-        )
     }
 
     fun renameRoomPlaylist(playListId: Long, name: String) = viewModelScope.launch(IO) {
@@ -351,8 +350,7 @@ class LibraryViewModel(
                     context.getString(
                         R.string.added_song_count_to_playlist,
                         songs.size,
-                        playlistName),
+                        playlistName))
-                    Toast.LENGTH_SHORT)
             }
         }
     }

app/src/main/java/code/name/monkey/retromusic/fragments/MusicSeekSkipTouchListener.kt

@@ -1,13 +1,14 @@
 package code.name.monkey.retromusic.fragments
 
 import android.annotation.SuppressLint
-import android.view.GestureDetector
 import android.view.MotionEvent
 import android.view.View
+import android.view.ViewConfiguration
 import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.lifecycleScope
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import kotlinx.coroutines.*
+import kotlin.math.abs
 
 /**
  * @param activity, Activity
@@ -16,46 +17,63 @@ import kotlinx.coroutines.*
 class MusicSeekSkipTouchListener(val activity: FragmentActivity, val next: Boolean) :
     View.OnTouchListener {
 
-    var job: Job? = null
+    private var job: Job? = null
-    var counter = 0
+    private var counter = 0
-    var wasSeeking = false
+    private var wasSeeking = false
 
-    private val gestureDetector = GestureDetector(activity, object :
+    private var startX = 0f
-        GestureDetector.SimpleOnGestureListener() {
+    private var startY = 0f
-        override fun onDown(e: MotionEvent?): Boolean {
+
-            job = activity.lifecycleScope.launch(Dispatchers.Default) {
+    private val scaledTouchSlop = ViewConfiguration.get(activity).scaledTouchSlop
-                counter = 0
-                while (isActive) {
-                    delay(500)
-                    wasSeeking = true
-                    var seekingDuration = MusicPlayerRemote.songProgressMillis
-                    if (next) {
-                        seekingDuration += 5000 * (counter.floorDiv(2) + 1)
-                    } else {
-                        seekingDuration -= 5000 * (counter.floorDiv(2) + 1)
-                    }
-                    MusicPlayerRemote.seekTo(seekingDuration)
-                    counter += 1
-                }
-            }
-            return super.onDown(e)
-        }
-    })
 
     @SuppressLint("ClickableViewAccessibility")
     override fun onTouch(v: View?, event: MotionEvent?): Boolean {
-        val action = event?.actionMasked
+        when (event?.actionMasked) {
-        if (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_CANCEL) {
+            MotionEvent.ACTION_DOWN -> {
-            job?.cancel()
+                startX = event.x
-            if (!wasSeeking) {
+                startY = event.y
-                if (next) {
+                job = activity.lifecycleScope.launch(Dispatchers.Default) {
-                    MusicPlayerRemote.playNextSong()
+                    counter = 0
-                } else {
+                    while (isActive) {
-                    MusicPlayerRemote.back()
+                        delay(500)
+                        wasSeeking = true
+                        var seekingDuration = MusicPlayerRemote.songProgressMillis
+                        if (next) {
+                            seekingDuration += 5000 * (counter.floorDiv(2) + 1)
+                        } else {
+                            seekingDuration -= 5000 * (counter.floorDiv(2) + 1)
+                        }
+                        withContext(Dispatchers.Main) {
+                            MusicPlayerRemote.seekTo(seekingDuration)
+                        }
+                        counter += 1
+                    }
                 }
             }
-            wasSeeking = false
+            MotionEvent.ACTION_UP -> {
+                job?.cancel()
+                val endX = event.x
+                val endY = event.y
+                if (!wasSeeking && isAClick(startX, endX, startY, endY)) {
+                    if (next) {
+                        MusicPlayerRemote.playNextSong()
+                    } else {
+                        MusicPlayerRemote.back()
+                    }
+                }
+
+                wasSeeking = false
+            }
+            MotionEvent.ACTION_CANCEL -> {
+                job?.cancel()
+            }
         }
-        return gestureDetector.onTouchEvent(event)
+        return false
+    }
+
+    private fun isAClick(startX: Float, endX: Float, startY: Float, endY: Float): Boolean {
+        val differenceX = abs(startX - endX)
+        val differenceY = abs(startY - endY)
+        return !(differenceX > scaledTouchSlop || differenceY > scaledTouchSlop)
     }
 }

app/src/main/java/code/name/monkey/retromusic/fragments/about/AboutFragment.kt

@@ -25,12 +25,11 @@ import code.name.monkey.retromusic.extensions.openUrl
 import code.name.monkey.retromusic.fragments.LibraryViewModel
 import code.name.monkey.retromusic.util.NavigationUtil
 import dev.chrisbanes.insetter.applyInsetter
-import org.koin.androidx.viewmodel.ext.android.sharedViewModel
+import org.koin.androidx.viewmodel.ext.android.activityViewModel
 
 class AboutFragment : Fragment(R.layout.fragment_about), View.OnClickListener {
     private var _binding: FragmentAboutBinding? = null
     private val binding get() = _binding!!
-    private val libraryViewModel by sharedViewModel<LibraryViewModel>()
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
@@ -40,7 +39,7 @@ class AboutFragment : Fragment(R.layout.fragment_about), View.OnClickListener {
 
         binding.aboutContent.root.applyInsetter {
             type(navigationBars = true) {
-                padding()
+                padding(vertical = true)
             }
         }
     }

app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumDetailsFragment.kt

@@ -18,8 +18,11 @@ import android.app.ActivityOptions
 import android.content.Intent
 import android.graphics.Color
 import android.os.Bundle
-import android.view.*
+import android.view.Menu
-import androidx.activity.addCallback
+import android.view.MenuInflater
+import android.view.MenuItem
+import android.view.SubMenu
+import android.view.View
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.os.bundleOf
 import androidx.core.view.doOnPreDraw
@@ -43,10 +46,16 @@ import code.name.monkey.retromusic.adapter.song.SimpleSongAdapter
 import code.name.monkey.retromusic.databinding.FragmentAlbumDetailsBinding
 import code.name.monkey.retromusic.dialogs.AddToPlaylistDialog
 import code.name.monkey.retromusic.dialogs.DeleteSongsDialog
-import code.name.monkey.retromusic.extensions.*
+import code.name.monkey.retromusic.extensions.applyColor
+import code.name.monkey.retromusic.extensions.applyOutlineColor
+import code.name.monkey.retromusic.extensions.findActivityNavController
+import code.name.monkey.retromusic.extensions.show
+import code.name.monkey.retromusic.extensions.surfaceColor
 import code.name.monkey.retromusic.fragments.base.AbsMainActivityFragment
-import code.name.monkey.retromusic.glide.GlideApp
 import code.name.monkey.retromusic.glide.RetroGlideExtension
+import code.name.monkey.retromusic.glide.RetroGlideExtension.albumCoverOptions
+import code.name.monkey.retromusic.glide.RetroGlideExtension.artistImageOptions
+import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette
 import code.name.monkey.retromusic.glide.SingleColorTarget
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.helper.SortOrder.AlbumSongSortOrder.Companion.SONG_A_Z
@@ -54,18 +63,15 @@ import code.name.monkey.retromusic.helper.SortOrder.AlbumSongSortOrder.Companion
 import code.name.monkey.retromusic.helper.SortOrder.AlbumSongSortOrder.Companion.SONG_TRACK_LIST
 import code.name.monkey.retromusic.helper.SortOrder.AlbumSongSortOrder.Companion.SONG_Z_A
 import code.name.monkey.retromusic.interfaces.IAlbumClickListener
-import code.name.monkey.retromusic.interfaces.ICabCallback
-import code.name.monkey.retromusic.interfaces.ICabHolder
 import code.name.monkey.retromusic.model.Album
 import code.name.monkey.retromusic.model.Artist
 import code.name.monkey.retromusic.repository.RealRepository
 import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.RetroColorUtil
+import code.name.monkey.retromusic.util.RetroUtil
-import com.afollestad.materialcab.attached.AttachedCab
+import code.name.monkey.retromusic.util.logD
-import com.afollestad.materialcab.attached.destroy
+import code.name.monkey.retromusic.util.logE
-import com.afollestad.materialcab.attached.isActive
+import com.bumptech.glide.Glide
-import com.afollestad.materialcab.createCab
 import com.google.android.material.shape.MaterialShapeDrawable
 import com.google.android.material.transition.MaterialArcMotion
 import com.google.android.material.transition.MaterialContainerTransform
@@ -78,7 +84,7 @@ import org.koin.core.parameter.parametersOf
 import java.text.Collator
 
 class AlbumDetailsFragment : AbsMainActivityFragment(R.layout.fragment_album_details),
-    IAlbumClickListener, ICabHolder {
+    IAlbumClickListener {
 
     private var _binding: FragmentAlbumDetailsBinding? = null
     private val binding get() = _binding!!
@@ -114,12 +120,12 @@ class AlbumDetailsFragment : AbsMainActivityFragment(R.layout.fragment_album_det
         binding.toolbar.title = " "
         binding.albumCoverContainer.transitionName = arguments.extraAlbumId.toString()
         postponeEnterTransition()
-        detailsViewModel.getAlbum().observe(viewLifecycleOwner) {
+        detailsViewModel.getAlbum().observe(viewLifecycleOwner) { album ->
             view.doOnPreDraw {
                 startPostponedEnterTransition()
             }
-            albumArtistExists = !it.albumArtist.isNullOrEmpty()
+            albumArtistExists = !album.albumArtist.isNullOrEmpty()
-            showAlbum(it)
+            showAlbum(album)
             binding.artistImage.transitionName = if (albumArtistExists) {
                 album.albumArtist
             } else {
@@ -158,12 +164,6 @@ class AlbumDetailsFragment : AbsMainActivityFragment(R.layout.fragment_album_det
             )
         }
 
-        requireActivity().onBackPressedDispatcher.addCallback(viewLifecycleOwner) {
-            if (!handleBackPress()) {
-                remove()
-                requireActivity().onBackPressed()
-            }
-        }
         binding.appBarLayout?.statusBarForeground =
             MaterialShapeDrawable.createWithElevationOverlay(requireContext())
     }
@@ -177,8 +177,7 @@ class AlbumDetailsFragment : AbsMainActivityFragment(R.layout.fragment_album_det
         simpleSongAdapter = SimpleSongAdapter(
             requireActivity() as AppCompatActivity,
             ArrayList(),
-            R.layout.item_song,
+            R.layout.item_song
-            this
         )
         binding.fragmentAlbumContent.recyclerView.apply {
             layoutManager = LinearLayoutManager(requireContext())
@@ -237,7 +236,7 @@ class AlbumDetailsFragment : AbsMainActivityFragment(R.layout.fragment_album_det
             String.format(getString(R.string.label_more_from), album.artistName)
 
         val albumAdapter =
-            HorizontalAlbumAdapter(requireActivity() as AppCompatActivity, albums, this, this)
+            HorizontalAlbumAdapter(requireActivity() as AppCompatActivity, albums, this)
         binding.fragmentAlbumContent.moreRecyclerView.layoutManager = GridLayoutManager(
             requireContext(),
             1,
@@ -251,7 +250,8 @@ class AlbumDetailsFragment : AbsMainActivityFragment(R.layout.fragment_album_det
         detailsViewModel.getMoreAlbums(artist).observe(viewLifecycleOwner) {
             moreAlbums(it)
         }
-        GlideApp.with(requireContext())
+        Glide.with(requireContext())
+            //.forceDownload(PreferenceUtil.isAllowedToDownloadMetadata())
             .load(
                 RetroGlideExtension.getArtistModel(artist)
             )
@@ -262,7 +262,8 @@ class AlbumDetailsFragment : AbsMainActivityFragment(R.layout.fragment_album_det
     }
 
     private fun loadAlbumCover(album: Album) {
-        GlideApp.with(requireContext()).asBitmapPalette()
+        Glide.with(requireContext())
+            .asBitmapPalette()
             .albumCoverOptions(album.safeGetFirstSong())
             //.checkIgnoreMediaStore()
             .load(RetroGlideExtension.getSongModel(album.safeGetFirstSong()))
@@ -294,7 +295,7 @@ class AlbumDetailsFragment : AbsMainActivityFragment(R.layout.fragment_album_det
     override fun onCreateMenu(menu: Menu, inflater: MenuInflater) {
         inflater.inflate(R.menu.menu_album_detail, menu)
         val sortOrder = menu.findItem(R.id.action_sort_order)
-        setUpSortOrderMenu(sortOrder.subMenu)
+        setUpSortOrderMenu(sortOrder.subMenu!!)
         ToolbarContentTintHelper.handleOnCreateOptionsMenu(
             requireContext(),
             binding.toolbar,
@@ -407,38 +408,6 @@ class AlbumDetailsFragment : AbsMainActivityFragment(R.layout.fragment_album_det
         simpleSongAdapter.swapDataSet(album.songs)
     }
 
-    private fun handleBackPress(): Boolean {
-        cab?.let {
-            if (it.isActive()) {
-                it.destroy()
-                return true
-            }
-        }
-        return false
-    }
-
-    private var cab: AttachedCab? = null
-
-    override fun openCab(menuRes: Int, callback: ICabCallback): AttachedCab {
-        cab?.let {
-            if (it.isActive()) {
-                it.destroy()
-            }
-        }
-        cab = createCab(R.id.toolbar_container) {
-            menu(menuRes)
-            closeDrawable(R.drawable.ic_close)
-            backgroundColor(literal = RetroColorUtil.shiftBackgroundColor(surfaceColor()))
-            slideDown()
-            onCreate { cab, menu -> callback.onCabCreated(cab, menu) }
-            onSelection {
-                callback.onCabItemClicked(it)
-            }
-            onDestroy { callback.onCabFinished(it) }
-        }
-        return cab as AttachedCab
-    }
-
     override fun onDestroyView() {
         super.onDestroyView()
         _binding = null

app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumsFragment.kt

@@ -16,7 +16,6 @@ package code.name.monkey.retromusic.fragments.albums
 
 import android.os.Bundle
 import android.view.*
-import androidx.activity.addCallback
 import androidx.core.os.bundleOf
 import androidx.navigation.fragment.FragmentNavigatorExtras
 import androidx.navigation.fragment.findNavController
@@ -24,26 +23,18 @@ import androidx.recyclerview.widget.GridLayoutManager
 import code.name.monkey.retromusic.EXTRA_ALBUM_ID
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.adapter.album.AlbumAdapter
-import code.name.monkey.retromusic.extensions.surfaceColor
 import code.name.monkey.retromusic.fragments.GridStyle
 import code.name.monkey.retromusic.fragments.ReloadType
 import code.name.monkey.retromusic.fragments.base.AbsRecyclerViewCustomGridSizeFragment
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.helper.SortOrder.AlbumSortOrder
 import code.name.monkey.retromusic.interfaces.IAlbumClickListener
-import code.name.monkey.retromusic.interfaces.ICabCallback
-import code.name.monkey.retromusic.interfaces.ICabHolder
 import code.name.monkey.retromusic.service.MusicService
 import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.RetroColorUtil
 import code.name.monkey.retromusic.util.RetroUtil
-import com.afollestad.materialcab.attached.AttachedCab
-import com.afollestad.materialcab.attached.destroy
-import com.afollestad.materialcab.attached.isActive
-import com.afollestad.materialcab.createCab
 
 class AlbumsFragment : AbsRecyclerViewCustomGridSizeFragment<AlbumAdapter, GridLayoutManager>(),
-    IAlbumClickListener, ICabHolder {
+    IAlbumClickListener {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
@@ -53,12 +44,6 @@ class AlbumsFragment : AbsRecyclerViewCustomGridSizeFragment<AlbumAdapter, GridL
             else
                 adapter?.swapDataSet(listOf())
         }
-        requireActivity().onBackPressedDispatcher.addCallback(viewLifecycleOwner) {
-            if (!handleBackPress()) {
-                remove()
-                requireActivity().onBackPressed()
-            }
-        }
     }
 
     override val titleRes: Int
@@ -91,7 +76,6 @@ class AlbumsFragment : AbsRecyclerViewCustomGridSizeFragment<AlbumAdapter, GridL
             requireActivity(),
             dataSet,
             itemLayoutRes(),
-            this,
             this
         )
     }
@@ -163,10 +147,10 @@ class AlbumsFragment : AbsRecyclerViewCustomGridSizeFragment<AlbumAdapter, GridL
         if (RetroUtil.isLandscape) {
             gridSizeItem.setTitle(R.string.action_grid_size_land)
         }
-        setUpGridSizeMenu(gridSizeItem.subMenu)
+        setUpGridSizeMenu(gridSizeItem.subMenu!!)
         val layoutItem = menu.findItem(R.id.action_layout_type)
-        setupLayoutMenu(layoutItem.subMenu)
+        setupLayoutMenu(layoutItem.subMenu!!)
-        setUpSortOrderMenu(menu.findItem(R.id.action_sort_order).subMenu)
+        setUpSortOrderMenu(menu.findItem(R.id.action_sort_order).subMenu!!)
     }
 
     private fun setUpSortOrderMenu(
@@ -345,41 +329,6 @@ class AlbumsFragment : AbsRecyclerViewCustomGridSizeFragment<AlbumAdapter, GridL
 
     override fun onPause() {
         super.onPause()
-        if (cab.isActive()) {
+        adapter?.actionMode?.finish()
-            cab.destroy()
-        }
-    }
-
-    private fun handleBackPress(): Boolean {
-        cab?.let {
-            if (it.isActive()) {
-                it.destroy()
-                return true
-            }
-        }
-        return false
-    }
-
-    private var cab: AttachedCab? = null
-
-    override fun openCab(menuRes: Int, callback: ICabCallback): AttachedCab {
-        cab?.let {
-            println("Cab")
-            if (it.isActive()) {
-                it.destroy()
-            }
-        }
-        cab = createCab(R.id.toolbar_container) {
-            menu(menuRes)
-            closeDrawable(R.drawable.ic_close)
-            backgroundColor(literal = RetroColorUtil.shiftBackgroundColor(surfaceColor()))
-            slideDown()
-            onCreate { cab, menu -> callback.onCabCreated(cab, menu) }
-            onSelection {
-                callback.onCabItemClicked(it)
-            }
-            onDestroy { callback.onCabFinished(it) }
-        }
-        return cab as AttachedCab
     }
 }

app/src/main/java/code/name/monkey/retromusic/fragments/artists/AbsArtistDetailsFragment.kt

@@ -8,7 +8,6 @@ import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
-import androidx.activity.addCallback
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.widget.PopupMenu
 import androidx.core.os.bundleOf
@@ -20,46 +19,36 @@ import androidx.recyclerview.widget.DefaultItemAnimator
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import code.name.monkey.retromusic.EXTRA_ALBUM_ID
-import code.name.monkey.retromusic.extensions.applyColor
-import code.name.monkey.retromusic.extensions.applyOutlineColor
-import code.name.monkey.retromusic.extensions.surfaceColor
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.adapter.album.HorizontalAlbumAdapter
 import code.name.monkey.retromusic.adapter.song.SimpleSongAdapter
 import code.name.monkey.retromusic.databinding.FragmentArtistDetailsBinding
 import code.name.monkey.retromusic.dialogs.AddToPlaylistDialog
-import code.name.monkey.retromusic.extensions.showToast
 import code.name.monkey.retromusic.extensions.*
 import code.name.monkey.retromusic.fragments.base.AbsMainActivityFragment
-import code.name.monkey.retromusic.glide.GlideApp
 import code.name.monkey.retromusic.glide.RetroGlideExtension
+import code.name.monkey.retromusic.glide.RetroGlideExtension.artistImageOptions
+import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette
 import code.name.monkey.retromusic.glide.SingleColorTarget
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.helper.SortOrder
 import code.name.monkey.retromusic.interfaces.IAlbumClickListener
-import code.name.monkey.retromusic.interfaces.ICabCallback
-import code.name.monkey.retromusic.interfaces.ICabHolder
 import code.name.monkey.retromusic.model.Artist
-import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.repository.RealRepository
 import code.name.monkey.retromusic.util.CustomArtistImageUtil
+import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.RetroColorUtil
+import com.bumptech.glide.Glide
-import code.name.monkey.retromusic.util.*
-import com.afollestad.materialcab.attached.AttachedCab
-import com.afollestad.materialcab.attached.destroy
-import com.afollestad.materialcab.attached.isActive
-import com.afollestad.materialcab.createCab
 import com.google.android.material.shape.MaterialShapeDrawable
 import com.google.android.material.transition.MaterialContainerTransform
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.koin.android.ext.android.get
-import java.util.*
+import java.util.Locale
 
 abstract class AbsArtistDetailsFragment : AbsMainActivityFragment(R.layout.fragment_artist_details),
-    IAlbumClickListener, ICabHolder {
+    IAlbumClickListener {
     private var _binding: FragmentArtistDetailsBinding? = null
     private val binding get() = _binding!!
 
@@ -106,25 +95,19 @@ abstract class AbsArtistDetailsFragment : AbsMainActivityFragment(R.layout.fragm
             setOnClickListener { MusicPlayerRemote.openAndShuffleQueue(artist.songs, true) }
         }
 
-        requireActivity().onBackPressedDispatcher.addCallback(viewLifecycleOwner) {
-            if (!handleBackPress()) {
-                remove()
-                requireActivity().onBackPressed()
-            }
-        }
         setupSongSortButton()
         binding.appBarLayout?.statusBarForeground =
             MaterialShapeDrawable.createWithElevationOverlay(requireContext())
     }
 
     private fun setupRecyclerView() {
-        albumAdapter = HorizontalAlbumAdapter(requireActivity(), ArrayList(), this, this)
+        albumAdapter = HorizontalAlbumAdapter(requireActivity(), ArrayList(), this)
         binding.fragmentArtistContent.albumRecyclerView.apply {
             itemAnimator = DefaultItemAnimator()
             layoutManager = GridLayoutManager(this.context, 1, GridLayoutManager.HORIZONTAL, false)
             adapter = albumAdapter
         }
-        songAdapter = SimpleSongAdapter(requireActivity(), ArrayList(), R.layout.item_song, this)
+        songAdapter = SimpleSongAdapter(requireActivity(), ArrayList(), R.layout.item_song)
         binding.fragmentArtistContent.recyclerView.apply {
             itemAnimator = DefaultItemAnimator()
             layoutManager = LinearLayoutManager(this.context)
@@ -162,7 +145,9 @@ abstract class AbsArtistDetailsFragment : AbsMainActivityFragment(R.layout.fragm
     }
 
     private fun loadArtistImage(artist: Artist) {
-        GlideApp.with(requireContext()).asBitmapPalette().artistImageOptions(artist)
+        Glide.with(requireContext())
+            .asBitmapPalette()
+            .artistImageOptions(artist)
             .load(RetroGlideExtension.getArtistModel(artist))
             .dontAnimate()
             .into(object : SingleColorTarget(binding.image) {
@@ -202,10 +187,12 @@ abstract class AbsArtistDetailsFragment : AbsMainActivityFragment(R.layout.fragm
                 MusicPlayerRemote.playNext(songs)
                 return true
             }
+
             R.id.action_add_to_current_playing -> {
                 MusicPlayerRemote.enqueue(songs)
                 return true
             }
+
             R.id.action_add_to_playlist -> {
                 lifecycleScope.launch(Dispatchers.IO) {
                     val playlists = get<RealRepository>().fetchPlaylists()
@@ -216,13 +203,19 @@ abstract class AbsArtistDetailsFragment : AbsMainActivityFragment(R.layout.fragm
                 }
                 return true
             }
+
             R.id.action_set_artist_image -> {
                 val intent = Intent(Intent.ACTION_GET_CONTENT)
                 intent.type = "image/*"
-                selectImageLauncher.launch(Intent.createChooser(intent,
+                selectImageLauncher.launch(
-                    getString(R.string.pick_from_local_storage)))
+                    Intent.createChooser(
+                        intent,
+                        getString(R.string.pick_from_local_storage)
+                    )
+                )
                 return true
             }
+
             R.id.action_reset_artist_image -> {
                 showToast(resources.getString(R.string.updating))
                 lifecycleScope.launch {
@@ -270,14 +263,19 @@ abstract class AbsArtistDetailsFragment : AbsMainActivityFragment(R.layout.fragm
         when (savedSongSortOrder) {
             SortOrder.ArtistSongSortOrder.SONG_A_Z -> sortOrder.findItem(R.id.action_sort_order_title).isChecked =
                 true
+
             SortOrder.ArtistSongSortOrder.SONG_Z_A -> sortOrder.findItem(R.id.action_sort_order_title_desc).isChecked =
                 true
+
             SortOrder.ArtistSongSortOrder.SONG_ALBUM ->
                 sortOrder.findItem(R.id.action_sort_order_album).isChecked = true
+
             SortOrder.ArtistSongSortOrder.SONG_YEAR ->
                 sortOrder.findItem(R.id.action_sort_order_year).isChecked = true
+
             SortOrder.ArtistSongSortOrder.SONG_DURATION ->
                 sortOrder.findItem(R.id.action_sort_order_song_duration).isChecked = true
+
             else -> {
                 throw IllegalArgumentException("invalid $savedSongSortOrder")
             }
@@ -301,40 +299,6 @@ abstract class AbsArtistDetailsFragment : AbsMainActivityFragment(R.layout.fragm
         inflater.inflate(R.menu.menu_artist_detail, menu)
     }
 
-
-    private fun handleBackPress(): Boolean {
-        cab?.let {
-            if (it.isActive()) {
-                it.destroy()
-                return true
-            }
-        }
-        return false
-    }
-
-    private var cab: AttachedCab? = null
-
-    override fun openCab(menuRes: Int, callback: ICabCallback): AttachedCab {
-        cab?.let {
-            if (it.isActive()) {
-                it.destroy()
-            }
-        }
-        cab = createCab(R.id.toolbar_container) {
-            menu(menuRes)
-            closeDrawable(R.drawable.ic_close)
-            backgroundColor(literal = RetroColorUtil.shiftBackgroundColor(surfaceColor()))
-            slideDown()
-            onCreate { cab, menu -> callback.onCabCreated(cab, menu) }
-            onSelection {
-                callback.onCabItemClicked(it)
-            }
-            onDestroy { callback.onCabFinished(it) }
-        }
-        return cab as AttachedCab
-    }
-
-
     override fun onDestroyView() {
         super.onDestroyView()
         _binding = null

app/src/main/java/code/name/monkey/retromusic/fragments/artists/ArtistsFragment.kt

@@ -16,7 +16,6 @@ package code.name.monkey.retromusic.fragments.artists
 
 import android.os.Bundle
 import android.view.*
-import androidx.activity.addCallback
 import androidx.core.os.bundleOf
 import androidx.navigation.fragment.FragmentNavigatorExtras
 import androidx.navigation.fragment.findNavController
@@ -25,7 +24,6 @@ import code.name.monkey.retromusic.EXTRA_ARTIST_ID
 import code.name.monkey.retromusic.EXTRA_ARTIST_NAME
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.adapter.artist.ArtistAdapter
-import code.name.monkey.retromusic.extensions.surfaceColor
 import code.name.monkey.retromusic.fragments.GridStyle
 import code.name.monkey.retromusic.fragments.ReloadType
 import code.name.monkey.retromusic.fragments.base.AbsRecyclerViewCustomGridSizeFragment
@@ -33,19 +31,12 @@ import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.helper.SortOrder.ArtistSortOrder
 import code.name.monkey.retromusic.interfaces.IAlbumArtistClickListener
 import code.name.monkey.retromusic.interfaces.IArtistClickListener
-import code.name.monkey.retromusic.interfaces.ICabCallback
-import code.name.monkey.retromusic.interfaces.ICabHolder
 import code.name.monkey.retromusic.service.MusicService
 import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.RetroColorUtil
 import code.name.monkey.retromusic.util.RetroUtil
-import com.afollestad.materialcab.attached.AttachedCab
-import com.afollestad.materialcab.attached.destroy
-import com.afollestad.materialcab.attached.isActive
-import com.afollestad.materialcab.createCab
 
 class ArtistsFragment : AbsRecyclerViewCustomGridSizeFragment<ArtistAdapter, GridLayoutManager>(),
-    IArtistClickListener, IAlbumArtistClickListener, ICabHolder {
+    IArtistClickListener, IAlbumArtistClickListener {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         libraryViewModel.getArtists().observe(viewLifecycleOwner) {
@@ -54,12 +45,6 @@ class ArtistsFragment : AbsRecyclerViewCustomGridSizeFragment<ArtistAdapter, Gri
             else
                 adapter?.swapDataSet(listOf())
         }
-        requireActivity().onBackPressedDispatcher.addCallback(viewLifecycleOwner) {
-            if (!handleBackPress()) {
-                remove()
-                requireActivity().onBackPressed()
-            }
-        }
     }
 
     override val titleRes: Int
@@ -97,7 +82,7 @@ class ArtistsFragment : AbsRecyclerViewCustomGridSizeFragment<ArtistAdapter, Gri
             dataSet,
             itemLayoutRes(),
             this,
-            this, this
+            this
         )
     }
 
@@ -173,10 +158,10 @@ class ArtistsFragment : AbsRecyclerViewCustomGridSizeFragment<ArtistAdapter, Gri
         if (RetroUtil.isLandscape) {
             gridSizeItem.setTitle(R.string.action_grid_size_land)
         }
-        setUpGridSizeMenu(gridSizeItem.subMenu)
+        setUpGridSizeMenu(gridSizeItem.subMenu!!)
         val layoutItem = menu.findItem(R.id.action_layout_type)
-        setupLayoutMenu(layoutItem.subMenu)
+        setupLayoutMenu(layoutItem.subMenu!!)
-        setUpSortOrderMenu(menu.findItem(R.id.action_sort_order).subMenu)
+        setUpSortOrderMenu(menu.findItem(R.id.action_sort_order).subMenu!!)
         setupAlbumArtistMenu(menu)
     }
 
@@ -343,47 +328,8 @@ class ArtistsFragment : AbsRecyclerViewCustomGridSizeFragment<ArtistAdapter, Gri
         return false
     }
 
-    private fun handleBackPress(): Boolean {
-        cab?.let {
-            if (it.isActive()) {
-                it.destroy()
-                return true
-            }
-        }
-        return false
-    }
-
-    private var cab: AttachedCab? = null
-
-    override fun openCab(menuRes: Int, callback: ICabCallback): AttachedCab {
-        cab?.let {
-            if (it.isActive()) {
-                it.destroy()
-            }
-        }
-        cab = createCab(R.id.toolbar_container) {
-            menu(menuRes)
-            closeDrawable(R.drawable.ic_close)
-            backgroundColor(literal = RetroColorUtil.shiftBackgroundColor(surfaceColor()))
-            slideDown()
-            onCreate { cab, menu -> callback.onCabCreated(cab, menu) }
-            onSelection {
-                callback.onCabItemClicked(it)
-            }
-            onDestroy { callback.onCabFinished(it) }
-        }
-        return cab as AttachedCab
-    }
-
     override fun onResume() {
         super.onResume()
         libraryViewModel.forceReload(ReloadType.Artists)
     }
-
-    override fun onPause() {
-        super.onPause()
-        if (cab.isActive()) {
-            cab.destroy()
-        }
-    }
 }

app/src/main/java/code/name/monkey/retromusic/fragments/backup/BackupFragment.kt

@@ -22,7 +22,7 @@ import code.name.monkey.retromusic.extensions.materialDialog
 import code.name.monkey.retromusic.extensions.showToast
 import code.name.monkey.retromusic.helper.BackupHelper
 import code.name.monkey.retromusic.helper.sanitize
-import code.name.monkey.retromusic.util.BackupUtil
+import code.name.monkey.retromusic.util.Share
 import com.afollestad.materialdialogs.input.input
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -128,12 +128,7 @@ class BackupFragment : Fragment(R.layout.fragment_backup), BackupAdapter.BackupC
                 return true
             }
             R.id.action_share -> {
-                activity?.startActivity(
+                Share.shareFile(requireContext(), file, "*/*")
-                    Intent.createChooser(
-                        BackupUtil.createShareFileIntent(file, requireContext()),
-                        null
-                    )
-                )
                 return true
             }
             R.id.action_rename -> {
@@ -159,4 +154,9 @@ class BackupFragment : Fragment(R.layout.fragment_backup), BackupAdapter.BackupC
         }
         return false
     }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
 }

app/src/main/java/code/name/monkey/retromusic/fragments/backup/RestoreActivity.kt

@@ -71,7 +71,7 @@ class RestoreActivity : AppCompatActivity() {
             DynamicColors.applyToActivityIfAvailable(
                 this,
                 DynamicColorsOptions.Builder()
-                    .setThemeOverlay(R.style.ThemeOverlay_Material3_DynamicColors_DayNight)
+                    .setThemeOverlay(com.google.android.material.R.style.ThemeOverlay_Material3_DynamicColors_DayNight)
                     .build()
             )
         }

app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsMainActivityFragment.kt

@@ -22,11 +22,11 @@ import androidx.core.view.MenuProvider
 import androidx.lifecycle.Lifecycle
 import code.name.monkey.retromusic.activities.MainActivity
 import code.name.monkey.retromusic.fragments.LibraryViewModel
-import org.koin.androidx.viewmodel.ext.android.sharedViewModel
+import org.koin.androidx.viewmodel.ext.android.activityViewModel
 
 abstract class AbsMainActivityFragment(@LayoutRes layout: Int) : AbsMusicServiceFragment(layout),
     MenuProvider {
-    val libraryViewModel: LibraryViewModel by sharedViewModel()
+    val libraryViewModel: LibraryViewModel by activityViewModel()
 
     val mainActivity: MainActivity
         get() = activity as MainActivity

app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsMusicServiceFragment.kt

@@ -17,6 +17,7 @@ package code.name.monkey.retromusic.fragments.base
 import android.content.Context
 import android.os.Bundle
 import android.view.View
+import androidx.annotation.CallSuper
 import androidx.annotation.LayoutRes
 import androidx.fragment.app.Fragment
 import androidx.navigation.navOptions
@@ -60,11 +61,13 @@ open class AbsMusicServiceFragment(@LayoutRes layout: Int) : Fragment(layout),
         serviceActivity = null
     }
 
+    @CallSuper
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         serviceActivity?.addMusicServiceEventListener(this)
     }
 
+    @CallSuper
     override fun onDestroyView() {
         super.onDestroyView()
         serviceActivity?.removeMusicServiceEventListener(this)

app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerControlsFragment.kt

@@ -35,11 +35,11 @@ import code.name.monkey.retromusic.fragments.MusicSeekSkipTouchListener
 import code.name.monkey.retromusic.fragments.other.VolumeFragment
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
-import code.name.monkey.retromusic.misc.SimpleOnSeekbarChangeListener
 import code.name.monkey.retromusic.service.MusicService
 import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.PreferenceUtil
 import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
+import com.google.android.material.slider.Slider
 
 /**
  * Created by hemanths on 24/09/17.
@@ -58,10 +58,11 @@ abstract class AbsPlayerControlsFragment(@LayoutRes layout: Int) : AbsMusicServi
 
     var lastDisabledPlaybackControlsColor: Int = 0
 
-    var isSeeking = false
+    private var isSeeking = false
-        private set
 
-    open val progressSlider: SeekBar? = null
+    open val progressSlider: Slider? = null
+
+    open val seekBar: SeekBar? = null
 
     abstract val shuffleButton: ImageButton
 
@@ -78,45 +79,75 @@ abstract class AbsPlayerControlsFragment(@LayoutRes layout: Int) : AbsMusicServi
     private var progressAnimator: ObjectAnimator? = null
 
     override fun onUpdateProgressViews(progress: Int, total: Int) {
-        progressSlider?.max = total
+        if (seekBar == null) {
+            progressSlider?.valueTo = total.toFloat()
 
-        if (isSeeking) {
+            progressSlider?.value =
-            progressSlider?.progress = progress
+                progress.toFloat().coerceIn(progressSlider?.valueFrom, progressSlider?.valueTo)
         } else {
-            progressAnimator = ObjectAnimator.ofInt(progressSlider, "progress", progress).apply {
+            seekBar?.max = total
-                duration = SLIDER_ANIMATION_TIME
-                interpolator = LinearInterpolator()
-                start()
-            }
 
+            if (isSeeking) {
+                seekBar?.progress = progress
+            } else {
+                progressAnimator =
+                    ObjectAnimator.ofInt(seekBar, "progress", progress).apply {
+                        duration = SLIDER_ANIMATION_TIME
+                        interpolator = LinearInterpolator()
+                        start()
+                    }
+
+            }
         }
         songTotalTime?.text = MusicUtil.getReadableDurationString(total.toLong())
         songCurrentProgress?.text = MusicUtil.getReadableDurationString(progress.toLong())
     }
 
     private fun setUpProgressSlider() {
-        progressSlider?.setOnSeekBarChangeListener(object : SimpleOnSeekbarChangeListener() {
+        progressSlider?.addOnChangeListener(Slider.OnChangeListener { _, value, fromUser ->
-            override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) {
+            onProgressChange(value.toInt(), fromUser)
-                if (fromUser) {
+        })
-                    onUpdateProgressViews(
+        progressSlider?.addOnSliderTouchListener(object : Slider.OnSliderTouchListener {
-                        progress,
+            override fun onStartTrackingTouch(slider: Slider) {
-                        MusicPlayerRemote.songDurationMillis
+                onStartTrackingTouch()
-                    )
-                }
             }
 
-            override fun onStartTrackingTouch(seekBar: SeekBar) {
+            override fun onStopTrackingTouch(slider: Slider) {
-                isSeeking = true
+                onStopTrackingTouch(slider.value.toInt())
-                progressViewUpdateHelper.stop()
-                progressAnimator?.cancel()
-            }
-
-            override fun onStopTrackingTouch(seekBar: SeekBar) {
-                isSeeking = false
-                MusicPlayerRemote.seekTo(seekBar.progress)
-                progressViewUpdateHelper.start()
             }
         })
+
+        seekBar?.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener {
+            override fun onProgressChanged(seekBar: SeekBar?, progress: Int, fromUser: Boolean) {
+                onProgressChange(progress, fromUser)
+            }
+
+            override fun onStartTrackingTouch(seekBar: SeekBar?) {
+                onStartTrackingTouch()
+            }
+
+            override fun onStopTrackingTouch(seekBar: SeekBar?) {
+                onStopTrackingTouch(seekBar?.progress ?: 0)
+            }
+        })
+    }
+
+    private fun onProgressChange(value: Int, fromUser: Boolean) {
+        if (fromUser) {
+            onUpdateProgressViews(value, MusicPlayerRemote.songDurationMillis)
+        }
+    }
+
+    private fun onStartTrackingTouch() {
+        isSeeking = true
+        progressViewUpdateHelper.stop()
+        progressAnimator?.cancel()
+    }
+
+    private fun onStopTrackingTouch(value: Int) {
+        isSeeking = false
+        MusicPlayerRemote.seekTo(value)
+        progressViewUpdateHelper.start()
     }
 
     private lateinit var progressViewUpdateHelper: MusicProgressViewUpdateHelper
@@ -124,6 +155,11 @@ abstract class AbsPlayerControlsFragment(@LayoutRes layout: Int) : AbsMusicServi
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         progressViewUpdateHelper = MusicProgressViewUpdateHelper(this)
+        if (PreferenceUtil.circlePlayButton) {
+            requireContext().theme.applyStyle(R.style.CircleFABOverlay, true)
+        } else {
+            requireContext().theme.applyStyle(R.style.RoundedFABOverlay, true)
+        }
     }
 
     fun View.showBounceAnimation() {

app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt

@@ -70,13 +70,13 @@ import kotlinx.coroutines.Dispatchers.Main
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.koin.android.ext.android.get
-import org.koin.androidx.viewmodel.ext.android.sharedViewModel
+import org.koin.androidx.viewmodel.ext.android.activityViewModel
 import kotlin.math.abs
 
 abstract class AbsPlayerFragment(@LayoutRes layout: Int) : AbsMusicServiceFragment(layout),
     Toolbar.OnMenuItemClickListener, IPaletteColorHolder, PlayerAlbumCoverFragment.Callbacks {
 
-    val libraryViewModel: LibraryViewModel by sharedViewModel()
+    val libraryViewModel: LibraryViewModel by activityViewModel()
 
     val mainActivity: MainActivity
         get() = activity as MainActivity
@@ -92,6 +92,7 @@ abstract class AbsPlayerFragment(@LayoutRes layout: Int) : AbsMusicServiceFragme
                 PlaybackSpeedDialog.newInstance().show(childFragmentManager, "PLAYBACK_SETTINGS")
                 return true
             }
+
             R.id.action_toggle_lyrics -> {
                 PreferenceUtil.showLyrics = !PreferenceUtil.showLyrics
                 showLyricsIcon(item)
@@ -102,26 +103,32 @@ abstract class AbsPlayerFragment(@LayoutRes layout: Int) : AbsMusicServiceFragme
                 }
                 return true
             }
+
             R.id.action_go_to_lyrics -> {
                 goToLyrics(requireActivity())
                 return true
             }
+
             R.id.action_toggle_favorite -> {
                 toggleFavorite(song)
                 return true
             }
+
             R.id.action_share -> {
                 SongShareDialog.create(song).show(childFragmentManager, "SHARE_SONG")
                 return true
             }
+
             R.id.action_go_to_drive_mode -> {
                 NavigationUtil.gotoDriveMode(requireActivity())
                 return true
             }
+
             R.id.action_delete_from_device -> {
                 DeleteSongsDialog.create(song).show(childFragmentManager, "DELETE_SONGS")
                 return true
             }
+
             R.id.action_add_to_playlist -> {
                 lifecycleScope.launch(IO) {
                     val playlists = get<RealRepository>().fetchPlaylists()
@@ -132,25 +139,30 @@ abstract class AbsPlayerFragment(@LayoutRes layout: Int) : AbsMusicServiceFragme
                 }
                 return true
             }
+
             R.id.action_clear_playing_queue -> {
                 MusicPlayerRemote.clearQueue()
                 return true
             }
+
             R.id.action_save_playing_queue -> {
                 CreatePlaylistDialog.create(ArrayList(MusicPlayerRemote.playingQueue))
                     .show(childFragmentManager, "ADD_TO_PLAYLIST")
                 return true
             }
+
             R.id.action_tag_editor -> {
                 val intent = Intent(activity, SongTagEditorActivity::class.java)
                 intent.putExtra(AbsTagEditorActivity.EXTRA_ID, song.id)
                 startActivity(intent)
                 return true
             }
+
             R.id.action_details -> {
                 SongDetailDialog.create(song).show(childFragmentManager, "SONG_DETAIL")
                 return true
             }
+
             R.id.action_go_to_album -> {
                 //Hide Bottom Bar First, else Bottom Sheet doesn't collapse fully
                 mainActivity.setBottomNavVisibility(false)
@@ -161,29 +173,37 @@ abstract class AbsPlayerFragment(@LayoutRes layout: Int) : AbsMusicServiceFragme
                 )
                 return true
             }
+
             R.id.action_go_to_artist -> {
                 goToArtist(requireActivity())
                 return true
             }
+
             R.id.now_playing -> {
                 requireActivity().findNavController(R.id.fragment_container).navigate(
                     R.id.playing_queue_fragment,
-                    null
+                    null,
+                    navOptions { launchSingleTop = true }
                 )
+                mainActivity.collapsePanel()
                 return true
             }
+
             R.id.action_show_lyrics -> {
                 goToLyrics(requireActivity())
                 return true
             }
+
             R.id.action_equalizer -> {
                 NavigationUtil.openEqualizer(requireActivity())
                 return true
             }
+
             R.id.action_sleep_timer -> {
                 SleepTimerDialog().show(parentFragmentManager, "SLEEP_TIMER")
                 return true
             }
+
             R.id.action_set_as_ringtone -> {
                 requireContext().run {
                     if (RingtoneManager.requiresDialog(this)) {
@@ -195,6 +215,7 @@ abstract class AbsPlayerFragment(@LayoutRes layout: Int) : AbsMusicServiceFragme
 
                 return true
             }
+
             R.id.action_go_to_genre -> {
                 val retriever = MediaMetadataRetriever()
                 val trackUri =
@@ -294,6 +315,15 @@ abstract class AbsPlayerFragment(@LayoutRes layout: Int) : AbsMusicServiceFragme
         }
     }
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        if (PreferenceUtil.circlePlayButton) {
+            requireContext().theme.applyStyle(R.style.CircleFABOverlay, true)
+        } else {
+            requireContext().theme.applyStyle(R.style.RoundedFABOverlay, true)
+        }
+    }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         if (PreferenceUtil.isFullScreenMode &&
@@ -321,7 +351,15 @@ abstract class AbsPlayerFragment(@LayoutRes layout: Int) : AbsMusicServiceFragme
                 showLyricsIcon(this)
             }
         }
-        requireView().setOnTouchListener(
+    }
+
+    override fun onStart() {
+        super.onStart()
+        addSwipeDetector()
+    }
+
+    fun addSwipeDetector() {
+        view?.setOnTouchListener(
             if (PreferenceUtil.swipeAnywhereToChangeSong) {
                 SwipeDetector(
                     requireContext(),
@@ -338,8 +376,8 @@ abstract class AbsPlayerFragment(@LayoutRes layout: Int) : AbsMusicServiceFragme
             context,
             object : GestureDetector.SimpleOnGestureListener() {
                 override fun onScroll(
-                    e1: MotionEvent?,
+                    e1: MotionEvent,
-                    e2: MotionEvent?,
+                    e2: MotionEvent,
                     distanceX: Float,
                     distanceY: Float,
                 ): Boolean {
@@ -349,6 +387,7 @@ abstract class AbsPlayerFragment(@LayoutRes layout: Int) : AbsMusicServiceFragme
                             view.parent.requestDisallowInterceptTouchEvent(true)
                             true
                         }
+
                         else -> {
                             false
                         }
@@ -357,7 +396,7 @@ abstract class AbsPlayerFragment(@LayoutRes layout: Int) : AbsMusicServiceFragme
             })
 
         @SuppressLint("ClickableViewAccessibility")
-        override fun onTouch(v: View, event: MotionEvent?): Boolean {
+        override fun onTouch(v: View, event: MotionEvent): Boolean {
             viewPager?.dispatchTouchEvent(event)
             return flingPlayBackController.onTouchEvent(event)
         }
@@ -386,9 +425,7 @@ fun goToArtist(activity: Activity) {
 
         findNavController(R.id.fragment_container).navigate(
             R.id.artistDetailsFragment,
-            bundleOf(EXTRA_ARTIST_ID to song.artistId),
+            bundleOf(EXTRA_ARTIST_ID to song.artistId)
-            null,
-            null
         )
     }
 }
@@ -407,9 +444,7 @@ fun goToAlbum(activity: Activity) {
 
         findNavController(R.id.fragment_container).navigate(
             R.id.albumDetailsFragment,
-            bundleOf(EXTRA_ALBUM_ID to song.albumId),
+            bundleOf(EXTRA_ALBUM_ID to song.albumId)
-            null,
-            null
         )
     }
 }
@@ -426,8 +461,7 @@ fun goToLyrics(activity: Activity) {
         findNavController(R.id.fragment_container).navigate(
             R.id.lyrics_fragment,
             null,
-            navOptions { launchSingleTop = true },
+            navOptions { launchSingleTop = true }
-            null
         )
     }
 }

app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsRecyclerViewCustomGridSizeFragment.kt

@@ -19,6 +19,7 @@ import androidx.recyclerview.widget.RecyclerView
 import androidx.transition.TransitionManager
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.util.RetroUtil
+import code.name.monkey.retromusic.util.logD
 import com.google.android.material.transition.MaterialFade
 
 abstract class AbsRecyclerViewCustomGridSizeFragment<A : RecyclerView.Adapter<*>, LM : RecyclerView.LayoutManager> :
@@ -73,7 +74,7 @@ abstract class AbsRecyclerViewCustomGridSizeFragment<A : RecyclerView.Adapter<*>
 
     fun setAndSaveSortOrder(sortOrder: String) {
         this.sortOrder = sortOrder
-        println(sortOrder)
+        logD(sortOrder)
         saveSortOrder(sortOrder)
         setSortOrder(sortOrder)
     }

app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsRecyclerViewFragment.kt

@@ -27,12 +27,12 @@ import androidx.recyclerview.widget.RecyclerView
 import code.name.monkey.appthemehelper.common.ATHToolbarActivity
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
 import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.adapter.base.AbsMultiSelectAdapter
 import code.name.monkey.retromusic.databinding.FragmentMainRecyclerBinding
 import code.name.monkey.retromusic.dialogs.CreatePlaylistDialog
 import code.name.monkey.retromusic.dialogs.ImportPlaylistDialog
 import code.name.monkey.retromusic.extensions.accentColor
 import code.name.monkey.retromusic.extensions.dip
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.interfaces.IScrollHelper
 import code.name.monkey.retromusic.util.PreferenceUtil
 import code.name.monkey.retromusic.util.ThemedFastScroller.create
@@ -61,6 +61,7 @@ abstract class AbsRecyclerViewFragment<A : RecyclerView.Adapter<*>, LM : Recycle
         mainActivity.supportActionBar?.title = null
         initLayoutManager()
         initAdapter()
+        checkForMargins()
         setUpRecyclerView()
         setupToolbar()
         binding.shuffleButton.fitsSystemWindows = PreferenceUtil.isFullScreenMode
@@ -118,7 +119,6 @@ abstract class AbsRecyclerViewFragment<A : RecyclerView.Adapter<*>, LM : Recycle
             adapter = this@AbsRecyclerViewFragment.adapter
             create(this)
         }
-        checkForPadding()
     }
 
     protected open fun createFastScroller(recyclerView: RecyclerView): FastScroller {
@@ -131,7 +131,6 @@ abstract class AbsRecyclerViewFragment<A : RecyclerView.Adapter<*>, LM : Recycle
             override fun onChanged() {
                 super.onChanged()
                 checkIsEmpty()
-                checkForPadding()
             }
         })
     }
@@ -148,16 +147,12 @@ abstract class AbsRecyclerViewFragment<A : RecyclerView.Adapter<*>, LM : Recycle
         binding.empty.isVisible = adapter!!.itemCount == 0
     }
 
-    private fun checkForPadding() {
+    private fun checkForMargins() {
-        val itemCount: Int = adapter?.itemCount ?: 0
+        if (mainActivity.isBottomNavVisible) {
-
+            binding.recyclerView.updateLayoutParams<ViewGroup.MarginLayoutParams> {
-        binding.recyclerView.updatePadding(
+                bottomMargin = dip(R.dimen.bottom_nav_height)
-            bottom = if (itemCount > 0 && MusicPlayerRemote.playingQueue.isNotEmpty()) {
-                dip(R.dimen.mini_player_height_expanded)
-            } else {
-                dip(R.dimen.bottom_nav_height)
             }
-        )
+        }
     }
 
     private fun initLayoutManager() {
@@ -169,16 +164,6 @@ abstract class AbsRecyclerViewFragment<A : RecyclerView.Adapter<*>, LM : Recycle
     @NonNull
     protected abstract fun createAdapter(): A
 
-    override fun onQueueChanged() {
-        super.onQueueChanged()
-        checkForPadding()
-    }
-
-    override fun onServiceConnected() {
-        super.onServiceConnected()
-        checkForPadding()
-    }
-
     protected fun invalidateLayoutManager() {
         initLayoutManager()
         binding.recyclerView.layoutManager = layoutManager
@@ -216,7 +201,7 @@ abstract class AbsRecyclerViewFragment<A : RecyclerView.Adapter<*>, LM : Recycle
     override fun onMenuItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
             R.id.action_settings -> findNavController().navigate(
-                R.id.settingsActivity,
+                R.id.settings_fragment,
                 null,
                 navOptions
             )
@@ -232,8 +217,18 @@ abstract class AbsRecyclerViewFragment<A : RecyclerView.Adapter<*>, LM : Recycle
         return false
     }
 
+    override fun onResume() {
+        super.onResume()
+        checkForMargins()
+    }
+
     override fun onDestroyView() {
         super.onDestroyView()
         _binding = null
     }
+
+    override fun onPause() {
+        super.onPause()
+        (adapter as? AbsMultiSelectAdapter<*, *>)?.actionMode?.finish()
+    }
 }

app/src/main/java/code/name/monkey/retromusic/fragments/folder/FoldersFragment.kt

@@ -21,11 +21,15 @@ import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
+import android.view.ViewGroup
 import android.webkit.MimeTypeMap
 import androidx.activity.OnBackPressedCallback
 import androidx.appcompat.widget.PopupMenu
+import androidx.appcompat.widget.Toolbar
+import androidx.core.os.BundleCompat
 import androidx.core.text.parseAsHtml
 import androidx.core.view.isVisible
+import androidx.core.view.updateLayoutParams
 import androidx.lifecycle.lifecycleScope
 import androidx.loader.app.LoaderManager
 import androidx.loader.content.Loader
@@ -42,32 +46,29 @@ import code.name.monkey.retromusic.adapter.Storage
 import code.name.monkey.retromusic.adapter.StorageAdapter
 import code.name.monkey.retromusic.adapter.StorageClickListener
 import code.name.monkey.retromusic.databinding.FragmentFolderBinding
-import code.name.monkey.retromusic.extensions.*
+import code.name.monkey.retromusic.extensions.dip
+import code.name.monkey.retromusic.extensions.showToast
+import code.name.monkey.retromusic.extensions.textColorPrimary
+import code.name.monkey.retromusic.extensions.textColorSecondary
 import code.name.monkey.retromusic.fragments.base.AbsMainActivityFragment
 import code.name.monkey.retromusic.helper.MusicPlayerRemote.openQueue
-import code.name.monkey.retromusic.helper.MusicPlayerRemote.playingQueue
+import code.name.monkey.retromusic.helper.menu.SongMenuHelper
 import code.name.monkey.retromusic.helper.menu.SongsMenuHelper
-import code.name.monkey.retromusic.interfaces.ICabCallback
-import code.name.monkey.retromusic.interfaces.ICabHolder
 import code.name.monkey.retromusic.interfaces.ICallbacks
 import code.name.monkey.retromusic.interfaces.IMainActivityFragmentCallbacks
+import code.name.monkey.retromusic.interfaces.IScrollHelper
 import code.name.monkey.retromusic.misc.UpdateToastMediaScannerCompletionListener
 import code.name.monkey.retromusic.misc.WrappedAsyncTaskLoader
 import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.providers.BlacklistStore
 import code.name.monkey.retromusic.util.FileUtil
 import code.name.monkey.retromusic.util.PreferenceUtil.startDirectory
-import code.name.monkey.retromusic.util.RetroColorUtil
 import code.name.monkey.retromusic.util.ThemedFastScroller.create
 import code.name.monkey.retromusic.util.getExternalStorageDirectory
 import code.name.monkey.retromusic.util.getExternalStoragePublicDirectory
+import code.name.monkey.retromusic.views.BreadCrumbLayout
 import code.name.monkey.retromusic.views.BreadCrumbLayout.Crumb
 import code.name.monkey.retromusic.views.BreadCrumbLayout.SelectionCallback
-import com.afollestad.materialcab.attached.AttachedCab
-import com.afollestad.materialcab.attached.destroy
-import com.afollestad.materialcab.attached.isActive
-import com.afollestad.materialcab.createCab
-import com.google.android.material.shape.MaterialShapeDrawable
 import com.google.android.material.snackbar.Snackbar
 import com.google.android.material.transition.MaterialFadeThrough
 import kotlinx.coroutines.Dispatchers
@@ -77,16 +78,19 @@ import java.io.File
 import java.io.FileFilter
 import java.io.IOException
 import java.lang.ref.WeakReference
-import java.util.*
+import java.util.Collections
+import java.util.LinkedList
 
 class FoldersFragment : AbsMainActivityFragment(R.layout.fragment_folder),
-    IMainActivityFragmentCallbacks, ICabHolder, SelectionCallback, ICallbacks,
+    IMainActivityFragmentCallbacks, SelectionCallback, ICallbacks,
-    LoaderManager.LoaderCallbacks<List<File>>, StorageClickListener {
+    LoaderManager.LoaderCallbacks<List<File>>, StorageClickListener, IScrollHelper {
     private var _binding: FragmentFolderBinding? = null
     private val binding get() = _binding!!
+
+    val toolbar: Toolbar get() = binding.appBarLayout.toolbar
+
     private var adapter: SongFileAdapter? = null
     private var storageAdapter: StorageAdapter? = null
-    private var cab: AttachedCab? = null
     private val fileComparator = Comparator { lhs: File, rhs: File ->
         if (lhs.isDirectory && !rhs.isDirectory) {
             return@Comparator -1
@@ -99,14 +103,16 @@ class FoldersFragment : AbsMainActivityFragment(R.layout.fragment_folder),
     private var storageItems = ArrayList<Storage>()
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
         _binding = FragmentFolderBinding.bind(view)
         mainActivity.addMusicServiceEventListener(libraryViewModel)
-        mainActivity.setSupportActionBar(binding.toolbar)
+        mainActivity.setSupportActionBar(toolbar)
         mainActivity.supportActionBar?.title = null
         enterTransition = MaterialFadeThrough()
         reenterTransition = MaterialFadeThrough()
 
         setUpBreadCrumbs()
+        checkForMargins()
         setUpRecyclerView()
         setUpAdapter()
         setUpTitle()
@@ -116,24 +122,10 @@ class FoldersFragment : AbsMainActivityFragment(R.layout.fragment_folder),
                 override fun handleOnBackPressed() {
                     if (!handleBackPress()) {
                         remove()
-                        requireActivity().onBackPressed()
+                        requireActivity().onBackPressedDispatcher.onBackPressed()
                     }
                 }
             })
-        binding.toolbarContainer.drawNextToNavbar()
-        binding.appBarLayout.statusBarForeground =
-            MaterialShapeDrawable.createWithElevationOverlay(requireContext())
-    }
-
-    private fun setUpTitle() {
-        binding.toolbar.setNavigationOnClickListener {
-            findNavController().navigate(R.id.action_search, null, navOptions)
-        }
-        binding.appNameText.text = resources.getString(R.string.folders)
-    }
-
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
         if (savedInstanceState == null) {
             switchToFileAdapter()
             setCrumb(
@@ -143,24 +135,38 @@ class FoldersFragment : AbsMainActivityFragment(R.layout.fragment_folder),
                 true
             )
         } else {
-            binding.breadCrumbs.restoreFromStateWrapper(savedInstanceState.getParcelable(CRUMBS))
+            binding.breadCrumbs.restoreFromStateWrapper(
+                BundleCompat.getParcelable(
+                    savedInstanceState,
+                    CRUMBS,
+                    BreadCrumbLayout.SavedStateWrapper::class.java
+                )
+            )
             LoaderManager.getInstance(this).initLoader(LOADER_ID, null, this)
         }
     }
 
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        if (_binding != null) {
+            outState.putParcelable(CRUMBS, binding.breadCrumbs.stateWrapper)
+        }
+    }
+
+    private fun setUpTitle() {
+        toolbar.setNavigationOnClickListener {
+            findNavController().navigate(R.id.action_search, null, navOptions)
+        }
+        binding.appBarLayout.title = resources.getString(R.string.folders)
+    }
+
     override fun onPause() {
         super.onPause()
         saveScrollPosition()
-        if (cab.isActive()) {
+        adapter?.actionMode?.finish()
-            cab.destroy()
-        }
     }
 
     override fun handleBackPress(): Boolean {
-        if (cab != null && cab!!.isActive()) {
-            cab?.destroy()
-            return true
-        }
         if (binding.breadCrumbs.popHistory()) {
             setCrumb(binding.breadCrumbs.lastHistory(), false)
             return true
@@ -186,7 +192,7 @@ class FoldersFragment : AbsMainActivityFragment(R.layout.fragment_folder),
                         lifecycleScope.launch(Dispatchers.IO) {
                             listSongs(
                                 requireContext(),
-                                toList(file),
+                                listOf(file),
                                 AUDIO_FILE_FILTER,
                                 fileComparator
                             ) { songs ->
@@ -199,10 +205,12 @@ class FoldersFragment : AbsMainActivityFragment(R.layout.fragment_folder),
                         }
                         return@setOnMenuItemClickListener true
                     }
+
                     R.id.action_add_to_blacklist -> {
                         BlacklistStore.getInstance(requireContext()).addPath(file)
                         return@setOnMenuItemClickListener true
                     }
+
                     R.id.action_set_as_start_directory -> {
                         startDirectory = file
                         showToast(
@@ -210,6 +218,7 @@ class FoldersFragment : AbsMainActivityFragment(R.layout.fragment_folder),
                         )
                         return@setOnMenuItemClickListener true
                     }
+
                     R.id.action_scan -> {
                         lifecycleScope.launch {
                             listPaths(file, AUDIO_FILE_FILTER) { paths -> scanPaths(paths) }
@@ -227,19 +236,21 @@ class FoldersFragment : AbsMainActivityFragment(R.layout.fragment_folder),
                         lifecycleScope.launch(Dispatchers.IO) {
                             listSongs(
                                 requireContext(),
-                                toList(file),
+                                listOf(file),
                                 AUDIO_FILE_FILTER,
                                 fileComparator
                             ) { songs ->
                                 if (songs.isNotEmpty()) {
-                                    SongsMenuHelper.handleMenuClick(
+                                    val song = songs.first()
-                                        requireActivity(), songs, itemId
+                                    SongMenuHelper.handleMenuClick(
+                                        requireActivity(), song, itemId
                                     )
                                 }
                             }
                         }
                         return@setOnMenuItemClickListener true
                     }
+
                     R.id.action_scan -> {
                         lifecycleScope.launch {
                             listPaths(file, AUDIO_FILE_FILTER) { paths -> scanPaths(paths) }
@@ -265,7 +276,7 @@ class FoldersFragment : AbsMainActivityFragment(R.layout.fragment_folder),
             lifecycleScope.launch(Dispatchers.IO) {
                 listSongs(
                     requireContext(),
-                    toList(mFile.parentFile),
+                    listOf(mFile.parentFile),
                     fileFilter,
                     fileComparator
                 ) { songs ->
@@ -333,7 +344,7 @@ class FoldersFragment : AbsMainActivityFragment(R.layout.fragment_folder),
     }
 
     override fun onPrepareMenu(menu: Menu) {
-        ToolbarContentTintHelper.handleOnPrepareOptionsMenu(requireActivity(), binding.toolbar)
+        ToolbarContentTintHelper.handleOnPrepareOptionsMenu(requireActivity(), toolbar)
     }
 
     override fun onCreateMenu(menu: Menu, inflater: MenuInflater) {
@@ -347,8 +358,8 @@ class FoldersFragment : AbsMainActivityFragment(R.layout.fragment_folder),
         menu.removeItem(R.id.action_layout_type)
         menu.removeItem(R.id.action_sort_order)
         ToolbarContentTintHelper.handleOnCreateOptionsMenu(
-            requireContext(), binding.toolbar, menu, ATHToolbarActivity.getToolbarBackgroundColor(
+            requireContext(), toolbar, menu, ATHToolbarActivity.getToolbarBackgroundColor(
-                binding.toolbar
+                toolbar
             )
         )
     }
@@ -364,6 +375,7 @@ class FoldersFragment : AbsMainActivityFragment(R.layout.fragment_folder),
                 )
                 return true
             }
+
             R.id.action_scan -> {
                 val crumb = activeCrumb
                 if (crumb != null) {
@@ -373,9 +385,10 @@ class FoldersFragment : AbsMainActivityFragment(R.layout.fragment_folder),
                 }
                 return true
             }
+
             R.id.action_settings -> {
                 findNavController().navigate(
-                    R.id.settingsActivity,
+                    R.id.settings_fragment,
                     null,
                     navOptions
                 )
@@ -385,41 +398,16 @@ class FoldersFragment : AbsMainActivityFragment(R.layout.fragment_folder),
         return false
     }
 
-    override fun onQueueChanged() {
+    override fun onResume() {
-        super.onQueueChanged()
+        super.onResume()
-        checkForPadding()
+        checkForMargins()
     }
 
-    override fun onServiceConnected() {
+    private fun checkForMargins() {
-        super.onServiceConnected()
+        if (mainActivity.isBottomNavVisible) {
-        checkForPadding()
+            binding.recyclerView.updateLayoutParams<ViewGroup.MarginLayoutParams> {
-    }
+                bottomMargin = dip(R.dimen.bottom_nav_height)
-
-    override fun openCab(menuRes: Int, callback: ICabCallback): AttachedCab {
-        if (cab != null && cab!!.isActive()) {
-            cab?.destroy()
-        }
-        cab = createCab(R.id.toolbar_container) {
-            menu(menuRes)
-            closeDrawable(R.drawable.ic_close)
-            backgroundColor(literal = RetroColorUtil.shiftBackgroundColor(surfaceColor()))
-            slideDown()
-            onCreate { cab, menu -> callback.onCabCreated(cab, menu) }
-            onSelection {
-                callback.onCabItemClicked(it)
             }
-            onDestroy { callback.onCabFinished(it) }
-        }
-        return cab as AttachedCab
-    }
-
-    private fun checkForPadding() {
-        val count = adapter?.itemCount ?: 0
-        if (_binding != null) {
-            binding.recyclerView.updatePadding(
-                bottom = if (count > 0 && playingQueue.isNotEmpty()) dip(R.dimen.mini_player_height_expanded)
-                else dip(R.dimen.mini_player_height)
-            )
         }
     }
 
@@ -440,13 +428,11 @@ class FoldersFragment : AbsMainActivityFragment(R.layout.fragment_folder),
     }
 
     private fun saveScrollPosition() {
-        val crumb = activeCrumb
+        activeCrumb?.scrollPosition =
-        if (crumb != null) {
+            (binding.recyclerView.layoutManager as LinearLayoutManager).findFirstVisibleItemPosition()
-            crumb.scrollPosition =
-                (binding.recyclerView.layoutManager as LinearLayoutManager?)!!.findFirstVisibleItemPosition()
-        }
     }
 
+
     private fun scanPaths(toBeScanned: Array<String?>) {
         if (activity == null) {
             return
@@ -496,24 +482,18 @@ class FoldersFragment : AbsMainActivityFragment(R.layout.fragment_folder),
     }
 
     private fun setUpRecyclerView() {
-        binding.recyclerView.layoutManager = LinearLayoutManager(activity)
+        binding.recyclerView.layoutManager = LinearLayoutManager(requireContext())
         create(
             binding.recyclerView
         )
     }
 
-    private fun toList(file: File): ArrayList<File> {
-        val files = ArrayList<File>(1)
-        files.add(file)
-        return files
-    }
-
     private fun updateAdapter(files: List<File>) {
         adapter?.swapDataSet(files)
         val crumb = activeCrumb
         if (crumb != null) {
-            (binding.recyclerView.layoutManager as LinearLayoutManager?)
+            (binding.recyclerView.layoutManager as LinearLayoutManager)
-                ?.scrollToPositionWithOffset(crumb.scrollPosition, 0)
+                .scrollToPositionWithOffset(crumb.scrollPosition, 0)
         }
     }
 
@@ -525,7 +505,7 @@ class FoldersFragment : AbsMainActivityFragment(R.layout.fragment_folder),
     private suspend fun listPaths(
         file: File,
         fileFilter: FileFilter,
-        doOnPathListed: (paths: Array<String?>) -> Unit
+        doOnPathListed: (paths: Array<String?>) -> Unit,
     ) {
         val paths = try {
             val paths: Array<String?>
@@ -577,12 +557,12 @@ class FoldersFragment : AbsMainActivityFragment(R.layout.fragment_folder),
         }
     }
 
-    suspend fun listSongs(
+    private suspend fun listSongs(
         context: Context,
-        files: List<File>,
+        files: List<File?>,
         fileFilter: FileFilter,
         fileComparator: Comparator<File>,
-        doOnSongsListed: (songs: List<Song>) -> Unit
+        doOnSongsListed: (songs: List<Song>) -> Unit,
     ) {
         val songs = try {
             val fileList = FileUtil.listFilesDeep(files, fileFilter)
@@ -607,14 +587,18 @@ class FoldersFragment : AbsMainActivityFragment(R.layout.fragment_folder),
         )
     }
 
+    override fun scrollToTop() {
+        binding.recyclerView.scrollToPosition(0)
+        binding.appBarLayout.setExpanded(true, true)
+    }
+
     private fun switchToFileAdapter() {
-        adapter = SongFileAdapter(mainActivity, LinkedList(), R.layout.item_list, this, this)
+        adapter = SongFileAdapter(mainActivity, LinkedList(), R.layout.item_list, this)
         adapter!!.registerAdapterDataObserver(
             object : RecyclerView.AdapterDataObserver() {
                 override fun onChanged() {
                     super.onChanged()
                     checkIsEmpty()
-                    checkForPadding()
                 }
             })
         binding.recyclerView.adapter = adapter

app/src/main/java/code/name/monkey/retromusic/fragments/genres/GenreDetailsFragment.kt

@@ -71,7 +71,7 @@ class GenreDetailsFragment : AbsMainActivityFragment(R.layout.fragment_playlist_
     }
 
     private fun setupRecyclerView() {
-        songAdapter = SongAdapter(requireActivity(), ArrayList(), R.layout.item_list, null)
+        songAdapter = SongAdapter(requireActivity(), ArrayList(), R.layout.item_list)
         binding.recyclerView.apply {
             itemAnimator = DefaultItemAnimator()
             layoutManager = LinearLayoutManager(requireContext())