Prepare for v6.1.0

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

README.md

@@ -8,24 +8,21 @@ Material Design music player for Android music lovers
      alt="Get it on F-Droid"
      height="80">](https://f-droid.org/en/packages/io.github.muntashirakon.Music/)
 
-[<img src="https://camo.githubusercontent.com/70bffd8873ab81e1bb0bccc44e488c3a989e3bd5/68747470733a2f2f692e6962622e636f2f71306d6463345a2f6765742d69742d6f6e2d6769746875622e706e67"
-     alt="Get it on GitHub"
-     height="80">](https://github.com/MuntashirAkon/Metro/releases)
-
 ## 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 |
 
@@ -40,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,29 +1,30 @@
 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
-    buildToolsVersion = '30.0.3'
+    compileSdk 33
+    namespace "code.name.monkey.retromusic"
 
     defaultConfig {
         minSdk 21
-        targetSdk 32
+        targetSdk 33
 
         vectorDrawables.useSupportLibrary = true
 
         applicationId 'io.github.muntashirakon.Music'
-        versionCode 10580
-        versionName '5.8.5'
+        versionCode 10603
+        versionName '6.1.0'
 
         multiDexEnabled true
     }
     buildTypes {
         release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            shrinkResources true
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
         debug {
             applicationIdSuffix '.debug'
@@ -31,7 +32,7 @@ android {
         }
     }
 
-    buildFeatures{
+    buildFeatures {
         viewBinding true
     }
     packagingOptions {
@@ -40,8 +41,8 @@ android {
         }
     }
     lint {
-        abortOnError false
-        disable 'MissingTranslation', 'InvalidPackage'
+        abortOnError true
+        warning 'ImpliedQuantity', 'Instantiatable', 'MissingQuantity', 'MissingTranslation'
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -50,8 +51,11 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
-
-    configurations.all {
+    dependenciesInfo {
+        includeInApk = false
+        includeInBundle = false
+    }
+    configurations.configureEach {
         resolutionStrategy.force 'com.google.code.findbugs:jsr305:1.3.9'
     }
 }
@@ -60,35 +64,37 @@ 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.constraintlayout:constraintlayout:2.1.3'
-    implementation 'androidx.recyclerview:recyclerview:1.2.1'
+    implementation 'androidx.annotation:annotation:1.6.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    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"
+    implementation 'androidx.mediarouter:mediarouter:1.3.1'
 
     implementation "androidx.navigation:navigation-runtime-ktx:$navigation_version"
     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.1'
     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"
@@ -97,19 +103,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'
-    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'
+    def koin_version = '3.4.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.1'
     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'
 
@@ -124,8 +126,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 'cat.ereza:customactivityoncrash:2.3.0'
-    implementation 'me.tankery.lib:circularSeekBar:1.3.2'
-    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.9.1'
+    implementation 'me.zhanghai.android.fastscroll:library:1.2.0'
+    implementation 'cat.ereza:customactivityoncrash:2.4.0'
+    implementation 'me.tankery.lib:circularSeekBar:1.4.2'
 }

app/proguard-rules.pro

@@ -66,6 +66,6 @@
 -keep class * extends androidx.fragment.app.Fragment{}
 -keepnames class * extends android.os.Parcelable
 -keepnames class * extends java.io.Serializable
--keep class io.github.muntashirakon.music.network.model.** { *; }
--keep class io.github.muntashirakon.music.model.** { *; }
+-keep class code.name.monkey.retromusic.network.model.** { *; }
+-keep class code.name.monkey.retromusic.model.** { *; }
 -keep class com.google.android.material.bottomsheet.** { *; }

app/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="io.github.muntashirakon.music"
+    package="code.name.monkey.retromusic"
     android:installLocation="auto">
 
     <uses-permission
@@ -11,36 +11,47 @@
     <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission
+        android:name="android.permission.READ_EXTERNAL_STORAGE"
+        android:maxSdkVersion="32" />
+    <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <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=".App"
         android:allowBackup="@bool/allowBackup"
+        android:appCategory="audio"
         android:configChanges="locale|layoutDirection"
+        android:enableOnBackInvokedCallback="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:localeConfig="@xml/locales_config"
+        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="q">
+        tools:ignore="UnusedAttribute">
         <activity
             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 +62,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,7 +121,6 @@
                 <data android:mimeType="vnd.android.cursor.dir/audio" />
             </intent-filter>
         </activity>
-        <activity android:name=".activities.SettingsActivity" />
         <activity android:name=".activities.tageditor.AlbumTagEditorActivity" />
         <activity android:name=".activities.tageditor.SongTagEditorActivity" />
         <activity android:name=".activities.LicenseActivity" />
@@ -119,8 +128,11 @@
         <activity android:name=".activities.ShareInstagramStory" />
         <activity android:name=".activities.DriveModeActivity" />
         <activity android:name=".activities.PermissionActivity" />
-        <activity android:name=".activities.LockScreenActivity" />
-        <activity android:name=".activities.saf.SAFRequestActivity" />
+        <activity
+            android:name=".activities.LockScreenActivity"
+            android:excludeFromRecents="true"
+            android:launchMode="singleTask"
+            android:showOnLockScreen="true" />
         <activity
             android:name=".fragments.backup.RestoreActivity"
             android:excludeFromRecents="false"
@@ -175,16 +187,6 @@
             </intent-filter>
         </activity>
 
-        <provider
-            android:name=".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 +198,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" />
@@ -300,16 +302,12 @@
 
         <service
             android:name=".service.MusicService"
-            android:enabled="true"
             android:exported="true"
             android:foregroundServiceType="mediaPlayback"
             android:label="@string/app_name">
             <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
@@ -330,6 +328,16 @@
         <meta-data
             android:name="com.google.android.gms.car.notification.SmallIcon"
             android:resource="@drawable/ic_notification" />
+
+        <!-- For auto-storage of locale on Android 12 and lower -->
+        <service
+            android:name="androidx.appcompat.app.AppLocalesMetadataHolderService"
+            android:enabled="false"
+            android:exported="false">
+            <meta-data
+                android:name="autoStoreLocales"
+                android:value="true" />
+        </service>
     </application>
 
     <!--

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

@@ -62,6 +62,81 @@
 </head>
 
 <body>
+
+<div>
+    <h5>March 30, 2023</h5>
+    <h2>v6.1.0</h2>
+    <h3>What's New</h3>
+    <ul>
+        <li>App now targets Android 13, support for Granular media permissions, Photo picker, Per-app language preferences & Predictive back gesture</li>
+    </ul>
+    <h3>Fixed</h3>
+    <ul>
+        <li>Fixed playlist reordering crash</li>
+        <li>Other minor bugs fixes and improvements</li>
+    </ul>
+</div>
+<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,16 +10,19 @@
  * 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 io.github.muntashirakon.music
+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 io.github.muntashirakon.music.activities.ErrorActivity
-import io.github.muntashirakon.music.appshortcuts.DynamicShortcutManager
-import io.github.muntashirakon.music.helper.WallpaperAccentManager
+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
 import org.koin.core.context.startKoin
 
@@ -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

@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music
+package code.name.monkey.retromusic
 
 import android.provider.BaseColumns
 import android.provider.MediaStore
@@ -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"
@@ -92,6 +87,7 @@ const val ALBUM_COVER_STYLE = "album_cover_style_id"
 const val ALBUM_COVER_TRANSFORM = "album_cover_transform"
 const val TAB_TEXT_MODE = "tab_text_mode"
 const val LANGUAGE_NAME = "language_name"
+const val LOCALE_AUTO_STORE_ENABLED = "locale_auto_store_enabled"
 const val SLEEP_TIMER_FINISH_SONG = "sleep_timer_finish_song"
 const val ALBUM_GRID_STYLE = "album_grid_style_home"
 const val ARTIST_GRID_STYLE = "artist_grid_style_home"
@@ -99,7 +95,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"
@@ -116,7 +111,6 @@ const val ARTIST_GRID_SIZE_LAND = "artist_grid_size_land"
 const val PLAYLIST_GRID_SIZE = "playlist_grid_size"
 const val PLAYLIST_GRID_SIZE_LAND = "playlist_grid_size_land"
 const val COLORED_APP_SHORTCUTS = "colored_app_shortcuts"
-const val AUDIO_DUCKING = "audio_ducking"
 const val LAST_ADDED_CUTOFF = "last_added_interval"
 const val LAST_SLEEP_TIMER_VALUE = "last_sleep_timer_value"
 const val NEXT_SLEEP_TIMER_ELAPSED_REALTIME = "next_sleep_timer_elapsed_real_time"
@@ -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/HomeSection.kt

@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music
+package code.name.monkey.retromusic
 
 import androidx.annotation.IntDef
 

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

@@ -1,24 +1,16 @@
-package io.github.muntashirakon.music
+package code.name.monkey.retromusic
 
 import androidx.room.Room
-import androidx.room.RoomDatabase
-import androidx.sqlite.db.SupportSQLiteDatabase
-import io.github.muntashirakon.music.auto.AutoMusicProvider
-import io.github.muntashirakon.music.db.BlackListStoreDao
-import io.github.muntashirakon.music.db.BlackListStoreEntity
-import io.github.muntashirakon.music.db.PlaylistWithSongs
-import io.github.muntashirakon.music.db.RetroDatabase
-import io.github.muntashirakon.music.fragments.LibraryViewModel
-import io.github.muntashirakon.music.fragments.albums.AlbumDetailsViewModel
-import io.github.muntashirakon.music.fragments.artists.ArtistDetailsViewModel
-import io.github.muntashirakon.music.fragments.genres.GenreDetailsViewModel
-import io.github.muntashirakon.music.fragments.playlists.PlaylistDetailsViewModel
-import io.github.muntashirakon.music.model.Genre
-import io.github.muntashirakon.music.repository.*
-import io.github.muntashirakon.music.util.FilePathUtil
-import kotlinx.coroutines.Dispatchers.IO
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
+import code.name.monkey.retromusic.auto.AutoMusicProvider
+import code.name.monkey.retromusic.db.MIGRATION_23_24
+import code.name.monkey.retromusic.db.RetroDatabase
+import code.name.monkey.retromusic.fragments.LibraryViewModel
+import code.name.monkey.retromusic.fragments.albums.AlbumDetailsViewModel
+import code.name.monkey.retromusic.fragments.artists.ArtistDetailsViewModel
+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 org.koin.android.ext.koin.androidContext
 import org.koin.androidx.viewmodel.dsl.viewModel
 import org.koin.dsl.bind
@@ -28,32 +20,14 @@ private val roomModule = module {
 
     single {
         Room.databaseBuilder(androidContext(), RetroDatabase::class.java, "playlist.db")
-            .allowMainThreadQueries()
-            .addCallback(object : RoomDatabase.Callback() {
-                override fun onOpen(db: SupportSQLiteDatabase) {
-                    super.onOpen(db)
-                    GlobalScope.launch(IO) {
-                        FilePathUtil.blacklistFilePaths().map {
-                            get<BlackListStoreDao>().insertBlacklistPath(BlackListStoreEntity(it))
-                        }
-                    }
-                }
-            })
-            .fallbackToDestructiveMigration()
+            .addMigrations(MIGRATION_23_24)
             .build()
     }
-    factory {
-        get<RetroDatabase>().lyricsDao()
-    }
 
     factory {
         get<RetroDatabase>().playlistDao()
     }
 
-    factory {
-        get<RetroDatabase>().blackListStore()
-    }
-
     factory {
         get<RetroDatabase>().playCountDao()
     }
@@ -63,7 +37,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 +138,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

@@ -12,35 +12,32 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.activities
+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 io.github.muntashirakon.music.R
-import io.github.muntashirakon.music.activities.base.AbsMusicServiceActivity
-import io.github.muntashirakon.music.databinding.ActivityDriveModeBinding
-import io.github.muntashirakon.music.db.toSongEntity
-import io.github.muntashirakon.music.extensions.accentColor
-import io.github.muntashirakon.music.extensions.drawAboveSystemBars
-import io.github.muntashirakon.music.fragments.base.AbsPlayerControlsFragment
-import io.github.muntashirakon.music.glide.BlurTransformation
-import io.github.muntashirakon.music.glide.GlideApp
-import io.github.muntashirakon.music.glide.RetroGlideExtension
-import io.github.muntashirakon.music.helper.MusicPlayerRemote
-import io.github.muntashirakon.music.helper.MusicProgressViewUpdateHelper
-import io.github.muntashirakon.music.helper.MusicProgressViewUpdateHelper.Callback
-import io.github.muntashirakon.music.helper.PlayPauseButtonOnClickHandler
-import io.github.muntashirakon.music.misc.SimpleOnSeekbarChangeListener
-import io.github.muntashirakon.music.model.Song
-import io.github.muntashirakon.music.repository.RealRepository
-import io.github.muntashirakon.music.service.MusicService
-import io.github.muntashirakon.music.util.MusicUtil
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.activities.base.AbsMusicServiceActivity
+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.glide.BlurTransformation
+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.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() {
-            override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) {
-                if (fromUser) {
-                    MusicPlayerRemote.seekTo(progress)
-                    onUpdateProgressViews(
-                        MusicPlayerRemote.songProgressMillis,
-                        MusicPlayerRemote.songDurationMillis
-                    )
-                }
+        binding.progressSlider.addOnChangeListener { _: Slider, progress: Float, fromUser: Boolean ->
+            if (fromUser) {
+                MusicPlayerRemote.seekTo(progress.toInt())
+                onUpdateProgressViews(
+                    MusicPlayerRemote.songProgressMillis,
+                    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
-
-        val animator = ObjectAnimator.ofInt(binding.progressSlider, "progress", progress)
-        animator.duration = AbsPlayerControlsFragment.SLIDER_ANIMATION_TIME
-        animator.interpolator = LinearInterpolator()
-        animator.start()
+        binding.progressSlider.run {
+            valueTo = total.toFloat()
+            value = progress.toFloat().coerceIn(valueFrom, valueTo)
+        }
 
         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

@@ -1,34 +1,34 @@
-package io.github.muntashirakon.music.activities
+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 io.github.muntashirakon.music.R
-import io.github.muntashirakon.music.util.FileUtils.createFile
-import io.github.muntashirakon.music.util.Share.shareFile
+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)
-                .setTitle(R.string.customactivityoncrash_error_activity_error_details_title)
+            MaterialAlertDialogBuilder(this@ErrorActivity)
+                .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

@@ -11,7 +11,7 @@
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  */
-package io.github.muntashirakon.music.activities
+package code.name.monkey.retromusic.activities
 
 import android.graphics.Color
 import android.os.Bundle
@@ -19,11 +19,11 @@ import android.view.MenuItem
 import code.name.monkey.appthemehelper.util.ATHUtil.isWindowBackgroundDark
 import code.name.monkey.appthemehelper.util.ColorUtil.lightenColor
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
-import io.github.muntashirakon.music.activities.base.AbsThemeActivity
-import io.github.muntashirakon.music.databinding.ActivityLicenseBinding
-import io.github.muntashirakon.music.extensions.accentColor
-import io.github.muntashirakon.music.extensions.drawAboveSystemBars
-import io.github.muntashirakon.music.extensions.surfaceColor
+import code.name.monkey.retromusic.activities.base.AbsThemeActivity
+import code.name.monkey.retromusic.databinding.ActivityLicenseBinding
+import code.name.monkey.retromusic.extensions.accentColor
+import code.name.monkey.retromusic.extensions.drawAboveSystemBars
+import code.name.monkey.retromusic.extensions.surfaceColor
 import java.io.BufferedReader
 import java.io.InputStreamReader
 import java.nio.charset.StandardCharsets
@@ -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

@@ -12,25 +12,27 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.activities
+package code.name.monkey.retromusic.activities
 
 import android.app.KeyguardManager
 import android.os.Bundle
 import android.view.WindowManager
 import androidx.core.content.getSystemService
 import code.name.monkey.appthemehelper.util.VersionUtils
-import io.github.muntashirakon.music.R
-import io.github.muntashirakon.music.activities.base.AbsMusicServiceActivity
-import io.github.muntashirakon.music.databinding.ActivityLockScreenBinding
-import io.github.muntashirakon.music.extensions.hideStatusBar
-import io.github.muntashirakon.music.extensions.setTaskDescriptionColorAuto
-import io.github.muntashirakon.music.extensions.whichFragment
-import io.github.muntashirakon.music.fragments.player.lockscreen.LockScreenControlsFragment
-import io.github.muntashirakon.music.glide.GlideApp
-import io.github.muntashirakon.music.glide.RetroGlideExtension
-import io.github.muntashirakon.music.glide.RetroMusicColoredTarget
-import io.github.muntashirakon.music.helper.MusicPlayerRemote
-import io.github.muntashirakon.music.util.color.MediaNotificationProcessor
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.activities.base.AbsMusicServiceActivity
+import code.name.monkey.retromusic.databinding.ActivityLockScreenBinding
+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.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>()
-            keyguardManager?.requestDismissKeyguard(this, null)
+            //setTurnScreenOn(true)
         } else {
-            this.window.addFlags(
-                WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD or
-                        WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED
+            window.addFlags(
+                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

@@ -12,43 +12,37 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.activities
+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 io.github.muntashirakon.music.*
-import io.github.muntashirakon.music.activities.base.AbsSlidingMusicPanelActivity
-import io.github.muntashirakon.music.databinding.SlidingMusicPanelLayoutBinding
-import io.github.muntashirakon.music.extensions.*
-import io.github.muntashirakon.music.helper.MusicPlayerRemote
-import io.github.muntashirakon.music.helper.SearchQueryHelper.getSongs
-import io.github.muntashirakon.music.interfaces.IScrollHelper
-import io.github.muntashirakon.music.model.CategoryInfo
-import io.github.muntashirakon.music.model.Song
-import io.github.muntashirakon.music.repository.PlaylistSongsLoader
-import io.github.muntashirakon.music.service.MusicService
-import io.github.muntashirakon.music.util.PreferenceUtil
+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.helper.MusicPlayerRemote
+import code.name.monkey.retromusic.helper.SearchQueryHelper.getSongs
+import code.name.monkey.retromusic.interfaces.IScrollHelper
+import code.name.monkey.retromusic.model.CategoryInfo
+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

@@ -12,9 +12,8 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.activities
+package code.name.monkey.retromusic.activities
 
-import android.Manifest
 import android.Manifest.permission.BLUETOOTH_CONNECT
 import android.content.Intent
 import android.content.pm.PackageManager
@@ -22,16 +21,17 @@ 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
 import androidx.core.text.parseAsHtml
 import androidx.core.view.isVisible
 import code.name.monkey.appthemehelper.util.VersionUtils
-import io.github.muntashirakon.music.R
-import io.github.muntashirakon.music.activities.base.AbsMusicServiceActivity
-import io.github.muntashirakon.music.databinding.ActivityPermissionBinding
-import io.github.muntashirakon.music.extensions.*
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.activities.base.AbsMusicServiceActivity
+import code.name.monkey.retromusic.databinding.ActivityPermissionBinding
+import code.name.monkey.retromusic.extensions.*
 
 class PermissionActivity : AbsMusicServiceActivity() {
     private lateinit var binding: ActivityPermissionBinding
@@ -61,10 +61,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 +83,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,
-                "<b>Metro</b>")
+            getString(
+                R.string.message_welcome,
+                "<b>Metro</b>"
+            )
                 .parseAsHtml()
         binding.appNameText.text = appName
     }
@@ -114,23 +126,19 @@ class PermissionActivity : AbsMusicServiceActivity() {
     }
 
     private fun hasStoragePermission(): Boolean {
-        return ActivityCompat.checkSelfPermission(this,
-            Manifest.permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED
+        return hasPermissions()
     }
 
     @RequiresApi(Build.VERSION_CODES.S)
     private fun hasBluetoothPermission(): Boolean {
-        return ActivityCompat.checkSelfPermission(this,
-            BLUETOOTH_CONNECT) == PackageManager.PERMISSION_GRANTED
+        return ActivityCompat.checkSelfPermission(
+            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

@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.activities
+package code.name.monkey.retromusic.activities
 
 import android.content.res.ColorStateList
 import android.graphics.Bitmap
@@ -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 io.github.muntashirakon.music.activities.base.AbsBaseActivity
-import io.github.muntashirakon.music.databinding.ActivityShareInstagramBinding
-import io.github.muntashirakon.music.extensions.accentColor
-import io.github.muntashirakon.music.extensions.setLightStatusBar
-import io.github.muntashirakon.music.extensions.setStatusBarColor
-import io.github.muntashirakon.music.glide.GlideApp
-import io.github.muntashirakon.music.glide.RetroGlideExtension
-import io.github.muntashirakon.music.glide.RetroMusicColoredTarget
-import io.github.muntashirakon.music.model.Song
-import io.github.muntashirakon.music.util.Share
-import io.github.muntashirakon.music.util.color.MediaNotificationProcessor
+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.setStatusBarColor
+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(isColorLight, colors.backgroundColor)
+                        setColors(colors.backgroundColor)
                     }
                 })
 
@@ -103,22 +104,7 @@ class ShareInstagramStory : AbsBaseActivity() {
             ColorStateList.valueOf(accentColor())
     }
 
-    private fun setColors(colorLight: Boolean, color: Int) {
-        setLightStatusBar(colorLight)
-        binding.toolbar.setTitleTextColor(
-            MaterialValueHelper.getPrimaryTextColor(
-                this@ShareInstagramStory,
-                colorLight
-            )
-        )
-        binding.toolbar.navigationIcon?.setTintList(
-            ColorStateList.valueOf(
-                MaterialValueHelper.getPrimaryTextColor(
-                    this@ShareInstagramStory,
-                    colorLight
-                )
-            )
-        )
+    private fun setColors(color: Int) {
         binding.mainContent.background =
             GradientDrawable(
                 GradientDrawable.Orientation.TOP_BOTTOM,

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

@@ -1,12 +1,16 @@
-package io.github.muntashirakon.music.activities
+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.pm.PackageInfoCompat
 import androidx.core.widget.NestedScrollView
 import androidx.fragment.app.FragmentActivity
@@ -14,12 +18,12 @@ import code.name.monkey.appthemehelper.util.ATHUtil.isWindowBackgroundDark
 import code.name.monkey.appthemehelper.util.ColorUtil.isColorLight
 import code.name.monkey.appthemehelper.util.ColorUtil.lightenColor
 import code.name.monkey.appthemehelper.util.MaterialValueHelper.getPrimaryTextColor
-import io.github.muntashirakon.music.BuildConfig
-import io.github.muntashirakon.music.Constants
-import io.github.muntashirakon.music.databinding.FragmentWhatsNewBinding
-import io.github.muntashirakon.music.extensions.accentColor
-import io.github.muntashirakon.music.extensions.openUrl
-import io.github.muntashirakon.music.util.PreferenceUtil.lastVersion
+import code.name.monkey.retromusic.BuildConfig
+import code.name.monkey.retromusic.Constants
+import code.name.monkey.retromusic.databinding.FragmentWhatsNewBinding
+import code.name.monkey.retromusic.extensions.accentColor
+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.*
@@ -41,7 +45,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 +80,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

@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.activities.base
+package code.name.monkey.retromusic.activities.base
 
 import android.Manifest
 import android.content.Intent
@@ -30,8 +30,10 @@ import android.widget.EditText
 import androidx.core.app.ActivityCompat
 import androidx.core.content.getSystemService
 import code.name.monkey.appthemehelper.util.VersionUtils
-import io.github.muntashirakon.music.R
-import io.github.muntashirakon.music.extensions.accentColor
+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

@@ -12,27 +12,29 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.activities.base
+package code.name.monkey.retromusic.activities.base
 
 import android.Manifest
 import android.content.*
 import android.os.Bundle
 import android.os.IBinder
+import androidx.core.content.ContextCompat
 import androidx.lifecycle.lifecycleScope
 import code.name.monkey.appthemehelper.util.VersionUtils
-import io.github.muntashirakon.music.R
-import io.github.muntashirakon.music.db.toPlayCount
-import io.github.muntashirakon.music.helper.MusicPlayerRemote
-import io.github.muntashirakon.music.interfaces.IMusicServiceEventListener
-import io.github.muntashirakon.music.repository.RealRepository
-import io.github.muntashirakon.music.service.MusicService.Companion.FAVORITE_STATE_CHANGED
-import io.github.muntashirakon.music.service.MusicService.Companion.MEDIA_STORE_CHANGED
-import io.github.muntashirakon.music.service.MusicService.Companion.META_CHANGED
-import io.github.muntashirakon.music.service.MusicService.Companion.PLAY_STATE_CHANGED
-import io.github.muntashirakon.music.service.MusicService.Companion.QUEUE_CHANGED
-import io.github.muntashirakon.music.service.MusicService.Companion.REPEAT_MODE_CHANGED
-import io.github.muntashirakon.music.service.MusicService.Companion.SHUFFLE_MODE_CHANGED
-import io.github.muntashirakon.music.util.PreferenceUtil
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.db.toPlayCount
+import code.name.monkey.retromusic.helper.MusicPlayerRemote
+import code.name.monkey.retromusic.interfaces.IMusicServiceEventListener
+import code.name.monkey.retromusic.repository.RealRepository
+import code.name.monkey.retromusic.service.MusicService.Companion.FAVORITE_STATE_CHANGED
+import code.name.monkey.retromusic.service.MusicService.Companion.MEDIA_STORE_CHANGED
+import code.name.monkey.retromusic.service.MusicService.Companion.META_CHANGED
+import code.name.monkey.retromusic.service.MusicService.Companion.PLAY_STATE_CHANGED
+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
@@ -95,8 +97,7 @@ abstract class AbsMusicServiceActivity : AbsBaseActivity(), IMusicServiceEventLi
             filter.addAction(MEDIA_STORE_CHANGED)
             filter.addAction(FAVORITE_STATE_CHANGED)
 
-            registerReceiver(musicStateReceiver, filter)
-
+            ContextCompat.registerReceiver(this, musicStateReceiver, filter, ContextCompat.RECEIVER_NOT_EXPORTED)
             receiverRegistered = true
         }
 
@@ -121,23 +122,14 @@ abstract class AbsMusicServiceActivity : AbsBaseActivity(), IMusicServiceEventLi
             listener.onPlayingMetaChanged()
         }
         lifecycleScope.launch(Dispatchers.IO) {
-            val entity = repository.songPresentInHistory(MusicPlayerRemote.currentSong)
-            if (entity != null) {
-                repository.updateHistorySong(MusicPlayerRemote.currentSong)
-            } else {
-                // Check whether pause history option is ON or OFF
-                if (!PreferenceUtil.pauseHistory) {
-                    repository.addSongToHistory(MusicPlayerRemote.currentSong)
-                }
-            }
-            val songs = repository.checkSongExistInPlayCount(MusicPlayerRemote.currentSong.id)
-            if (songs.isNotEmpty()) {
-                repository.updateSongInPlayCount(songs.first().apply {
-                    playCount += 1
-                })
-            } else {
-                repository.insertSongInPlayCount(MusicPlayerRemote.currentSong.toPlayCount())
+            if (!PreferenceUtil.pauseHistory) {
+                repository.upsertSongInHistory(MusicPlayerRemote.currentSong)
             }
+            val song = repository.findSongExistInPlayCount(MusicPlayerRemote.currentSong.id)
+                ?.apply { playCount += 1 }
+                ?: MusicPlayerRemote.currentSong.toPlayCount()
+
+            repository.upsertSongInPlayCount(song)
         }
     }
 
@@ -185,12 +177,18 @@ 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()) {
+        return mutableListOf<String>().apply {
+            if (VersionUtils.hasT()) {
+                add(Manifest.permission.READ_MEDIA_AUDIO)
+                add(Manifest.permission.POST_NOTIFICATIONS)
+            } else {
+                add(Manifest.permission.READ_EXTERNAL_STORAGE)
+            }
+            if (!VersionUtils.hasR()) {
                 add(Manifest.permission.WRITE_EXTERNAL_STORAGE)
             }
         }.toTypedArray()

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

@@ -12,10 +12,12 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.activities.base
+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,48 +26,74 @@ 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 io.github.muntashirakon.music.R
-import io.github.muntashirakon.music.databinding.SlidingMusicPanelLayoutBinding
-import io.github.muntashirakon.music.extensions.*
-import io.github.muntashirakon.music.fragments.LibraryViewModel
-import io.github.muntashirakon.music.fragments.NowPlayingScreen
-import io.github.muntashirakon.music.fragments.NowPlayingScreen.*
-import io.github.muntashirakon.music.fragments.base.AbsPlayerFragment
-import io.github.muntashirakon.music.fragments.other.MiniPlayerFragment
-import io.github.muntashirakon.music.fragments.player.adaptive.AdaptiveFragment
-import io.github.muntashirakon.music.fragments.player.blur.BlurPlayerFragment
-import io.github.muntashirakon.music.fragments.player.card.CardFragment
-import io.github.muntashirakon.music.fragments.player.cardblur.CardBlurFragment
-import io.github.muntashirakon.music.fragments.player.circle.CirclePlayerFragment
-import io.github.muntashirakon.music.fragments.player.classic.ClassicPlayerFragment
-import io.github.muntashirakon.music.fragments.player.color.ColorFragment
-import io.github.muntashirakon.music.fragments.player.fit.FitFragment
-import io.github.muntashirakon.music.fragments.player.flat.FlatPlayerFragment
-import io.github.muntashirakon.music.fragments.player.full.FullPlayerFragment
-import io.github.muntashirakon.music.fragments.player.gradient.GradientPlayerFragment
-import io.github.muntashirakon.music.fragments.player.material.MaterialFragment
-import io.github.muntashirakon.music.fragments.player.md3.MD3PlayerFragment
-import io.github.muntashirakon.music.fragments.player.normal.PlayerFragment
-import io.github.muntashirakon.music.fragments.player.peek.PeekPlayerFragment
-import io.github.muntashirakon.music.fragments.player.plain.PlainPlayerFragment
-import io.github.muntashirakon.music.fragments.player.simple.SimplePlayerFragment
-import io.github.muntashirakon.music.fragments.player.tiny.TinyPlayerFragment
-import io.github.muntashirakon.music.fragments.queue.PlayingQueueFragment
-import io.github.muntashirakon.music.helper.MusicPlayerRemote
-import io.github.muntashirakon.music.model.CategoryInfo
-import io.github.muntashirakon.music.util.PreferenceUtil
-import io.github.muntashirakon.music.util.ViewUtil
+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.*
+import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
+import code.name.monkey.retromusic.fragments.other.MiniPlayerFragment
+import code.name.monkey.retromusic.fragments.player.adaptive.AdaptiveFragment
+import code.name.monkey.retromusic.fragments.player.blur.BlurPlayerFragment
+import code.name.monkey.retromusic.fragments.player.card.CardFragment
+import code.name.monkey.retromusic.fragments.player.cardblur.CardBlurFragment
+import code.name.monkey.retromusic.fragments.player.circle.CirclePlayerFragment
+import code.name.monkey.retromusic.fragments.player.classic.ClassicPlayerFragment
+import code.name.monkey.retromusic.fragments.player.color.ColorFragment
+import code.name.monkey.retromusic.fragments.player.fit.FitFragment
+import code.name.monkey.retromusic.fragments.player.flat.FlatPlayerFragment
+import code.name.monkey.retromusic.fragments.player.full.FullPlayerFragment
+import code.name.monkey.retromusic.fragments.player.gradient.GradientPlayerFragment
+import code.name.monkey.retromusic.fragments.player.material.MaterialFragment
+import code.name.monkey.retromusic.fragments.player.md3.MD3PlayerFragment
+import code.name.monkey.retromusic.fragments.player.normal.PlayerFragment
+import code.name.monkey.retromusic.fragments.player.peek.PeekPlayerFragment
+import code.name.monkey.retromusic.fragments.player.plain.PlainPlayerFragment
+import code.name.monkey.retromusic.fragments.player.simple.SimplePlayerFragment
+import code.name.monkey.retromusic.fragments.player.tiny.TinyPlayerFragment
+import code.name.monkey.retromusic.fragments.queue.PlayingQueueFragment
+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,62 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity() {
     private var navigationBarColorAnimator: ValueAnimator? = null
     private val argbEvaluator: ArgbEvaluator = ArgbEvaluator()
 
-    private val bottomSheetCallbackList = object : BottomSheetCallback() {
-
-        override fun onSlide(bottomSheet: View, slideOffset: Float) {
-            setMiniPlayerAlphaProgress(slideOffset)
-            navigationBarColorAnimator?.cancel()
-            setNavigationBarColorPreOreo(
-                argbEvaluator.evaluate(
-                    slideOffset,
-                    surfaceColor(),
-                    navigationBarColor
-                ) as Int
-            )
+    private val onBackPressedCallback = object : OnBackPressedCallback(true) {
+        override fun handleOnBackPressed() {
+            println("Handle back press ${bottomSheetBehavior.state}")
+            if (!handleBackPress()) {
+                remove()
+                onBackPressedDispatcher.onBackPressed()
+            }
         }
+    }
 
-        override fun onStateChanged(bottomSheet: View, newState: Int) {
-            when (newState) {
-                STATE_EXPANDED -> {
-                    onPanelExpanded()
-                    if (PreferenceUtil.lyricsScreenOn && PreferenceUtil.showLyrics) {
-                        keepScreenOn(true)
+    private val bottomSheetCallbackList by lazy {
+        object : BottomSheetCallback() {
+
+            override fun onSlide(bottomSheet: View, slideOffset: Float) {
+                setMiniPlayerAlphaProgress(slideOffset)
+                navigationBarColorAnimator?.cancel()
+                setNavigationBarColorPreOreo(
+                    argbEvaluator.evaluate(
+                        slideOffset,
+                        surfaceColor(),
+                        navigationBarColor
+                    ) as Int
+                )
+            }
+
+            override fun onStateChanged(bottomSheet: View, newState: Int) {
+                onBackPressedCallback.isEnabled = newState == STATE_EXPANDED
+                when (newState) {
+                    STATE_EXPANDED -> {
+                        onPanelExpanded()
+                        if (PreferenceUtil.lyricsScreenOn && PreferenceUtil.showLyrics) {
+                            keepScreenOn(true)
+                        }
                     }
-                }
-                STATE_COLLAPSED -> {
-                    onPanelCollapsed()
-                    if ((PreferenceUtil.lyricsScreenOn && PreferenceUtil.showLyrics) || !PreferenceUtil.isScreenOnEnabled) {
-                        keepScreenOn(false)
+
+                    STATE_COLLAPSED -> {
+                        onPanelCollapsed()
+                        if ((PreferenceUtil.lyricsScreenOn && PreferenceUtil.showLyrics) || !PreferenceUtil.isScreenOnEnabled) {
+                            keepScreenOn(false)
+                        }
                     }
-                }
-                STATE_SETTLING, STATE_DRAGGING -> {
-                    if (fromNotification) {
-                        binding.bottomNavigationView.bringToFront()
-                        fromNotification = false
+
+                    STATE_SETTLING, STATE_DRAGGING -> {
+                        if (fromNotification) {
+                            binding.navigationView.bringToFront()
+                            fromNotification = false
+                        }
+                    }
+
+                    STATE_HIDDEN -> {
+                        MusicPlayerRemote.clearQueue()
+                    }
+
+                    else -> {
+                        logD("Do a flip")
                     }
-                }
-                STATE_HIDDEN -> {
-                    MusicPlayerRemote.clearQueue()
-                }
-                else -> {
-                    println("Do a flip")
                 }
             }
         }
@@ -137,12 +182,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
-        ) { _, insets ->
-            windowInsets = insets
+        binding.root.setOnApplyWindowInsetsListener { _, insets ->
+            windowInsets = WindowInsetsCompat.toWindowInsetsCompat(insets)
             insets
         }
         chooseFragmentForTheme()
@@ -151,21 +198,25 @@ 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()
+
+        onBackPressedDispatcher.addCallback(onBackPressedCallback)
     }
 
     private fun setupBottomSheet() {
         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 +228,69 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity() {
     override fun onDestroy() {
         super.onDestroy()
         bottomSheetBehavior.removeBottomSheetCallback(bottomSheetCallbackList)
+        PreferenceUtil.unregisterOnSharedPreferenceChangedListener(this)
     }
 
-    protected fun wrapSlidingMusicPanel(): SlidingMusicPanelLayoutBinding {
-        return SlidingMusicPanelLayoutBinding.inflate(layoutInflater)
+    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
+        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 +306,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
-        binding.bottomNavigationView.alpha = alpha
+        if (!isLandscape) {
+            binding.navigationView.translationY = progress * 500
+            binding.navigationView.alpha = alpha
+        }
         binding.playerFragmentContainer.alpha = (progress - 0.2F) / 0.2F
     }
 
@@ -224,13 +336,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 +366,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()) {
-            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
+        hideBottomSheet(false)
     }
 
     override fun onQueueChanged() {
@@ -280,12 +386,7 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity() {
         }
     }
 
-    override fun onBackPressed() {
-        if (!handleBackPress()) super.onBackPressed()
-    }
-
     private fun handleBackPress(): Boolean {
-        if (bottomSheetBehavior.peekHeight != 0 && playerFragment!!.onBackPressed()) return true
         if (panelState == STATE_EXPANDED) {
             collapsePanel()
             return true
@@ -332,18 +433,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 +462,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 +473,38 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity() {
             )
             return
         }
-        val mAnimate = animate && bottomSheetBehavior.state == STATE_COLLAPSED
-        if (mAnimate) {
-            if (visible) {
-                binding.bottomNavigationView.bringToFront()
-                binding.bottomNavigationView.show()
+        if (visible xor navigationView.isVisible) {
+            val mAnimate = animate && bottomSheetBehavior.state == STATE_COLLAPSED
+            if (mAnimate) {
+                if (visible) {
+                    binding.navigationView.bringToFront()
+                    binding.navigationView.show()
+                } else {
+                    binding.navigationView.hide()
+                }
             } else {
-                binding.bottomNavigationView.hide()
-            }
-        } else {
-            binding.bottomNavigationView.isVisible = false
-            if (visible && bottomSheetBehavior.state != STATE_EXPANDED) {
-                binding.bottomNavigationView.bringToFront()
+                binding.navigationView.isVisible = visible
+                if (visible && bottomSheetBehavior.state != STATE_EXPANDED) {
+                    binding.navigationView.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 =
-            windowInsets.safeGetBottomInsets() +
-                    if (MusicPlayerRemote.isCasting) dip(R.dimen.cast_mini_player_height) else dip(R.dimen.mini_player_height)
+        val heightOfBar = windowInsets.getBottomInsets() + 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 +513,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 +549,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 +569,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

@@ -12,38 +12,35 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.activities.base
+package code.name.monkey.retromusic.activities.base
 
 import android.content.Context
-import android.content.res.Resources
 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
 import androidx.appcompat.app.AppCompatDelegate.setDefaultNightMode
-import androidx.core.os.ConfigurationCompat
+import androidx.core.os.LocaleListCompat
 import code.name.monkey.appthemehelper.common.ATHToolbarActivity
 import code.name.monkey.appthemehelper.util.VersionUtils
-import io.github.muntashirakon.music.LanguageContextWrapper
-import io.github.muntashirakon.music.R
-import io.github.muntashirakon.music.extensions.*
-import io.github.muntashirakon.music.util.PreferenceUtil
-import io.github.muntashirakon.music.util.theme.getNightMode
-import io.github.muntashirakon.music.util.theme.getThemeResValue
-import java.util.*
+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.theme.getNightMode
+import code.name.monkey.retromusic.util.theme.getThemeResValue
 
 abstract class AbsThemeActivity : ATHToolbarActivity(), Runnable {
 
     private val handler = Handler(Looper.getMainLooper())
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        updateLocale()
         updateTheme()
         hideStatusBar()
         super.onCreate(savedInstanceState)
         setEdgeToEdgeOrImmersive()
-        registerSystemUiVisibility()
-        toggleScreenOn()
+        maybeSetScreenOn()
         setLightNavigationBarAuto()
         setLightStatusBarAuto(surfaceColor())
         if (VersionUtils.hasQ()) {
@@ -60,8 +57,13 @@ abstract class AbsThemeActivity : ATHToolbarActivity(), Runnable {
         if (PreferenceUtil.isCustomFont) {
             setTheme(R.style.FontThemeOverlay)
         }
-        if (PreferenceUtil.circlePlayButton) {
-            setTheme(R.style.CircleFABOverlay)
+    }
+
+    private fun updateLocale() {
+        val localeCode = PreferenceUtil.languageCode
+        if (PreferenceUtil.isLocaleAutoStorageEnabled) {
+            AppCompatDelegate.setApplicationLocales(LocaleListCompat.forLanguageTags(localeCode))
+            PreferenceUtil.isLocaleAutoStorageEnabled = true
         }
     }
 
@@ -76,20 +78,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 +89,6 @@ abstract class AbsThemeActivity : ATHToolbarActivity(), Runnable {
 
     public override fun onDestroy() {
         super.onDestroy()
-        unregisterSystemUiVisibility()
         exitFullscreen()
     }
 
@@ -114,13 +101,6 @@ abstract class AbsThemeActivity : ATHToolbarActivity(), Runnable {
     }
 
     override fun attachBaseContext(newBase: Context?) {
-        val code = PreferenceUtil.languageCode
-        val locale = if (code == "auto") {
-            // Get the device default locale
-            ConfigurationCompat.getLocales(Resources.getSystem().configuration)[0]
-        } else {
-            Locale.forLanguageTag(code)
-        }
-        super.attachBaseContext(LanguageContextWrapper.wrap(newBase, locale))
+        super.attachBaseContext(newBase)
     }
 }

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

@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.activities.bugreport
+package code.name.monkey.retromusic.activities.bugreport
 
 import android.content.ClipData
 import android.content.ClipboardManager
@@ -23,13 +23,13 @@ import androidx.core.content.getSystemService
 import androidx.core.net.toUri
 import code.name.monkey.appthemehelper.util.TintHelper
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
-import io.github.muntashirakon.music.R
-import io.github.muntashirakon.music.activities.base.AbsThemeActivity
-import io.github.muntashirakon.music.activities.bugreport.model.DeviceInfo
-import io.github.muntashirakon.music.databinding.ActivityBugReportBinding
-import io.github.muntashirakon.music.extensions.accentColor
-import io.github.muntashirakon.music.extensions.setTaskDescriptionColorAuto
-import io.github.muntashirakon.music.extensions.showToast
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.activities.base.AbsThemeActivity
+import code.name.monkey.retromusic.activities.bugreport.model.DeviceInfo
+import code.name.monkey.retromusic.databinding.ActivityBugReportBinding
+import code.name.monkey.retromusic.extensions.accentColor
+import code.name.monkey.retromusic.extensions.setTaskDescriptionColorAuto
+import code.name.monkey.retromusic.extensions.showToast
 
 open class BugReportActivity : AbsThemeActivity() {
 
@@ -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/bugreport/model/DeviceInfo.kt

@@ -1,15 +1,15 @@
-package io.github.muntashirakon.music.activities.bugreport.model
+package code.name.monkey.retromusic.activities.bugreport.model
 
 import android.annotation.SuppressLint
 import android.content.Context
 import android.content.pm.PackageManager
 import android.os.Build
 import androidx.annotation.IntRange
+import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.content.pm.PackageInfoCompat
-import io.github.muntashirakon.music.util.PreferenceUtil
-import io.github.muntashirakon.music.util.PreferenceUtil.isAdaptiveColor
-import io.github.muntashirakon.music.util.PreferenceUtil.languageCode
-import io.github.muntashirakon.music.util.PreferenceUtil.nowPlayingScreen
+import code.name.monkey.retromusic.util.PreferenceUtil
+import code.name.monkey.retromusic.util.PreferenceUtil.isAdaptiveColor
+import code.name.monkey.retromusic.util.PreferenceUtil.nowPlayingScreen
 import java.util.*
 
 class DeviceInfo(context: Context) {
@@ -106,6 +106,6 @@ class DeviceInfo(context: Context) {
         baseTheme = PreferenceUtil.baseTheme
         nowPlayingTheme = context.getString(nowPlayingScreen.titleRes)
         isAdaptive = isAdaptiveColor
-        selectedLang = languageCode
+        selectedLang = AppCompatDelegate.getApplicationLocales().toLanguageTags()
     }
 }

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

@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  */
 
-package io.github.muntashirakon.music.activities.saf;
+package code.name.monkey.retromusic.activities.saf;
 
 import android.os.Build;
 import android.os.Bundle;
@@ -22,7 +22,7 @@ import androidx.annotation.Nullable;
 import com.heinrichreimersoftware.materialintro.app.IntroActivity;
 import com.heinrichreimersoftware.materialintro.slide.SimpleSlide;
 
-import io.github.muntashirakon.music.R;
+import code.name.monkey.retromusic.R;
 
 /** Created by hemanths on 2019-07-31. */
 public class SAFGuideActivity extends IntroActivity {
@@ -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)
-            .backgroundDark(R.color.md_deep_purple_400)
+            .background(code.name.monkey.appthemehelper.R.color.md_deep_purple_300)
+            .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)
-            .backgroundDark(R.color.md_deep_purple_600)
+            .background(code.name.monkey.appthemehelper.R.color.md_deep_purple_500)
+            .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)
-            .backgroundDark(R.color.md_deep_purple_800)
+            .background(code.name.monkey.appthemehelper.R.color.md_deep_purple_700)
+            .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/saf/SAFRequestActivity.kt

@@ -11,19 +11,19 @@
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  */
-package io.github.muntashirakon.music.activities.saf
+package code.name.monkey.retromusic.activities.saf
 
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
-import io.github.muntashirakon.music.activities.saf.SAFGuideActivity.REQUEST_CODE_SAF_GUIDE
-import io.github.muntashirakon.music.util.SAFUtil
+import code.name.monkey.retromusic.activities.saf.SAFGuideActivity.REQUEST_CODE_SAF_GUIDE
+import code.name.monkey.retromusic.util.SAFUtil
 
 /** Created by buliasz on 2021-02-07.  */
 class SAFRequestActivity : Activity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        val intent = Intent(this, SAFGuideActivity::class.java)
+        val intent = Intent(this, code.name.monkey.retromusic.activities.saf.SAFGuideActivity::class.java)
         startActivityForResult(intent, REQUEST_CODE_SAF_GUIDE)
     }
 

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

@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.activities.tageditor
+package code.name.monkey.retromusic.activities.tageditor
 
 import android.app.Activity
 import android.app.SearchManager
@@ -29,25 +29,23 @@ import android.view.animation.OvershootInterpolator
 import android.widget.ImageView
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.IntentSenderRequest
+import androidx.activity.result.PickVisualMediaRequest
 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 io.github.muntashirakon.music.R
-import io.github.muntashirakon.music.R.drawable
-import io.github.muntashirakon.music.activities.base.AbsBaseActivity
-import io.github.muntashirakon.music.activities.saf.SAFGuideActivity
-import io.github.muntashirakon.music.extensions.accentColor
-import io.github.muntashirakon.music.extensions.colorButtons
-import io.github.muntashirakon.music.extensions.hideSoftKeyboard
-import io.github.muntashirakon.music.extensions.setTaskDescriptionColorAuto
-import io.github.muntashirakon.music.model.ArtworkInfo
-import io.github.muntashirakon.music.model.AudioTagInfo
-import io.github.muntashirakon.music.repository.Repository
-import io.github.muntashirakon.music.util.SAFUtil
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.activities.base.AbsBaseActivity
+import code.name.monkey.retromusic.extensions.accentColor
+import code.name.monkey.retromusic.extensions.colorButtons
+import code.name.monkey.retromusic.extensions.hideSoftKeyboard
+import code.name.monkey.retromusic.extensions.setTaskDescriptionColorAuto
+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.logD
+import code.name.monkey.retromusic.util.logE
 import com.google.android.material.button.MaterialButton
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import kotlinx.coroutines.GlobalScope
@@ -57,7 +55,6 @@ import org.jaudiotagger.audio.AudioFileIO
 import org.jaudiotagger.tag.FieldKey
 import org.koin.android.ext.android.inject
 import java.io.File
-import java.util.*
 
 abstract class AbsTagEditorActivity<VB : ViewBinding> : AbsBaseActivity() {
     abstract val editorImage: ImageView
@@ -101,7 +98,8 @@ abstract class AbsTagEditorActivity<VB : ViewBinding> : AbsBaseActivity() {
         get() {
             return try {
                 getAudioFile(songPaths!![0]).tagOrCreateAndSetDefault.getFirst(FieldKey.ALBUM_ARTIST)
-            } catch (ignored: Exception) {
+            } catch (e: Exception) {
+                logE(e)
                 null
             }
         }
@@ -110,7 +108,8 @@ abstract class AbsTagEditorActivity<VB : ViewBinding> : AbsBaseActivity() {
         get() {
             return try {
                 getAudioFile(songPaths!![0]).tagOrCreateAndSetDefault.getFirst(FieldKey.TITLE)
-            } catch (ignored: Exception) {
+            } catch (e: Exception) {
+                logE(e)
                 null
             }
         }
@@ -118,7 +117,8 @@ abstract class AbsTagEditorActivity<VB : ViewBinding> : AbsBaseActivity() {
         get() {
             return try {
                 getAudioFile(songPaths!![0]).tagOrCreateAndSetDefault.getFirst(FieldKey.COMPOSER)
-            } catch (ignored: Exception) {
+            } catch (e: Exception) {
+                logE(e)
                 null
             }
         }
@@ -127,7 +127,8 @@ abstract class AbsTagEditorActivity<VB : ViewBinding> : AbsBaseActivity() {
         get() {
             return try {
                 getAudioFile(songPaths!![0]).tagOrCreateAndSetDefault.getFirst(FieldKey.ALBUM)
-            } catch (ignored: Exception) {
+            } catch (e: Exception) {
+                logE(e)
                 null
             }
         }
@@ -136,7 +137,8 @@ abstract class AbsTagEditorActivity<VB : ViewBinding> : AbsBaseActivity() {
         get() {
             return try {
                 getAudioFile(songPaths!![0]).tagOrCreateAndSetDefault.getFirst(FieldKey.ARTIST)
-            } catch (ignored: Exception) {
+            } catch (e: Exception) {
+                logE(e)
                 null
             }
         }
@@ -145,7 +147,8 @@ abstract class AbsTagEditorActivity<VB : ViewBinding> : AbsBaseActivity() {
         get() {
             return try {
                 getAudioFile(songPaths!![0]).tagOrCreateAndSetDefault.getFirst(FieldKey.ALBUM_ARTIST)
-            } catch (ignored: Exception) {
+            } catch (e: Exception) {
+                logE(e)
                 null
             }
         }
@@ -154,7 +157,8 @@ abstract class AbsTagEditorActivity<VB : ViewBinding> : AbsBaseActivity() {
         get() {
             return try {
                 getAudioFile(songPaths!![0]).tagOrCreateAndSetDefault.getFirst(FieldKey.GENRE)
-            } catch (ignored: Exception) {
+            } catch (e: Exception) {
+                logE(e)
                 null
             }
         }
@@ -163,7 +167,8 @@ abstract class AbsTagEditorActivity<VB : ViewBinding> : AbsBaseActivity() {
         get() {
             return try {
                 getAudioFile(songPaths!![0]).tagOrCreateAndSetDefault.getFirst(FieldKey.YEAR)
-            } catch (ignored: Exception) {
+            } catch (e: Exception) {
+                logE(e)
                 null
             }
         }
@@ -172,7 +177,8 @@ abstract class AbsTagEditorActivity<VB : ViewBinding> : AbsBaseActivity() {
         get() {
             return try {
                 getAudioFile(songPaths!![0]).tagOrCreateAndSetDefault.getFirst(FieldKey.TRACK)
-            } catch (ignored: Exception) {
+            } catch (e: Exception) {
+                logE(e)
                 null
             }
         }
@@ -181,7 +187,8 @@ abstract class AbsTagEditorActivity<VB : ViewBinding> : AbsBaseActivity() {
         get() {
             return try {
                 getAudioFile(songPaths!![0]).tagOrCreateAndSetDefault.getFirst(FieldKey.DISC_NO)
-            } catch (ignored: Exception) {
+            } catch (e: Exception) {
+                logE(e)
                 null
             }
         }
@@ -190,7 +197,8 @@ abstract class AbsTagEditorActivity<VB : ViewBinding> : AbsBaseActivity() {
         get() {
             return try {
                 getAudioFile(songPaths!![0]).tagOrCreateAndSetDefault.getFirst(FieldKey.LYRICS)
-            } catch (ignored: Exception) {
+            } catch (e: Exception) {
+                logE(e)
                 null
             }
         }
@@ -208,11 +216,17 @@ abstract class AbsTagEditorActivity<VB : ViewBinding> : AbsBaseActivity() {
                     )
                 }
                 return null
-            } catch (ignored: Exception) {
+            } catch (e: Exception) {
+                logE(e)
                 return null
             }
         }
 
+    private val pickArtworkImage =
+        registerForActivityResult(ActivityResultContracts.PickVisualMedia()) { uri ->
+            loadImageFromFile(uri)
+        }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         _binding = bindingInflater.invoke(layoutInflater)
@@ -223,7 +237,7 @@ abstract class AbsTagEditorActivity<VB : ViewBinding> : AbsBaseActivity() {
         getIntentExtras()
 
         songPaths = getSongPaths()
-        println(songPaths?.size)
+        logD(songPaths?.size)
         if (songPaths!!.isEmpty()) {
             finish()
         }
@@ -253,14 +267,7 @@ abstract class AbsTagEditorActivity<VB : ViewBinding> : AbsBaseActivity() {
     }
 
     private fun startImagePicker() {
-        val intent = Intent(Intent.ACTION_GET_CONTENT)
-        intent.type = "image/*"
-        startActivityForResult(
-            Intent.createChooser(
-                intent,
-                getString(R.string.pick_from_local_storage)
-            ), REQUEST_CODE_SELECT_IMAGE
-        )
+        pickArtworkImage.launch(PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.ImageOnly))
     }
 
     protected abstract fun loadCurrentImage()
@@ -276,7 +283,6 @@ abstract class AbsTagEditorActivity<VB : ViewBinding> : AbsBaseActivity() {
             scaleY = 0f
             isEnabled = false
             setOnClickListener { save() }
-            TintHelper.setTintAuto(this, ThemeStore.accentColor(this@AbsTagEditorActivity), true)
         }
     }
 
@@ -309,7 +315,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
             }
         }
@@ -334,7 +340,7 @@ abstract class AbsTagEditorActivity<VB : ViewBinding> : AbsBaseActivity() {
 
     protected fun setImageBitmap(bitmap: Bitmap?, bgColor: Int) {
         if (bitmap == null) {
-            editorImage.setImageResource(drawable.default_audio_art)
+            editorImage.setImageResource(R.drawable.default_audio_art)
         } else {
             editorImage.setImageBitmap(bitmap)
         }
@@ -352,7 +358,7 @@ abstract class AbsTagEditorActivity<VB : ViewBinding> : AbsBaseActivity() {
         hideSoftKeyboard()
 
         hideFab()
-        println(fieldKeyValueMap)
+        logD(fieldKeyValueMap)
         GlobalScope.launch {
             if (VersionUtils.hasR()) {
                 cacheFiles = TagWriter.writeTagsToFilesR(
@@ -362,9 +368,12 @@ abstract class AbsTagEditorActivity<VB : ViewBinding> : AbsBaseActivity() {
                         artworkInfo
                     )
                 )
-                val pendingIntent = MediaStore.createWriteRequest(contentResolver, getSongUris())
 
-                launcher.launch(IntentSenderRequest.Builder(pendingIntent).build())
+                if (cacheFiles.isNotEmpty()) {
+                    val pendingIntent =
+                        MediaStore.createWriteRequest(contentResolver, getSongUris())
+                    launcher.launch(IntentSenderRequest.Builder(pendingIntent).build())
+                }
             } else {
                 TagWriter.writeTagsToFiles(
                     this@AbsTagEditorActivity, AudioTagInfo(
@@ -402,36 +411,14 @@ abstract class AbsTagEditorActivity<VB : ViewBinding> : AbsBaseActivity() {
         }
     }
 
-
-    override fun onActivityResult(requestCode: Int, resultCode: Int, intent: Intent?) {
-        super.onActivityResult(requestCode, resultCode, intent)
-        when (requestCode) {
-            REQUEST_CODE_SELECT_IMAGE -> if (resultCode == Activity.RESULT_OK) {
-                intent?.data?.let {
-                    loadImageFromFile(it)
-                }
-            }
-            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))
-                }
-            }
-        }
-    }
-
+    private lateinit var audioFile: AudioFile
 
     private fun getAudioFile(path: String): AudioFile {
         return try {
-            AudioFileIO.read(File(path))
+            if (!this::audioFile.isInitialized) {
+                audioFile = AudioFileIO.read(File(path))
+            }
+            audioFile
         } catch (e: Exception) {
             Log.e(TAG, "Could not read audio file $path", e)
             AudioFile()

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

@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.activities.tageditor
+package code.name.monkey.retromusic.activities.tageditor
 
 import android.app.Activity
 import android.content.res.ColorStateList
@@ -28,17 +28,19 @@ import android.widget.ImageView
 import android.widget.Toast
 import androidx.core.widget.doAfterTextChanged
 import code.name.monkey.appthemehelper.util.MaterialValueHelper
-import io.github.muntashirakon.music.R
-import io.github.muntashirakon.music.databinding.ActivityAlbumTagEditorBinding
-import io.github.muntashirakon.music.extensions.*
-import io.github.muntashirakon.music.glide.GlideApp
-import io.github.muntashirakon.music.glide.palette.BitmapPaletteWrapper
-import io.github.muntashirakon.music.model.ArtworkInfo
-import io.github.muntashirakon.music.model.Song
-import io.github.muntashirakon.music.util.ImageUtil
-import io.github.muntashirakon.music.util.MusicUtil
-import io.github.muntashirakon.music.util.RetroColorUtil.generatePalette
-import io.github.muntashirakon.music.util.RetroColorUtil.getColor
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.databinding.ActivityAlbumTagEditorBinding
+import code.name.monkey.retromusic.extensions.*
+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
+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
@@ -98,7 +100,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 +133,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

@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.activities.tageditor
+package code.name.monkey.retromusic.activities.tageditor
 
 import android.annotation.SuppressLint
 import android.app.Activity
@@ -28,16 +28,18 @@ import android.widget.ImageView
 import android.widget.Toast
 import androidx.core.widget.doAfterTextChanged
 import code.name.monkey.appthemehelper.util.MaterialValueHelper
-import io.github.muntashirakon.music.R
-import io.github.muntashirakon.music.databinding.ActivitySongTagEditorBinding
-import io.github.muntashirakon.music.extensions.*
-import io.github.muntashirakon.music.glide.GlideApp
-import io.github.muntashirakon.music.glide.palette.BitmapPaletteWrapper
-import io.github.muntashirakon.music.model.ArtworkInfo
-import io.github.muntashirakon.music.repository.SongRepository
-import io.github.muntashirakon.music.util.ImageUtil
-import io.github.muntashirakon.music.util.MusicUtil
-import io.github.muntashirakon.music.util.RetroColorUtil
+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.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)
-            .diskCacheStrategy(DiskCacheStrategy.NONE).skipMemoryCache(true)
+        Glide.with(this@SongTagEditorActivity)
+            .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/activities/tageditor/TagWriter.kt

@@ -0,0 +1,204 @@
+package code.name.monkey.retromusic.activities.tageditor
+
+import android.app.Activity
+import android.content.Context
+import android.graphics.Bitmap
+import android.media.MediaScannerConnection
+import android.os.Build
+import android.util.Log
+import androidx.annotation.RequiresApi
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.extensions.showToast
+import code.name.monkey.retromusic.misc.UpdateToastMediaScannerCompletionListener
+import code.name.monkey.retromusic.model.AudioTagInfo
+import code.name.monkey.retromusic.util.MusicUtil.createAlbumArtFile
+import code.name.monkey.retromusic.util.MusicUtil.deleteAlbumArt
+import code.name.monkey.retromusic.util.MusicUtil.insertAlbumArt
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import org.jaudiotagger.audio.AudioFileIO
+import org.jaudiotagger.audio.exceptions.CannotReadException
+import org.jaudiotagger.audio.exceptions.CannotWriteException
+import org.jaudiotagger.audio.exceptions.InvalidAudioFrameException
+import org.jaudiotagger.audio.exceptions.ReadOnlyFileException
+import org.jaudiotagger.tag.FieldDataInvalidException
+import org.jaudiotagger.tag.TagException
+import org.jaudiotagger.tag.images.AndroidArtwork
+import org.jaudiotagger.tag.images.Artwork
+import java.io.File
+import java.io.IOException
+
+class TagWriter {
+
+    companion object {
+
+        suspend fun scan(context: Context, toBeScanned: List<String?>?) {
+            if (toBeScanned.isNullOrEmpty()) {
+                Log.i("scan", "scan: Empty")
+                context.showToast("Scan file from folder")
+                return
+            }
+            MediaScannerConnection.scanFile(
+                context,
+                toBeScanned.toTypedArray(),
+                null,
+                withContext(Dispatchers.Main) {
+                    if (context is Activity) UpdateToastMediaScannerCompletionListener(
+                        context, toBeScanned
+                    ) else null
+                }
+            )
+        }
+
+        suspend fun writeTagsToFiles(context: Context, info: AudioTagInfo) {
+            withContext(Dispatchers.IO) {
+                var artwork: Artwork? = null
+                var albumArtFile: File? = null
+                if (info.artworkInfo?.artwork != null) {
+                    try {
+                        albumArtFile = createAlbumArtFile(context).canonicalFile
+                        info.artworkInfo.artwork.compress(
+                            Bitmap.CompressFormat.JPEG,
+                            100,
+                            albumArtFile.outputStream()
+                        )
+                        artwork = AndroidArtwork.createArtworkFromFile(albumArtFile)
+                    } catch (e: IOException) {
+                        e.printStackTrace()
+                    }
+                }
+                var wroteArtwork = false
+                var deletedArtwork = false
+                for (filePath in info.filePaths!!) {
+                    try {
+                        val audioFile = AudioFileIO.read(File(filePath))
+                        val tag = audioFile.tagOrCreateAndSetDefault
+                        if (info.fieldKeyValueMap != null) {
+                            for ((key, value) in info.fieldKeyValueMap) {
+                                try {
+                                    tag.setField(key, value)
+                                } catch (e: FieldDataInvalidException) {
+                                    withContext(Dispatchers.Main) {
+                                        context.showToast(R.string.could_not_write_tags_to_file)
+                                    }
+                                    return@withContext listOf<File>()
+                                } catch (e: Exception) {
+                                    e.printStackTrace()
+                                }
+                            }
+                        }
+                        if (info.artworkInfo != null) {
+                            if (info.artworkInfo.artwork == null) {
+                                tag.deleteArtworkField()
+                                deletedArtwork = true
+                            } else if (artwork != null) {
+                                tag.deleteArtworkField()
+                                tag.setField(artwork)
+                                wroteArtwork = true
+                            }
+                        }
+                        audioFile.commit()
+                    } catch (e: CannotReadException) {
+                        e.printStackTrace()
+                    } catch (e: IOException) {
+                        e.printStackTrace()
+                    } catch (e: CannotWriteException) {
+                        e.printStackTrace()
+                    } catch (e: TagException) {
+                        e.printStackTrace()
+                    } catch (e: ReadOnlyFileException) {
+                        e.printStackTrace()
+                    } catch (e: InvalidAudioFrameException) {
+                        e.printStackTrace()
+                    }
+                }
+                if (wroteArtwork) {
+                    insertAlbumArt(context, info.artworkInfo!!.albumId, albumArtFile!!.path)
+                } else if (deletedArtwork) {
+                    deleteAlbumArt(context, info.artworkInfo!!.albumId)
+                }
+                scan(context, info.filePaths)
+            }
+        }
+
+        @RequiresApi(Build.VERSION_CODES.R)
+        suspend fun writeTagsToFilesR(context: Context, info: AudioTagInfo): List<File> =
+            withContext(Dispatchers.IO) {
+                val cacheFiles = mutableListOf<File>()
+                var artwork: Artwork? = null
+                var albumArtFile: File? = null
+                if (info.artworkInfo?.artwork != null) {
+                    try {
+                        albumArtFile = createAlbumArtFile(context).canonicalFile
+                        info.artworkInfo.artwork.compress(
+                            Bitmap.CompressFormat.JPEG,
+                            100,
+                            albumArtFile.outputStream()
+                        )
+                        artwork = AndroidArtwork.createArtworkFromFile(albumArtFile)
+                    } catch (e: IOException) {
+                        e.printStackTrace()
+                    }
+                }
+                var wroteArtwork = false
+                var deletedArtwork = false
+                for (filePath in info.filePaths!!) {
+                    try {
+                        val originFile = File(filePath)
+                        val cacheFile = File(context.cacheDir, originFile.name)
+                        cacheFiles.add(cacheFile)
+                        originFile.inputStream().use { input ->
+                            cacheFile.outputStream().use { output ->
+                                input.copyTo(output)
+                            }
+                        }
+                        val audioFile = AudioFileIO.read(cacheFile)
+                        val tag = audioFile.tagOrCreateAndSetDefault
+                        if (info.fieldKeyValueMap != null) {
+                            for ((key, value) in info.fieldKeyValueMap) {
+                                try {
+                                    tag.setField(key, value)
+                                } catch (e: FieldDataInvalidException) {
+                                    withContext(Dispatchers.Main) {
+                                        context.showToast(R.string.could_not_write_tags_to_file)
+                                    }
+                                    return@withContext listOf<File>()
+                                } catch (e: Exception) {
+                                    e.printStackTrace()
+                                }
+                            }
+                        }
+                        if (info.artworkInfo != null) {
+                            if (info.artworkInfo.artwork == null) {
+                                tag.deleteArtworkField()
+                                deletedArtwork = true
+                            } else if (artwork != null) {
+                                tag.deleteArtworkField()
+                                tag.setField(artwork)
+                                wroteArtwork = true
+                            }
+                        }
+                        audioFile.commit()
+                    } catch (e: CannotReadException) {
+                        e.printStackTrace()
+                    } catch (e: IOException) {
+                        e.printStackTrace()
+                    } catch (e: CannotWriteException) {
+                        e.printStackTrace()
+                    } catch (e: TagException) {
+                        e.printStackTrace()
+                    } catch (e: ReadOnlyFileException) {
+                        e.printStackTrace()
+                    } catch (e: InvalidAudioFrameException) {
+                        e.printStackTrace()
+                    }
+                }
+                if (wroteArtwork) {
+                    insertAlbumArt(context, info.artworkInfo!!.albumId, albumArtFile!!.path)
+                } else if (deletedArtwork) {
+                    deleteAlbumArt(context, info.artworkInfo!!.albumId)
+                }
+                cacheFiles
+            }
+    }
+}

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

@@ -11,7 +11,7 @@
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  */
-package io.github.muntashirakon.music.adapter
+package code.name.monkey.retromusic.adapter
 
 import android.annotation.SuppressLint
 import android.content.res.ColorStateList
@@ -22,15 +22,15 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.RecyclerView
 import code.name.monkey.appthemehelper.ThemeStore.Companion.accentColor
-import io.github.muntashirakon.music.R
-import io.github.muntashirakon.music.databinding.PreferenceDialogLibraryCategoriesListitemBinding
-import io.github.muntashirakon.music.extensions.showToast
-import io.github.muntashirakon.music.model.CategoryInfo
-import io.github.muntashirakon.music.util.PreferenceUtil
-import io.github.muntashirakon.music.util.SwipeAndDragHelper
-import io.github.muntashirakon.music.util.SwipeAndDragHelper.ActionCompletionContract
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.databinding.PreferenceDialogLibraryCategoriesListitemBinding
+import code.name.monkey.retromusic.extensions.showToast
+import code.name.monkey.retromusic.model.CategoryInfo
+import code.name.monkey.retromusic.util.PreferenceUtil
+import code.name.monkey.retromusic.util.SwipeAndDragHelper
+import code.name.monkey.retromusic.util.SwipeAndDragHelper.ActionCompletionContract
 
-class CategoryInfoAdapter : RecyclerView.Adapter<CategoryInfoAdapter.ViewHolder>(),
+class CategoryInfoAdapter : RecyclerView.Adapter<code.name.monkey.retromusic.adapter.CategoryInfoAdapter.ViewHolder>(),
     ActionCompletionContract {
     var categoryInfos: MutableList<CategoryInfo> =
         PreferenceUtil.libraryCategory.toMutableList()

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

@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.adapter
+package code.name.monkey.retromusic.adapter
 
 import android.annotation.SuppressLint
 import android.view.LayoutInflater
@@ -21,15 +21,17 @@ import android.view.ViewGroup
 import android.view.ViewOutlineProvider
 import androidx.fragment.app.FragmentActivity
 import androidx.recyclerview.widget.RecyclerView
-import io.github.muntashirakon.music.R
-import io.github.muntashirakon.music.databinding.ItemGenreBinding
-import io.github.muntashirakon.music.glide.GlideApp
-import io.github.muntashirakon.music.glide.RetroGlideExtension
-import io.github.muntashirakon.music.glide.RetroMusicColoredTarget
-import io.github.muntashirakon.music.interfaces.IGenreClickListener
-import io.github.muntashirakon.music.model.Genre
-import io.github.muntashirakon.music.util.MusicUtil
-import io.github.muntashirakon.music.util.color.MediaNotificationProcessor
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.databinding.ItemGenreBinding
+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

@@ -12,13 +12,12 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.adapter
+package code.name.monkey.retromusic.adapter
 
 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
@@ -28,21 +27,21 @@ import androidx.navigation.fragment.FragmentNavigatorExtras
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import io.github.muntashirakon.music.*
-import io.github.muntashirakon.music.adapter.album.AlbumAdapter
-import io.github.muntashirakon.music.adapter.artist.ArtistAdapter
-import io.github.muntashirakon.music.adapter.song.SongAdapter
-import io.github.muntashirakon.music.fragments.home.HomeFragment
-import io.github.muntashirakon.music.interfaces.IAlbumClickListener
-import io.github.muntashirakon.music.interfaces.IArtistClickListener
-import io.github.muntashirakon.music.interfaces.IGenreClickListener
-import io.github.muntashirakon.music.model.*
-import io.github.muntashirakon.music.util.PreferenceUtil
+import code.name.monkey.retromusic.*
+import code.name.monkey.retromusic.adapter.album.AlbumAdapter
+import code.name.monkey.retromusic.adapter.artist.ArtistAdapter
+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.model.Album
+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(
-    private val activity: AppCompatActivity
-) : RecyclerView.Adapter<RecyclerView.ViewHolder>(), IArtistClickListener, IAlbumClickListener,
-    IGenreClickListener {
+class HomeAdapter(private val activity: AppCompatActivity) :
+    RecyclerView.Adapter<RecyclerView.ViewHolder>(), IArtistClickListener, IAlbumClickListener {
 
     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

@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.adapter
+package code.name.monkey.retromusic.adapter
 
 import android.annotation.SuppressLint
 import android.view.LayoutInflater
@@ -26,18 +26,21 @@ import androidx.fragment.app.FragmentActivity
 import androidx.navigation.findNavController
 import androidx.recyclerview.widget.RecyclerView
 import code.name.monkey.appthemehelper.ThemeStore
-import io.github.muntashirakon.music.*
-import io.github.muntashirakon.music.adapter.base.MediaEntryViewHolder
-import io.github.muntashirakon.music.db.PlaylistWithSongs
-import io.github.muntashirakon.music.glide.GlideApp
-import io.github.muntashirakon.music.glide.RetroGlideExtension
-import io.github.muntashirakon.music.helper.MusicPlayerRemote
-import io.github.muntashirakon.music.helper.menu.SongMenuHelper
-import io.github.muntashirakon.music.model.Album
-import io.github.muntashirakon.music.model.Artist
-import io.github.muntashirakon.music.model.Genre
-import io.github.muntashirakon.music.model.Song
-import io.github.muntashirakon.music.util.MusicUtil
+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.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
+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(
@@ -60,26 +63,28 @@ class SearchAdapter(
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        return if (viewType == HEADER) ViewHolder(
-            LayoutInflater.from(activity).inflate(
-                R.layout.sub_header,
-                parent,
-                false
-            ), viewType
-        )
-        else if (viewType == ALBUM || viewType == ARTIST || viewType== ALBUM_ARTIST)
-            ViewHolder(
+        return when (viewType) {
+            HEADER -> ViewHolder(
+                LayoutInflater.from(activity).inflate(
+                    R.layout.sub_header,
+                    parent,
+                    false
+                ), viewType
+            )
+
+            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) {
@@ -89,24 +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(RetroGlideExtension.getSongModel(album.safeGetFirstSong()))
+                Glide.with(activity).asDrawable().albumCoverOptions(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(
-                    RetroGlideExtension.getArtistModel(artist)).into(holder.image!!)
+                Glide.with(activity).asDrawable().artistImageOptions(artist).load(
+                    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(
-                    RetroGlideExtension.getArtistModel(artist)).into(holder.image!!)
+                Glide.with(activity).asDrawable().artistImageOptions(artist).load(
+                    RetroGlideExtension.getArtistModel(artist)
+                ).into(holder.image!!)
             }
+
             else -> {
                 holder.title?.text = dataSet[position].toString()
                 holder.title?.setTextColor(ThemeStore.accentColor(activity))
@@ -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

@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.adapter
+package code.name.monkey.retromusic.adapter
 
 import android.graphics.PorterDuff
 import android.view.LayoutInflater
@@ -22,16 +22,14 @@ import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.isVisible
 import code.name.monkey.appthemehelper.util.ATHUtil
-import io.github.muntashirakon.music.R
-import io.github.muntashirakon.music.adapter.base.AbsMultiSelectAdapter
-import io.github.muntashirakon.music.adapter.base.MediaEntryViewHolder
-import io.github.muntashirakon.music.extensions.getTintedDrawable
-import io.github.muntashirakon.music.glide.GlideApp
-import io.github.muntashirakon.music.glide.RetroGlideExtension
-import io.github.muntashirakon.music.glide.audiocover.AudioFileCover
-import io.github.muntashirakon.music.interfaces.ICabHolder
-import io.github.muntashirakon.music.interfaces.ICallbacks
-import io.github.muntashirakon.music.util.MusicUtil
+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.RetroGlideExtension
+import code.name.monkey.retromusic.glide.audiocover.AudioFileCover
+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
@@ -44,10 +42,9 @@ class SongFileAdapter(
     override val activity: AppCompatActivity,
     private var dataSet: List<File>,
     private val itemLayoutRes: Int,
-    private val iCallbacks: ICallbacks?,
-    iCabHolder: ICabHolder?,
+    private val iCallbacks: ICallbacks?
 ) : AbsMultiSelectAdapter<SongFileAdapter.ViewHolder, File>(
-    activity, iCabHolder, R.menu.menu_media_selection
+    activity, R.menu.menu_media_selection
 ), PopupTextProvider {
 
     init {
@@ -97,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)
@@ -106,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)
-            GlideApp.with(activity)
+            val error = activity.getTintedDrawable(R.drawable.ic_audio_file, iconColor)
+            Glide.with(activity)
                 .load(AudioFileCover(file.path))
                 .diskCacheStrategy(DiskCacheStrategy.NONE)
                 .error(error)
@@ -147,7 +144,7 @@ class SongFileAdapter(
         return MusicUtil.getSectionName(dataSet[position].name)
     }
 
-    inner class ViewHolder(itemView: View) : MediaEntryViewHolder(itemView) {
+    inner class ViewHolder(itemView: View) : code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder(itemView) {
 
         init {
             if (menu != null && iCallbacks != null) {

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

@@ -1,11 +1,11 @@
-package io.github.muntashirakon.music.adapter
+package code.name.monkey.retromusic.adapter
 
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
-import io.github.muntashirakon.music.R
+import code.name.monkey.retromusic.R
 import java.io.File
 
 class StorageAdapter(

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

@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.adapter.album
+package code.name.monkey.retromusic.adapter.album
 
 import android.content.res.ColorStateList
 import android.view.LayoutInflater
@@ -21,32 +21,31 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.isVisible
 import androidx.fragment.app.FragmentActivity
-import io.github.muntashirakon.music.R
-import io.github.muntashirakon.music.adapter.base.AbsMultiSelectAdapter
-import io.github.muntashirakon.music.adapter.base.MediaEntryViewHolder
-import io.github.muntashirakon.music.glide.GlideApp
-import io.github.muntashirakon.music.glide.RetroGlideExtension
-import io.github.muntashirakon.music.glide.RetroMusicColoredTarget
-import io.github.muntashirakon.music.helper.SortOrder
-import io.github.muntashirakon.music.helper.menu.SongsMenuHelper
-import io.github.muntashirakon.music.interfaces.IAlbumClickListener
-import io.github.muntashirakon.music.interfaces.ICabHolder
-import io.github.muntashirakon.music.model.Album
-import io.github.muntashirakon.music.model.Song
-import io.github.muntashirakon.music.util.MusicUtil
-import io.github.muntashirakon.music.util.PreferenceUtil
-import io.github.muntashirakon.music.util.color.MediaNotificationProcessor
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.adapter.base.AbsMultiSelectAdapter
+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.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 {
 
@@ -113,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!!) {
@@ -163,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

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

@@ -12,30 +12,33 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.adapter.album
+package code.name.monkey.retromusic.adapter.album
 
 import android.os.Bundle
 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
 import androidx.lifecycle.lifecycleScope
-import io.github.muntashirakon.music.R
-import io.github.muntashirakon.music.activities.MainActivity
-import io.github.muntashirakon.music.fragments.AlbumCoverStyle
-import io.github.muntashirakon.music.fragments.NowPlayingScreen.*
-import io.github.muntashirakon.music.fragments.base.goToLyrics
-import io.github.muntashirakon.music.glide.GlideApp
-import io.github.muntashirakon.music.glide.RetroGlideExtension
-import io.github.muntashirakon.music.glide.RetroMusicColoredTarget
-import io.github.muntashirakon.music.misc.CustomFragmentStatePagerAdapter
-import io.github.muntashirakon.music.model.Song
-import io.github.muntashirakon.music.util.MusicUtil
-import io.github.muntashirakon.music.util.PreferenceUtil
-import io.github.muntashirakon.music.util.color.MediaNotificationProcessor
+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.base.goToLyrics
+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 +98,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 +122,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 +167,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

@@ -12,28 +12,28 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.adapter.album
+package code.name.monkey.retromusic.adapter.album
 
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.FragmentActivity
-import io.github.muntashirakon.music.glide.GlideApp
-import io.github.muntashirakon.music.glide.RetroGlideExtension
-import io.github.muntashirakon.music.glide.RetroMusicColoredTarget
-import io.github.muntashirakon.music.helper.HorizontalAdapterHelper
-import io.github.muntashirakon.music.interfaces.IAlbumClickListener
-import io.github.muntashirakon.music.interfaces.ICabHolder
-import io.github.muntashirakon.music.model.Album
-import io.github.muntashirakon.music.util.MusicUtil
-import io.github.muntashirakon.music.util.color.MediaNotificationProcessor
+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.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

@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.adapter.artist
+package code.name.monkey.retromusic.adapter.artist
 
 import android.annotation.SuppressLint
 import android.content.res.ColorStateList
@@ -23,34 +23,32 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.isVisible
 import androidx.fragment.app.FragmentActivity
-import io.github.muntashirakon.music.R
-import io.github.muntashirakon.music.adapter.base.AbsMultiSelectAdapter
-import io.github.muntashirakon.music.adapter.base.MediaEntryViewHolder
-import io.github.muntashirakon.music.extensions.hide
-import io.github.muntashirakon.music.glide.GlideApp
-import io.github.muntashirakon.music.glide.RetroGlideExtension
-import io.github.muntashirakon.music.glide.RetroMusicColoredTarget
-import io.github.muntashirakon.music.helper.menu.SongsMenuHelper
-import io.github.muntashirakon.music.interfaces.IAlbumArtistClickListener
-import io.github.muntashirakon.music.interfaces.IArtistClickListener
-import io.github.muntashirakon.music.interfaces.ICabHolder
-import io.github.muntashirakon.music.model.Artist
-import io.github.muntashirakon.music.model.Song
-import io.github.muntashirakon.music.util.MusicUtil
-import io.github.muntashirakon.music.util.PreferenceUtil
-import io.github.muntashirakon.music.util.color.MediaNotificationProcessor
+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.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.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>(
-    activity, ICabHolder, R.menu.menu_media_selection
-), PopupTextProvider {
+) : AbsMultiSelectAdapter<ArtistAdapter.ViewHolder, Artist>(activity, R.menu.menu_media_selection),
+    PopupTextProvider {
 
     var albumArtistsOnly = false
 
@@ -112,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) {
@@ -159,7 +157,7 @@ class ArtistAdapter(
         return MusicUtil.getSectionName(dataSet[position].name)
     }
 
-    inner class ViewHolder(itemView: View) : MediaEntryViewHolder(itemView) {
+    inner class ViewHolder(itemView: View) : code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder(itemView) {
 
         init {
             menu?.isVisible = false

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

@@ -1,4 +1,4 @@
-package io.github.muntashirakon.music.adapter.backup
+package code.name.monkey.retromusic.adapter.backup
 
 import android.annotation.SuppressLint
 import android.view.LayoutInflater
@@ -7,8 +7,8 @@ import android.view.ViewGroup
 import androidx.appcompat.widget.PopupMenu
 import androidx.fragment.app.FragmentActivity
 import androidx.recyclerview.widget.RecyclerView
-import io.github.muntashirakon.music.R
-import io.github.muntashirakon.music.databinding.ItemListBackupBinding
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.databinding.ItemListBackupBinding
 import java.io.File
 
 

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

@@ -0,0 +1,131 @@
+package code.name.monkey.retromusic.adapter.base
+
+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.databinding.NumberRollViewBinding
+import code.name.monkey.retromusic.views.NumberRollView
+
+abstract class AbsMultiSelectAdapter<V : RecyclerView.ViewHolder?, I>(
+    open val activity: FragmentActivity, @MenuRes menuRes: Int,
+) : RecyclerView.Adapter<V>(), ActionMode.Callback {
+    var actionMode: ActionMode? = null
+    private val checked: MutableList<I>
+    private var menuRes: Int
+
+    override fun onCreateActionMode(mode: ActionMode?, menu: Menu?): Boolean {
+        val inflater = mode?.menuInflater
+        inflater?.inflate(menuRes, menu)
+        return true
+    }
+
+    override fun onPrepareActionMode(mode: ActionMode?, menu: Menu?): Boolean {
+        return false
+    }
+
+    override fun onActionItemClicked(mode: ActionMode?, item: MenuItem?): Boolean {
+        if (item?.itemId == R.id.action_multi_select_adapter_check_all) {
+            checkAll()
+        } else {
+            onMultipleItemAction(item!!, ArrayList(checked))
+            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 (actionMode != null) {
+            checked.clear()
+            for (i in 0 until itemCount) {
+                val identifier = getIdentifier(i)
+                if (identifier != null) {
+                    checked.add(identifier)
+                }
+            }
+            notifyDataSetChanged()
+            updateCab()
+        }
+    }
+
+    protected abstract fun getIdentifier(position: Int): I?
+
+    protected abstract fun getName(model: I): String?
+
+    protected fun isChecked(identifier: I): Boolean {
+        return checked.contains(identifier)
+    }
+
+    protected val isInQuickSelectMode: Boolean
+        get() = actionMode != null
+
+    protected abstract fun onMultipleItemAction(menuItem: MenuItem, selection: List<I>)
+    protected fun setMultiSelectMenuRes(@MenuRes menuRes: Int) {
+        this.menuRes = menuRes
+    }
+
+    protected fun toggleChecked(position: Int): Boolean {
+        val identifier = getIdentifier(position) ?: return false
+        if (!checked.remove(identifier)) {
+            checked.add(identifier)
+        }
+        notifyItemChanged(position)
+        updateCab()
+        return true
+    }
+
+    private fun clearChecked() {
+        checked.clear()
+        notifyDataSetChanged()
+    }
+
+    private fun updateCab() {
+        if (actionMode == null) {
+            actionMode = activity.startActionMode(this)?.apply {
+                customView = NumberRollViewBinding.inflate(activity.layoutInflater).root
+            }
+            activity.onBackPressedDispatcher.addCallback(onBackPressedCallback)
+        }
+        val size = checked.size
+        when {
+            size <= 0 -> {
+                actionMode?.finish()
+            }
+            else -> {
+                actionMode?.customView?.findViewById<NumberRollView>(R.id.selection_mode_number)
+                    ?.setNumber(size, true)
+            }
+        }
+    }
+
+    init {
+        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/base/MediaEntryViewHolder.java

@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  */
 
-package io.github.muntashirakon.music.adapter.base;
+package code.name.monkey.retromusic.adapter.base;
 
 import android.graphics.Color;
 import android.view.View;
@@ -27,7 +27,7 @@ import androidx.appcompat.widget.AppCompatImageView;
 import com.google.android.material.card.MaterialCardView;
 import com.h6ah4i.android.widget.advrecyclerview.utils.AbstractDraggableSwipeableItemViewHolder;
 
-import io.github.muntashirakon.music.R;
+import code.name.monkey.retromusic.R;
 
 public class MediaEntryViewHolder extends AbstractDraggableSwipeableItemViewHolder
         implements View.OnLongClickListener, View.OnClickListener {

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

@@ -12,16 +12,15 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.adapter.playlist
+package code.name.monkey.retromusic.adapter.playlist
 
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.FragmentActivity
 import androidx.recyclerview.widget.RecyclerView
-import io.github.muntashirakon.music.adapter.base.MediaEntryViewHolder
-import io.github.muntashirakon.music.model.Playlist
-import io.github.muntashirakon.music.util.MusicUtil
+import code.name.monkey.retromusic.model.Playlist
+import code.name.monkey.retromusic.util.MusicUtil
 
 class LegacyPlaylistAdapter(
     private val activity: FragmentActivity,
@@ -36,7 +35,7 @@ class LegacyPlaylistAdapter(
         notifyDataSetChanged()
     }
 
-    class ViewHolder(itemView: View) : MediaEntryViewHolder(itemView)
+    class ViewHolder(itemView: View) : code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder(itemView)
 
     override fun onCreateViewHolder(
         parent: ViewGroup,

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

@@ -12,9 +12,10 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.adapter.playlist
+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,34 +24,33 @@ import androidx.appcompat.widget.PopupMenu
 import androidx.core.view.isGone
 import androidx.core.view.setPadding
 import androidx.fragment.app.FragmentActivity
-import io.github.muntashirakon.music.R
-import io.github.muntashirakon.music.adapter.base.AbsMultiSelectAdapter
-import io.github.muntashirakon.music.adapter.base.MediaEntryViewHolder
-import io.github.muntashirakon.music.db.PlaylistEntity
-import io.github.muntashirakon.music.db.PlaylistWithSongs
-import io.github.muntashirakon.music.db.toSongs
-import io.github.muntashirakon.music.extensions.dipToPix
-import io.github.muntashirakon.music.glide.GlideApp
-import io.github.muntashirakon.music.glide.playlistPreview.PlaylistPreview
-import io.github.muntashirakon.music.helper.SortOrder.PlaylistSortOrder
-import io.github.muntashirakon.music.helper.menu.PlaylistMenuHelper
-import io.github.muntashirakon.music.helper.menu.SongsMenuHelper
-import io.github.muntashirakon.music.interfaces.ICabHolder
-import io.github.muntashirakon.music.interfaces.IPlaylistClickListener
-import io.github.muntashirakon.music.model.Song
-import io.github.muntashirakon.music.util.MusicUtil
-import io.github.muntashirakon.music.util.PreferenceUtil
+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.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.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 {
 
@@ -72,7 +72,7 @@ class PlaylistAdapter(
         return createViewHolder(view)
     }
 
-    fun createViewHolder(view: View): ViewHolder {
+    private fun createViewHolder(view: View): ViewHolder {
         return ViewHolder(view)
     }
 
@@ -101,17 +101,23 @@ class PlaylistAdapter(
         holder.title?.text = getPlaylistTitle(playlist.playlistEntity)
         holder.text?.text = getPlaylistText(playlist)
         holder.menu?.isGone = isChecked(playlist)
-        GlideApp.with(activity)
-            .load(
-                if (itemLayoutRes == R.layout.item_list) {
-                    holder.image?.setPadding(activity.dipToPix(8F).toInt())
-                    R.drawable.ic_playlist_play
-                } else PlaylistPreview(playlist)
-            )
-            .playlistOptions()
-            .into(holder.image!!)
+        if (itemLayoutRes == R.layout.item_list) {
+            holder.image?.setPadding(activity.dipToPix(8F).toInt())
+            holder.image?.setImageDrawable(getIconRes())
+        } else {
+            Glide.with(activity)
+                .load(PlaylistPreview(playlist))
+                .playlistOptions()
+                .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
     }
@@ -142,7 +148,7 @@ class PlaylistAdapter(
         return songs
     }
 
-    inner class ViewHolder(itemView: View) : MediaEntryViewHolder(itemView) {
+    inner class ViewHolder(itemView: View) : code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder(itemView) {
         init {
             menu?.setOnClickListener { view ->
                 val popupMenu = PopupMenu(activity, view)

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

@@ -12,24 +12,22 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.adapter.song
+package code.name.monkey.retromusic.adapter.song
 
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.annotation.LayoutRes
 import androidx.fragment.app.FragmentActivity
-import io.github.muntashirakon.music.R
-import io.github.muntashirakon.music.helper.MusicPlayerRemote
-import io.github.muntashirakon.music.interfaces.ICabHolder
-import io.github.muntashirakon.music.model.Song
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.helper.MusicPlayerRemote
+import code.name.monkey.retromusic.model.Song
 
 abstract class AbsOffsetSongAdapter(
     activity: FragmentActivity,
     dataSet: MutableList<Song>,
-    @LayoutRes itemLayoutRes: Int,
-    ICabHolder: ICabHolder?
-) : SongAdapter(activity, dataSet, itemLayoutRes, ICabHolder) {
+    @LayoutRes itemLayoutRes: Int
+) : SongAdapter(activity, dataSet, itemLayoutRes) {
 
     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

@@ -12,25 +12,21 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.adapter.song
+package code.name.monkey.retromusic.adapter.song
 
 import android.view.MenuItem
 import android.view.View
 import androidx.core.view.isVisible
 import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.lifecycleScope
-import io.github.muntashirakon.music.R
-import io.github.muntashirakon.music.db.PlaylistEntity
-import io.github.muntashirakon.music.db.toSongEntity
-import io.github.muntashirakon.music.db.toSongsEntity
-import io.github.muntashirakon.music.dialogs.RemoveSongFromPlaylistDialog
-import io.github.muntashirakon.music.extensions.accentColor
-import io.github.muntashirakon.music.extensions.accentOutlineColor
-import io.github.muntashirakon.music.fragments.LibraryViewModel
-import io.github.muntashirakon.music.helper.MusicPlayerRemote
-import io.github.muntashirakon.music.interfaces.ICabHolder
-import io.github.muntashirakon.music.model.Song
-import com.google.android.material.button.MaterialButton
+import code.name.monkey.retromusic.R
+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.fragments.LibraryViewModel
+import code.name.monkey.retromusic.model.Song
+import code.name.monkey.retromusic.util.ViewUtil
 import com.h6ah4i.android.widget.advrecyclerview.draggable.DraggableItemAdapter
 import com.h6ah4i.android.widget.advrecyclerview.draggable.ItemDraggableRange
 import kotlinx.coroutines.Dispatchers
@@ -38,12 +34,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?,
-) : AbsOffsetSongAdapter(activity, dataSet, itemLayoutRes, ICabHolder),
+) : SongAdapter(activity, dataSet, itemLayoutRes),
     DraggableItemAdapter<OrderablePlaylistSongAdapter.ViewHolder> {
 
     val libraryViewModel: LibraryViewModel by activity.viewModel()
@@ -56,56 +51,27 @@ class OrderablePlaylistSongAdapter(
     override fun getItemId(position: Int): Long {
         // requires static value, it means need to keep the same value
         // even if the item position has been changed.
-        return if (position != 0) {
-            dataSet[position - 1].id
-        } else {
-            -1
-        }
+        return dataSet[position].id
     }
 
     override fun createViewHolder(view: View): SongAdapter.ViewHolder {
         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) {
-        val playAction: MaterialButton? = itemView.findViewById(R.id.playAction)
-        val shuffleAction: MaterialButton? = itemView.findViewById(R.id.shuffleAction)
+    inner class ViewHolder(itemView: View) : SongAdapter.ViewHolder(itemView) {
 
         override var songMenuRes: Int
             get() = R.menu.menu_item_playlist_song
@@ -116,7 +82,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
                 }
@@ -130,26 +96,22 @@ class OrderablePlaylistSongAdapter(
     }
 
     override fun onCheckCanStartDrag(holder: ViewHolder, position: Int, x: Int, y: Int): Boolean {
-        if (dataSet.size == 0 or 1 || isInQuickSelectMode) {
+        if (isInQuickSelectMode) {
             return false
         }
-        val dragHandle = holder.dragView ?: return false
-
-        val handleWidth = dragHandle.width
-        val handleHeight = dragHandle.height
-        val handleLeft = dragHandle.left
-        val handleTop = dragHandle.top
-
-        return (x >= handleLeft && x < handleLeft + handleWidth &&
-                y >= handleTop && y < handleTop + handleHeight) && position != 0
+        return ViewUtil.hitTest(holder.imageText!!, x, y) || ViewUtil.hitTest(
+            holder.dragView!!,
+            x,
+            y
+        )
     }
 
     override fun onMoveItem(fromPosition: Int, toPosition: Int) {
-        dataSet.add(toPosition - 1, dataSet.removeAt(fromPosition - 1))
+        dataSet.add(toPosition, dataSet.removeAt(fromPosition))
     }
 
-    override fun onGetItemDraggableRange(holder: ViewHolder, position: Int): ItemDraggableRange {
-        return ItemDraggableRange(1, itemCount - 1)
+    override fun onGetItemDraggableRange(holder: ViewHolder, position: Int): ItemDraggableRange? {
+        return null
     }
 
     override fun onCheckCanDrop(draggingPosition: Int, dropPosition: Int): Boolean {

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

@@ -12,22 +12,23 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.adapter.song
+package code.name.monkey.retromusic.adapter.song
 
 import android.view.MenuItem
 import android.view.View
 import androidx.core.view.isVisible
 import androidx.fragment.app.FragmentActivity
-import io.github.muntashirakon.music.R
-import io.github.muntashirakon.music.glide.GlideApp
-import io.github.muntashirakon.music.glide.RetroGlideExtension
-import io.github.muntashirakon.music.helper.MusicPlayerRemote
-import io.github.muntashirakon.music.helper.MusicPlayerRemote.isPlaying
-import io.github.muntashirakon.music.helper.MusicPlayerRemote.playNextSong
-import io.github.muntashirakon.music.helper.MusicPlayerRemote.removeFromQueue
-import io.github.muntashirakon.music.model.Song
-import io.github.muntashirakon.music.util.MusicUtil
-import io.github.muntashirakon.music.util.ViewUtil
+import code.name.monkey.retromusic.R
+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
+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
-) : SongAdapter(
-    activity, dataSet, itemLayoutRes, null
-), DraggableItemAdapter<PlayingQueueAdapter.ViewHolder>,
+    itemLayoutRes: Int,
+) : SongAdapter(activity, dataSet, itemLayoutRes),
+    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

@@ -12,27 +12,25 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.adapter.song
+package code.name.monkey.retromusic.adapter.song
 
 import android.view.View
 import androidx.core.view.isVisible
 import androidx.fragment.app.FragmentActivity
-import io.github.muntashirakon.music.R
-import io.github.muntashirakon.music.extensions.accentColor
-import io.github.muntashirakon.music.extensions.accentOutlineColor
-import io.github.muntashirakon.music.helper.MusicPlayerRemote
-import io.github.muntashirakon.music.interfaces.ICabHolder
-import io.github.muntashirakon.music.model.Song
-import io.github.muntashirakon.music.util.PreferenceUtil
-import io.github.muntashirakon.music.util.RetroUtil
+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.model.Song
+import code.name.monkey.retromusic.util.PreferenceUtil
+import code.name.monkey.retromusic.util.RetroUtil
 import com.google.android.material.button.MaterialButton
 
 class ShuffleButtonSongAdapter(
     activity: FragmentActivity,
     dataSet: MutableList<Song>,
-    itemLayoutRes: Int,
-    ICabHolder: ICabHolder?
-) : AbsOffsetSongAdapter(activity, dataSet, itemLayoutRes, ICabHolder) {
+    itemLayoutRes: Int
+) : AbsOffsetSongAdapter(activity, dataSet, itemLayoutRes) {
 
 
     override fun createViewHolder(view: View): SongAdapter.ViewHolder {

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

@@ -12,22 +12,19 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.adapter.song
+package code.name.monkey.retromusic.adapter.song
 
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.FragmentActivity
-import io.github.muntashirakon.music.interfaces.ICabHolder
-import io.github.muntashirakon.music.model.Song
-import io.github.muntashirakon.music.util.MusicUtil
+import code.name.monkey.retromusic.model.Song
+import code.name.monkey.retromusic.util.MusicUtil
 
 class SimpleSongAdapter(
     context: FragmentActivity,
     songs: ArrayList<Song>,
-    layoutRes: Int,
-    ICabHolder: ICabHolder?
-) : SongAdapter(context, songs, layoutRes, ICabHolder) {
+    layoutRes: Int
+) : SongAdapter(context, songs, layoutRes) {
 
     override fun swapDataSet(dataSet: List<Song>) {
         this.dataSet = dataSet.toMutableList()

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

@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.adapter.song
+package code.name.monkey.retromusic.adapter.song
 
 import android.content.res.ColorStateList
 import android.content.res.Resources
@@ -25,24 +25,24 @@ import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.fragment.app.FragmentActivity
 import androidx.navigation.findNavController
-import io.github.muntashirakon.music.EXTRA_ALBUM_ID
-import io.github.muntashirakon.music.R
-import io.github.muntashirakon.music.adapter.base.AbsMultiSelectAdapter
-import io.github.muntashirakon.music.adapter.base.MediaEntryViewHolder
-import io.github.muntashirakon.music.glide.GlideApp
-import io.github.muntashirakon.music.glide.RetroGlideExtension
-import io.github.muntashirakon.music.glide.RetroMusicColoredTarget
-import io.github.muntashirakon.music.helper.MusicPlayerRemote
-import io.github.muntashirakon.music.helper.SortOrder
-import io.github.muntashirakon.music.helper.menu.SongMenuHelper
-import io.github.muntashirakon.music.helper.menu.SongsMenuHelper
-import io.github.muntashirakon.music.interfaces.ICabCallback
-import io.github.muntashirakon.music.interfaces.ICabHolder
-import io.github.muntashirakon.music.model.Song
-import io.github.muntashirakon.music.util.MusicUtil
-import io.github.muntashirakon.music.util.PreferenceUtil
-import io.github.muntashirakon.music.util.RetroUtil
-import io.github.muntashirakon.music.util.color.MediaNotificationProcessor
+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.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.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
 
 /**
@@ -53,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
 
@@ -120,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) {
@@ -159,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
@@ -216,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/appshortcuts/AppShortcutIconGenerator.kt

@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.appshortcuts
+package code.name.monkey.retromusic.appshortcuts
 
 import android.content.Context
 import android.graphics.drawable.Icon
@@ -22,9 +22,9 @@ import android.util.TypedValue
 import androidx.annotation.RequiresApi
 import androidx.core.graphics.drawable.toBitmap
 import code.name.monkey.appthemehelper.ThemeStore
-import io.github.muntashirakon.music.R
-import io.github.muntashirakon.music.extensions.getTintedDrawable
-import io.github.muntashirakon.music.util.PreferenceUtil
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.extensions.getTintedDrawable
+import code.name.monkey.retromusic.util.PreferenceUtil
 
 @RequiresApi(Build.VERSION_CODES.N_MR1)
 object AppShortcutIconGenerator {

app/src/main/java/code/name/monkey/retromusic/appshortcuts/AppShortcutLauncherActivity.kt

@@ -12,26 +12,26 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.appshortcuts
+package code.name.monkey.retromusic.appshortcuts
 
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
 import androidx.core.os.bundleOf
-import io.github.muntashirakon.music.appshortcuts.shortcuttype.LastAddedShortcutType
-import io.github.muntashirakon.music.appshortcuts.shortcuttype.ShuffleAllShortcutType
-import io.github.muntashirakon.music.appshortcuts.shortcuttype.TopTracksShortcutType
-import io.github.muntashirakon.music.extensions.extraNotNull
-import io.github.muntashirakon.music.model.Playlist
-import io.github.muntashirakon.music.model.smartplaylist.LastAddedPlaylist
-import io.github.muntashirakon.music.model.smartplaylist.ShuffleAllPlaylist
-import io.github.muntashirakon.music.model.smartplaylist.TopTracksPlaylist
-import io.github.muntashirakon.music.service.MusicService
-import io.github.muntashirakon.music.service.MusicService.Companion.ACTION_PLAY_PLAYLIST
-import io.github.muntashirakon.music.service.MusicService.Companion.INTENT_EXTRA_PLAYLIST
-import io.github.muntashirakon.music.service.MusicService.Companion.INTENT_EXTRA_SHUFFLE_MODE
-import io.github.muntashirakon.music.service.MusicService.Companion.SHUFFLE_MODE_NONE
-import io.github.muntashirakon.music.service.MusicService.Companion.SHUFFLE_MODE_SHUFFLE
+import code.name.monkey.retromusic.appshortcuts.shortcuttype.LastAddedShortcutType
+import code.name.monkey.retromusic.appshortcuts.shortcuttype.ShuffleAllShortcutType
+import code.name.monkey.retromusic.appshortcuts.shortcuttype.TopTracksShortcutType
+import code.name.monkey.retromusic.extensions.extraNotNull
+import code.name.monkey.retromusic.model.Playlist
+import code.name.monkey.retromusic.model.smartplaylist.LastAddedPlaylist
+import code.name.monkey.retromusic.model.smartplaylist.ShuffleAllPlaylist
+import code.name.monkey.retromusic.model.smartplaylist.TopTracksPlaylist
+import code.name.monkey.retromusic.service.MusicService
+import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_PLAY_PLAYLIST
+import code.name.monkey.retromusic.service.MusicService.Companion.INTENT_EXTRA_PLAYLIST
+import code.name.monkey.retromusic.service.MusicService.Companion.INTENT_EXTRA_SHUFFLE_MODE
+import code.name.monkey.retromusic.service.MusicService.Companion.SHUFFLE_MODE_NONE
+import code.name.monkey.retromusic.service.MusicService.Companion.SHUFFLE_MODE_SHUFFLE
 
 class AppShortcutLauncherActivity : Activity() {
 

app/src/main/java/code/name/monkey/retromusic/appshortcuts/DynamicShortcutManager.kt

@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.appshortcuts
+package code.name.monkey.retromusic.appshortcuts
 
 import android.annotation.TargetApi
 import android.content.Context
@@ -22,9 +22,9 @@ import android.content.pm.ShortcutManager
 import android.graphics.drawable.Icon
 import android.os.Build
 import androidx.core.content.getSystemService
-import io.github.muntashirakon.music.appshortcuts.shortcuttype.LastAddedShortcutType
-import io.github.muntashirakon.music.appshortcuts.shortcuttype.ShuffleAllShortcutType
-import io.github.muntashirakon.music.appshortcuts.shortcuttype.TopTracksShortcutType
+import code.name.monkey.retromusic.appshortcuts.shortcuttype.LastAddedShortcutType
+import code.name.monkey.retromusic.appshortcuts.shortcuttype.ShuffleAllShortcutType
+import code.name.monkey.retromusic.appshortcuts.shortcuttype.TopTracksShortcutType
 
 @TargetApi(Build.VERSION_CODES.N_MR1)
 class DynamicShortcutManager(private val context: Context) {

app/src/main/java/code/name/monkey/retromusic/appshortcuts/shortcuttype/BaseShortcutType.kt

@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.appshortcuts.shortcuttype
+package code.name.monkey.retromusic.appshortcuts.shortcuttype
 
 import android.annotation.TargetApi
 import android.content.Context
@@ -20,7 +20,7 @@ import android.content.Intent
 import android.content.pm.ShortcutInfo
 import android.os.Build
 import androidx.core.os.bundleOf
-import io.github.muntashirakon.music.appshortcuts.AppShortcutLauncherActivity
+import code.name.monkey.retromusic.appshortcuts.AppShortcutLauncherActivity
 
 @TargetApi(Build.VERSION_CODES.N_MR1)
 abstract class BaseShortcutType(internal var context: Context) {

app/src/main/java/code/name/monkey/retromusic/appshortcuts/shortcuttype/LastAddedShortcutType.kt

@@ -12,15 +12,15 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.appshortcuts.shortcuttype
+package code.name.monkey.retromusic.appshortcuts.shortcuttype
 
 import android.annotation.TargetApi
 import android.content.Context
 import android.content.pm.ShortcutInfo
 import android.os.Build
-import io.github.muntashirakon.music.R
-import io.github.muntashirakon.music.appshortcuts.AppShortcutIconGenerator
-import io.github.muntashirakon.music.appshortcuts.AppShortcutLauncherActivity
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.appshortcuts.AppShortcutIconGenerator
+import code.name.monkey.retromusic.appshortcuts.AppShortcutLauncherActivity
 
 @TargetApi(Build.VERSION_CODES.N_MR1)
 class LastAddedShortcutType(context: Context) : BaseShortcutType(context) {

app/src/main/java/code/name/monkey/retromusic/appshortcuts/shortcuttype/ShuffleAllShortcutType.kt

@@ -12,15 +12,15 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.appshortcuts.shortcuttype
+package code.name.monkey.retromusic.appshortcuts.shortcuttype
 
 import android.annotation.TargetApi
 import android.content.Context
 import android.content.pm.ShortcutInfo
 import android.os.Build
-import io.github.muntashirakon.music.R
-import io.github.muntashirakon.music.appshortcuts.AppShortcutIconGenerator
-import io.github.muntashirakon.music.appshortcuts.AppShortcutLauncherActivity
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.appshortcuts.AppShortcutIconGenerator
+import code.name.monkey.retromusic.appshortcuts.AppShortcutLauncherActivity
 
 @TargetApi(Build.VERSION_CODES.N_MR1)
 class ShuffleAllShortcutType(context: Context) : BaseShortcutType(context) {

app/src/main/java/code/name/monkey/retromusic/appshortcuts/shortcuttype/TopTracksShortcutType.kt

@@ -11,15 +11,15 @@
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  */
-package io.github.muntashirakon.music.appshortcuts.shortcuttype
+package code.name.monkey.retromusic.appshortcuts.shortcuttype
 
 import android.annotation.TargetApi
 import android.content.Context
 import android.content.pm.ShortcutInfo
 import android.os.Build
-import io.github.muntashirakon.music.R
-import io.github.muntashirakon.music.appshortcuts.AppShortcutIconGenerator
-import io.github.muntashirakon.music.appshortcuts.AppShortcutLauncherActivity
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.appshortcuts.AppShortcutIconGenerator
+import code.name.monkey.retromusic.appshortcuts.AppShortcutLauncherActivity
 
 @TargetApi(Build.VERSION_CODES.N_MR1)
 class TopTracksShortcutType(context: Context) : BaseShortcutType(context) {

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

@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.appwidgets
+package code.name.monkey.retromusic.appwidgets
 
 import android.app.PendingIntent
 import android.content.ComponentName
@@ -25,18 +25,17 @@ import android.widget.RemoteViews
 import androidx.core.graphics.drawable.toBitmap
 import code.name.monkey.appthemehelper.util.MaterialValueHelper
 import code.name.monkey.appthemehelper.util.VersionUtils
-import io.github.muntashirakon.music.R
-import io.github.muntashirakon.music.activities.MainActivity
-import io.github.muntashirakon.music.appwidgets.base.BaseAppWidget
-import io.github.muntashirakon.music.extensions.getTintedDrawable
-import io.github.muntashirakon.music.glide.GlideApp
-import io.github.muntashirakon.music.glide.RetroGlideExtension
-import io.github.muntashirakon.music.service.MusicService
-import io.github.muntashirakon.music.service.MusicService.Companion.ACTION_REWIND
-import io.github.muntashirakon.music.service.MusicService.Companion.ACTION_SKIP
-import io.github.muntashirakon.music.service.MusicService.Companion.ACTION_TOGGLE_PAUSE
-import io.github.muntashirakon.music.util.PreferenceUtil
-import io.github.muntashirakon.music.util.RetroUtil
+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.RetroGlideExtension
+import code.name.monkey.retromusic.service.MusicService
+import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_REWIND
+import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_SKIP
+import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_TOGGLE_PAUSE
+import code.name.monkey.retromusic.util.PreferenceUtil
+import code.name.monkey.retromusic.util.RetroUtil
 import com.bumptech.glide.Glide
 import com.bumptech.glide.request.target.CustomTarget
 import com.bumptech.glide.request.target.Target
@@ -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

@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.appwidgets
+package code.name.monkey.retromusic.appwidgets
 
 import android.app.PendingIntent
 import android.content.ComponentName
@@ -25,18 +25,19 @@ import android.widget.RemoteViews
 import androidx.core.graphics.drawable.toBitmap
 import code.name.monkey.appthemehelper.util.MaterialValueHelper
 import code.name.monkey.appthemehelper.util.VersionUtils
-import io.github.muntashirakon.music.R
-import io.github.muntashirakon.music.activities.MainActivity
-import io.github.muntashirakon.music.appwidgets.base.BaseAppWidget
-import io.github.muntashirakon.music.extensions.getTintedDrawable
-import io.github.muntashirakon.music.glide.GlideApp
-import io.github.muntashirakon.music.glide.RetroGlideExtension
-import io.github.muntashirakon.music.glide.palette.BitmapPaletteWrapper
-import io.github.muntashirakon.music.service.MusicService
-import io.github.muntashirakon.music.service.MusicService.Companion.ACTION_REWIND
-import io.github.muntashirakon.music.service.MusicService.Companion.ACTION_SKIP
-import io.github.muntashirakon.music.service.MusicService.Companion.ACTION_TOGGLE_PAUSE
-import io.github.muntashirakon.music.util.PreferenceUtil
+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.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
+import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_SKIP
+import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_TOGGLE_PAUSE
+import code.name.monkey.retromusic.util.PreferenceUtil
 import com.bumptech.glide.Glide
 import com.bumptech.glide.request.target.CustomTarget
 import com.bumptech.glide.request.target.Target
@@ -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

@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.appwidgets
+package code.name.monkey.retromusic.appwidgets
 
 import android.app.PendingIntent
 import android.content.ComponentName
@@ -24,19 +24,20 @@ import android.widget.RemoteViews
 import androidx.core.graphics.drawable.toBitmap
 import code.name.monkey.appthemehelper.util.MaterialValueHelper
 import code.name.monkey.appthemehelper.util.VersionUtils
-import io.github.muntashirakon.music.R
-import io.github.muntashirakon.music.activities.MainActivity
-import io.github.muntashirakon.music.appwidgets.base.BaseAppWidget
-import io.github.muntashirakon.music.extensions.getTintedDrawable
-import io.github.muntashirakon.music.glide.GlideApp
-import io.github.muntashirakon.music.glide.RetroGlideExtension
-import io.github.muntashirakon.music.glide.palette.BitmapPaletteWrapper
-import io.github.muntashirakon.music.service.MusicService
-import io.github.muntashirakon.music.service.MusicService.Companion.ACTION_TOGGLE_PAUSE
-import io.github.muntashirakon.music.service.MusicService.Companion.TOGGLE_FAVORITE
-import io.github.muntashirakon.music.util.MusicUtil
-import io.github.muntashirakon.music.util.PreferenceUtil
-import io.github.muntashirakon.music.util.RetroUtil
+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.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
+import code.name.monkey.retromusic.service.MusicService.Companion.TOGGLE_FAVORITE
+import code.name.monkey.retromusic.util.MusicUtil
+import code.name.monkey.retromusic.util.PreferenceUtil
+import code.name.monkey.retromusic.util.RetroUtil
 import com.bumptech.glide.Glide
 import com.bumptech.glide.request.RequestOptions
 import com.bumptech.glide.request.target.CustomTarget
@@ -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

@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.appwidgets
+package code.name.monkey.retromusic.appwidgets
 
 import android.app.PendingIntent
 import android.content.ComponentName
@@ -26,18 +26,19 @@ import android.widget.RemoteViews
 import androidx.core.graphics.drawable.toBitmap
 import code.name.monkey.appthemehelper.util.MaterialValueHelper
 import code.name.monkey.appthemehelper.util.VersionUtils
-import io.github.muntashirakon.music.R
-import io.github.muntashirakon.music.activities.MainActivity
-import io.github.muntashirakon.music.appwidgets.base.BaseAppWidget
-import io.github.muntashirakon.music.extensions.getTintedDrawable
-import io.github.muntashirakon.music.glide.GlideApp
-import io.github.muntashirakon.music.glide.RetroGlideExtension
-import io.github.muntashirakon.music.glide.palette.BitmapPaletteWrapper
-import io.github.muntashirakon.music.service.MusicService
-import io.github.muntashirakon.music.service.MusicService.Companion.ACTION_REWIND
-import io.github.muntashirakon.music.service.MusicService.Companion.ACTION_SKIP
-import io.github.muntashirakon.music.service.MusicService.Companion.ACTION_TOGGLE_PAUSE
-import io.github.muntashirakon.music.util.PreferenceUtil
+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.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
+import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_SKIP
+import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_TOGGLE_PAUSE
+import code.name.monkey.retromusic.util.PreferenceUtil
 import com.bumptech.glide.Glide
 import com.bumptech.glide.request.target.CustomTarget
 import com.bumptech.glide.request.target.Target
@@ -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

@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.appwidgets
+package code.name.monkey.retromusic.appwidgets
 
 import android.app.PendingIntent
 import android.content.ComponentName
@@ -25,19 +25,20 @@ import android.widget.RemoteViews
 import androidx.core.graphics.drawable.toBitmap
 import code.name.monkey.appthemehelper.util.MaterialValueHelper
 import code.name.monkey.appthemehelper.util.VersionUtils
-import io.github.muntashirakon.music.R
-import io.github.muntashirakon.music.activities.MainActivity
-import io.github.muntashirakon.music.appwidgets.base.BaseAppWidget
-import io.github.muntashirakon.music.extensions.getTintedDrawable
-import io.github.muntashirakon.music.glide.GlideApp
-import io.github.muntashirakon.music.glide.RetroGlideExtension
-import io.github.muntashirakon.music.glide.palette.BitmapPaletteWrapper
-import io.github.muntashirakon.music.service.MusicService
-import io.github.muntashirakon.music.service.MusicService.Companion.ACTION_REWIND
-import io.github.muntashirakon.music.service.MusicService.Companion.ACTION_SKIP
-import io.github.muntashirakon.music.service.MusicService.Companion.ACTION_TOGGLE_PAUSE
-import io.github.muntashirakon.music.util.DensityUtil
-import io.github.muntashirakon.music.util.PreferenceUtil
+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.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
+import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_SKIP
+import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_TOGGLE_PAUSE
+import code.name.monkey.retromusic.util.DensityUtil
+import code.name.monkey.retromusic.util.PreferenceUtil
 import com.bumptech.glide.Glide
 import com.bumptech.glide.request.target.CustomTarget
 import com.bumptech.glide.request.target.Target
@@ -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

@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.appwidgets
+package code.name.monkey.retromusic.appwidgets
 
 import android.app.PendingIntent
 import android.content.ComponentName
@@ -25,18 +25,19 @@ import android.widget.RemoteViews
 import androidx.core.graphics.drawable.toBitmap
 import code.name.monkey.appthemehelper.util.MaterialValueHelper
 import code.name.monkey.appthemehelper.util.VersionUtils
-import io.github.muntashirakon.music.R
-import io.github.muntashirakon.music.activities.MainActivity
-import io.github.muntashirakon.music.appwidgets.base.BaseAppWidget
-import io.github.muntashirakon.music.extensions.getTintedDrawable
-import io.github.muntashirakon.music.glide.GlideApp
-import io.github.muntashirakon.music.glide.RetroGlideExtension
-import io.github.muntashirakon.music.glide.palette.BitmapPaletteWrapper
-import io.github.muntashirakon.music.service.MusicService
-import io.github.muntashirakon.music.service.MusicService.Companion.ACTION_REWIND
-import io.github.muntashirakon.music.service.MusicService.Companion.ACTION_SKIP
-import io.github.muntashirakon.music.service.MusicService.Companion.ACTION_TOGGLE_PAUSE
-import io.github.muntashirakon.music.util.PreferenceUtil
+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.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
+import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_SKIP
+import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_TOGGLE_PAUSE
+import code.name.monkey.retromusic.util.PreferenceUtil
 import com.bumptech.glide.Glide
 import com.bumptech.glide.request.target.CustomTarget
 import com.bumptech.glide.request.target.Target
@@ -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

@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.appwidgets
+package code.name.monkey.retromusic.appwidgets
 
 import android.app.PendingIntent
 import android.content.ComponentName
@@ -23,15 +23,15 @@ import android.widget.RemoteViews
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.toBitmap
 import code.name.monkey.appthemehelper.util.VersionUtils
-import io.github.muntashirakon.music.R
-import io.github.muntashirakon.music.activities.MainActivity
-import io.github.muntashirakon.music.appwidgets.base.BaseAppWidget
-import io.github.muntashirakon.music.extensions.getTintedDrawable
-import io.github.muntashirakon.music.service.MusicService
-import io.github.muntashirakon.music.service.MusicService.Companion.ACTION_REWIND
-import io.github.muntashirakon.music.service.MusicService.Companion.ACTION_SKIP
-import io.github.muntashirakon.music.service.MusicService.Companion.ACTION_TOGGLE_PAUSE
-import io.github.muntashirakon.music.util.PreferenceUtil
+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.service.MusicService
+import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_REWIND
+import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_SKIP
+import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_TOGGLE_PAUSE
+import code.name.monkey.retromusic.util.PreferenceUtil
 
 class AppWidgetText : BaseAppWidget() {
     override fun defaultAppWidget(context: Context, appWidgetIds: IntArray) {
@@ -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/appwidgets/BootReceiver.kt

@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.appwidgets
+package code.name.monkey.retromusic.appwidgets
 
 import android.appwidget.AppWidgetManager
 import android.content.BroadcastReceiver
@@ -20,7 +20,7 @@ import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
 import android.os.Build
-import io.github.muntashirakon.music.service.MusicService
+import code.name.monkey.retromusic.service.MusicService
 
 class BootReceiver : BroadcastReceiver() {
     override fun onReceive(context: Context, intent: Intent) {

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

@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.appwidgets.base
+package code.name.monkey.retromusic.appwidgets.base
 
 import android.app.PendingIntent
 import android.appwidget.AppWidgetManager
@@ -26,14 +26,14 @@ import android.graphics.drawable.Drawable
 import android.widget.RemoteViews
 import androidx.core.content.ContextCompat
 import code.name.monkey.appthemehelper.util.VersionUtils
-import io.github.muntashirakon.music.R
-import io.github.muntashirakon.music.model.Song
-import io.github.muntashirakon.music.service.MusicService
-import io.github.muntashirakon.music.service.MusicService.Companion.APP_WIDGET_UPDATE
-import io.github.muntashirakon.music.service.MusicService.Companion.EXTRA_APP_WIDGET_NAME
-import io.github.muntashirakon.music.service.MusicService.Companion.FAVORITE_STATE_CHANGED
-import io.github.muntashirakon.music.service.MusicService.Companion.META_CHANGED
-import io.github.muntashirakon.music.service.MusicService.Companion.PLAY_STATE_CHANGED
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.model.Song
+import code.name.monkey.retromusic.service.MusicService
+import code.name.monkey.retromusic.service.MusicService.Companion.APP_WIDGET_UPDATE
+import code.name.monkey.retromusic.service.MusicService.Companion.EXTRA_APP_WIDGET_NAME
+import code.name.monkey.retromusic.service.MusicService.Companion.FAVORITE_STATE_CHANGED
+import code.name.monkey.retromusic.service.MusicService.Companion.META_CHANGED
+import code.name.monkey.retromusic.service.MusicService.Companion.PLAY_STATE_CHANGED
 
 abstract class BaseAppWidget : AppWidgetProvider() {
 

app/src/main/java/code/name/monkey/retromusic/auto/AutoMediaIDHelper.java

@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  */
 
-package io.github.muntashirakon.music.auto;
+package code.name.monkey.retromusic.auto;
 
 import androidx.annotation.NonNull;
 

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

@@ -11,19 +11,19 @@
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  */
-package io.github.muntashirakon.music.auto
+package code.name.monkey.retromusic.auto
 
 import android.content.Context
 import android.content.res.Resources
 import android.support.v4.media.MediaBrowserCompat
-import io.github.muntashirakon.music.R
-import io.github.muntashirakon.music.helper.MusicPlayerRemote
-import io.github.muntashirakon.music.model.CategoryInfo
-import io.github.muntashirakon.music.model.Song
-import io.github.muntashirakon.music.repository.*
-import io.github.muntashirakon.music.service.MusicService
-import io.github.muntashirakon.music.util.MusicUtil
-import io.github.muntashirakon.music.util.PreferenceUtil
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.helper.MusicPlayerRemote
+import code.name.monkey.retromusic.model.CategoryInfo
+import code.name.monkey.retromusic.model.Song
+import code.name.monkey.retromusic.repository.*
+import code.name.monkey.retromusic.service.MusicService
+import code.name.monkey.retromusic.util.MusicUtil
+import code.name.monkey.retromusic.util.PreferenceUtil
 import java.lang.ref.WeakReference
 
 
@@ -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/auto/MediaItemBuilder.kt

@@ -1,4 +1,4 @@
-package io.github.muntashirakon.music.auto
+package code.name.monkey.retromusic.auto
 
 import android.content.Context
 import android.net.Uri

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

@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.db
+package code.name.monkey.retromusic.db
 
 import androidx.room.*
 

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

@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.db
+package code.name.monkey.retromusic.db
 
 import androidx.room.Entity
 import androidx.room.PrimaryKey

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

@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.db
+package code.name.monkey.retromusic.db
 
 import androidx.lifecycle.LiveData
 import androidx.room.*
@@ -23,16 +23,11 @@ interface HistoryDao {
         private const val HISTORY_LIMIT = 100
     }
 
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun insertSongInHistory(historyEntity: HistoryEntity)
+    @Upsert
+    suspend fun upsertSongInHistory(historyEntity: HistoryEntity)
 
     @Query("DELETE FROM HistoryEntity WHERE id= :songId")
     fun deleteSongInHistory(songId: Long)
-    @Query("SELECT * FROM HistoryEntity WHERE id = :songId LIMIT 1")
-    suspend fun isSongPresentInHistory(songId: Long): HistoryEntity?
-
-    @Update
-    suspend fun updateHistorySong(historyEntity: HistoryEntity)
 
     @Query("SELECT * FROM HistoryEntity ORDER BY time_played DESC LIMIT $HISTORY_LIMIT")
     fun historySongs(): List<HistoryEntity>

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

@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.db
+package code.name.monkey.retromusic.db
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity

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

@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.db
+package code.name.monkey.retromusic.db
 
 import androidx.room.*
 

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

@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.db
+package code.name.monkey.retromusic.db
 
 import androidx.room.Entity
 import androidx.room.PrimaryKey

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

@@ -12,30 +12,25 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.db
+package code.name.monkey.retromusic.db
 
 import androidx.room.*
 
 @Dao
 interface PlayCountDao {
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    fun insertSongInPlayCount(playCountEntity: PlayCountEntity)
 
-    @Update
-    fun updateSongInPlayCount(playCountEntity: PlayCountEntity)
+    @Upsert
+    fun upsertSongInPlayCount(playCountEntity: PlayCountEntity)
 
     @Delete
     fun deleteSongInPlayCount(playCountEntity: PlayCountEntity)
 
-    @Query("SELECT * FROM PlayCountEntity WHERE id =:songId")
-    fun checkSongExistInPlayCount(songId: Long): List<PlayCountEntity>
+    @Query("SELECT * FROM PlayCountEntity WHERE id =:songId LIMIT 1")
+    fun findSongExistInPlayCount(songId: Long): PlayCountEntity?
 
     @Query("SELECT * FROM PlayCountEntity ORDER BY play_count DESC")
     fun playCountSongs(): List<PlayCountEntity>
 
     @Query("DELETE FROM SongEntity WHERE id =:songId")
     fun deleteSong(songId: Long)
-
-    @Query("UPDATE PlayCountEntity SET play_count = play_count + 1 WHERE id = :id")
-    fun updateQuantity(id: Long)
 }

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

@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.db
+package code.name.monkey.retromusic.db
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity

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

@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.db
+package code.name.monkey.retromusic.db
 
 import androidx.lifecycle.LiveData
 import androidx.room.*
@@ -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")
-    fun favoritesSongsLiveData(playlistId: Long): LiveData<List<SongEntity>>
+    @RewriteQueriesToDropUnusedColumns
+    @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/PlaylistEntity.kt

@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.db
+package code.name.monkey.retromusic.db
 
 import android.os.Parcelable
 import androidx.room.ColumnInfo

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

@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.db
+package code.name.monkey.retromusic.db
 
 import android.os.Parcelable
 import androidx.room.Embedded

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

@@ -12,20 +12,18 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.db
+package code.name.monkey.retromusic.db
 
 import androidx.room.Database
 import androidx.room.RoomDatabase
 
 @Database(
-    entities = [PlaylistEntity::class, SongEntity::class, HistoryEntity::class, PlayCountEntity::class, BlackListStoreEntity::class, LyricsEntity::class],
-    version = 23,
+    entities = [PlaylistEntity::class, SongEntity::class, HistoryEntity::class, PlayCountEntity::class],
+    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/SongEntity.kt

@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.db
+package code.name.monkey.retromusic.db
 
 import android.os.Parcelable
 import androidx.room.ColumnInfo

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

@@ -12,9 +12,9 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.db
+package code.name.monkey.retromusic.db
 
-import io.github.muntashirakon.music.model.Song
+import code.name.monkey.retromusic.model.Song
 
 fun List<HistoryEntity>.fromHistoryToSongs(): List<Song> {
     return map {
@@ -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

@@ -12,25 +12,25 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.dialogs
+package code.name.monkey.retromusic.dialogs
 
 import android.app.Dialog
 import android.os.Bundle
 import androidx.core.os.bundleOf
 import androidx.fragment.app.DialogFragment
-import io.github.muntashirakon.music.EXTRA_PLAYLISTS
-import io.github.muntashirakon.music.EXTRA_SONG
-import io.github.muntashirakon.music.R
-import io.github.muntashirakon.music.db.PlaylistEntity
-import io.github.muntashirakon.music.extensions.colorButtons
-import io.github.muntashirakon.music.extensions.extraNotNull
-import io.github.muntashirakon.music.extensions.materialDialog
-import io.github.muntashirakon.music.fragments.LibraryViewModel
-import io.github.muntashirakon.music.model.Song
-import org.koin.androidx.viewmodel.ext.android.sharedViewModel
+import code.name.monkey.retromusic.EXTRA_PLAYLISTS
+import code.name.monkey.retromusic.EXTRA_SONG
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.db.PlaylistEntity
+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 code.name.monkey.retromusic.model.Song
+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->
-                 if (which == 0) {
+            .setItems(playlistNames.toTypedArray()) { dialog, which ->
+                if (which == 0) {
                     showCreateDialog(songs)
                 } else {
                     libraryViewModel.addToPlaylist(requireContext(), playlistNames[which], songs)

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

@@ -1,4 +1,4 @@
-package io.github.muntashirakon.music.dialogs
+package code.name.monkey.retromusic.dialogs
 
 import android.Manifest
 import android.app.Dialog
@@ -8,9 +8,9 @@ import android.os.Bundle
 import androidx.core.app.ActivityCompat
 import androidx.fragment.app.DialogFragment
 import code.name.monkey.appthemehelper.util.VersionUtils
-import io.github.muntashirakon.music.R
-import io.github.muntashirakon.music.extensions.materialDialog
-import io.github.muntashirakon.music.util.getExternalStorageDirectory
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.extensions.materialDialog
+import code.name.monkey.retromusic.util.getExternalStorageDirectory
 import com.afollestad.materialdialogs.MaterialDialog
 import com.afollestad.materialdialogs.list.listItems
 import com.afollestad.materialdialogs.list.updateListItems

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

@@ -12,29 +12,29 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.dialogs
+package code.name.monkey.retromusic.dialogs
 
 import android.app.Dialog
 import android.os.Bundle
 import android.text.TextUtils
 import androidx.core.os.bundleOf
 import androidx.fragment.app.DialogFragment
-import io.github.muntashirakon.music.EXTRA_SONG
-import io.github.muntashirakon.music.R
-import io.github.muntashirakon.music.databinding.DialogPlaylistBinding
-import io.github.muntashirakon.music.extensions.colorButtons
-import io.github.muntashirakon.music.extensions.extra
-import io.github.muntashirakon.music.extensions.materialDialog
-import io.github.muntashirakon.music.fragments.LibraryViewModel
-import io.github.muntashirakon.music.model.Song
+import code.name.monkey.retromusic.EXTRA_SONG
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.databinding.DialogPlaylistBinding
+import code.name.monkey.retromusic.extensions.colorButtons
+import code.name.monkey.retromusic.extensions.extra
+import code.name.monkey.retromusic.extensions.materialDialog
+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

@@ -12,26 +12,26 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.dialogs
+package code.name.monkey.retromusic.dialogs
 
 import android.app.Dialog
 import android.os.Bundle
 import androidx.core.os.bundleOf
 import androidx.core.text.parseAsHtml
 import androidx.fragment.app.DialogFragment
-import io.github.muntashirakon.music.EXTRA_PLAYLIST
-import io.github.muntashirakon.music.R
-import io.github.muntashirakon.music.db.PlaylistEntity
-import io.github.muntashirakon.music.extensions.colorButtons
-import io.github.muntashirakon.music.extensions.extraNotNull
-import io.github.muntashirakon.music.extensions.materialDialog
-import io.github.muntashirakon.music.fragments.LibraryViewModel
-import io.github.muntashirakon.music.fragments.ReloadType
-import org.koin.androidx.viewmodel.ext.android.sharedViewModel
+import code.name.monkey.retromusic.EXTRA_PLAYLIST
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.db.PlaylistEntity
+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 code.name.monkey.retromusic.fragments.ReloadType
+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/DeleteSongsDialog.kt

@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.dialogs
+package code.name.monkey.retromusic.dialogs
 
 import android.app.Activity
 import android.app.Dialog
@@ -25,17 +25,16 @@ import androidx.core.os.bundleOf
 import androidx.core.text.parseAsHtml
 import androidx.fragment.app.DialogFragment
 import code.name.monkey.appthemehelper.util.VersionUtils
-import io.github.muntashirakon.music.EXTRA_SONG
-import io.github.muntashirakon.music.R
-import io.github.muntashirakon.music.activities.saf.SAFGuideActivity
-import io.github.muntashirakon.music.extensions.extraNotNull
-import io.github.muntashirakon.music.extensions.materialDialog
-import io.github.muntashirakon.music.fragments.LibraryViewModel
-import io.github.muntashirakon.music.fragments.ReloadType
-import io.github.muntashirakon.music.helper.MusicPlayerRemote
-import io.github.muntashirakon.music.model.Song
-import io.github.muntashirakon.music.util.MusicUtil
-import io.github.muntashirakon.music.util.SAFUtil
+import code.name.monkey.retromusic.EXTRA_SONG
+import code.name.monkey.retromusic.R
+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 code.name.monkey.retromusic.helper.MusicPlayerRemote
+import code.name.monkey.retromusic.model.Song
+import code.name.monkey.retromusic.util.MusicUtil
+import code.name.monkey.retromusic.util.SAFUtil
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -120,8 +119,8 @@ class DeleteSongsDialog : DialogFragment() {
                             deleteSongs(songs)
                         } else {
                             startActivityForResult(
-                                Intent(requireActivity(), SAFGuideActivity::class.java),
-                                SAFGuideActivity.REQUEST_CODE_SAF_GUIDE
+                                Intent(requireActivity(), code.name.monkey.retromusic.activities.saf.SAFGuideActivity::class.java),
+                                code.name.monkey.retromusic.activities.saf.SAFGuideActivity.REQUEST_CODE_SAF_GUIDE
                             )
                         }
                     }
@@ -132,7 +131,7 @@ class DeleteSongsDialog : DialogFragment() {
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
         when (requestCode) {
-            SAFGuideActivity.REQUEST_CODE_SAF_GUIDE -> {
+            code.name.monkey.retromusic.activities.saf.SAFGuideActivity.REQUEST_CODE_SAF_GUIDE -> {
                 SAFUtil.openTreePicker(this)
             }
             SAFUtil.REQUEST_SAF_PICK_TREE,

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

@@ -12,19 +12,19 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.dialogs
+package code.name.monkey.retromusic.dialogs
 
 import android.app.Dialog
 import android.os.Bundle
 import androidx.fragment.app.DialogFragment
-import io.github.muntashirakon.music.R
-import io.github.muntashirakon.music.extensions.colorButtons
-import io.github.muntashirakon.music.extensions.materialDialog
-import io.github.muntashirakon.music.fragments.LibraryViewModel
-import org.koin.androidx.viewmodel.ext.android.sharedViewModel
+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.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/PlaybackSpeedDialog.kt

@@ -1,14 +1,14 @@
-package io.github.muntashirakon.music.dialogs
+package code.name.monkey.retromusic.dialogs
 
 import android.app.Dialog
 import android.os.Bundle
 import androidx.fragment.app.DialogFragment
-import io.github.muntashirakon.music.R
-import io.github.muntashirakon.music.databinding.DialogPlaybackSpeedBinding
-import io.github.muntashirakon.music.extensions.accent
-import io.github.muntashirakon.music.extensions.colorButtons
-import io.github.muntashirakon.music.extensions.materialDialog
-import io.github.muntashirakon.music.util.PreferenceUtil
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.databinding.DialogPlaybackSpeedBinding
+import code.name.monkey.retromusic.extensions.accent
+import code.name.monkey.retromusic.extensions.colorButtons
+import code.name.monkey.retromusic.extensions.materialDialog
+import code.name.monkey.retromusic.util.PreferenceUtil
 import com.google.android.material.slider.Slider
 
 class PlaybackSpeedDialog : DialogFragment() {

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

@@ -12,24 +12,24 @@
  * See the GNU General Public License for more details.
  *
  */
-package io.github.muntashirakon.music.dialogs
+package code.name.monkey.retromusic.dialogs
 
 import android.app.Dialog
 import android.os.Bundle
 import androidx.core.os.bundleOf
 import androidx.core.text.parseAsHtml
 import androidx.fragment.app.DialogFragment
-import io.github.muntashirakon.music.EXTRA_SONG
-import io.github.muntashirakon.music.R
-import io.github.muntashirakon.music.db.SongEntity
-import io.github.muntashirakon.music.extensions.colorButtons
-import io.github.muntashirakon.music.extensions.extraNotNull
-import io.github.muntashirakon.music.extensions.materialDialog
-import io.github.muntashirakon.music.fragments.LibraryViewModel
-import org.koin.androidx.viewmodel.ext.android.sharedViewModel
+import code.name.monkey.retromusic.EXTRA_SONG
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.db.SongEntity
+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.activityViewModel
 
 class RemoveSongFromPlaylistDialog : DialogFragment() {
-    private val libraryViewModel by sharedViewModel<LibraryViewModel>()
+    private val libraryViewModel by activityViewModel<LibraryViewModel>()
 
     companion object {
         fun create(song: SongEntity): RemoveSongFromPlaylistDialog {