From 3f1a9a2900e026d467475189c2d1abe308a277fd Mon Sep 17 00:00:00 2001
From: bullhead <m.osamabinomar@gmail.com>
Date: Mon, 13 Jan 2020 01:20:06 +0500
Subject: [PATCH 1/2] fixed blinking cursor again

---
 project/app/src/main/res/values/styles.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/project/app/src/main/res/values/styles.xml b/project/app/src/main/res/values/styles.xml
index 81973a969..eb735eb8f 100644
--- a/project/app/src/main/res/values/styles.xml
+++ b/project/app/src/main/res/values/styles.xml
@@ -6,7 +6,11 @@
         <item name="android:fontFamily">@font/raleway</item>
         <item name="md_font_title">@font/raleway_black</item>
         <item name="alertDialogTheme">@style/DialogsStyle</item>
-        <item name="preferenceTheme">@style/DialogsStyle</item>
+        <item name="preferenceTheme">@style/PrefTheme</item>
+    </style>
+
+    <style name="PrefTheme" parent="PreferenceThemeOverlay">
+        <item name="android:scrollbars">none</item>
     </style>
 
     <style name="DialogsStyle" parent="Theme.AppCompat.DayNight.Dialog">

From 99d5a8885b3c8662da088dc5f9087d72313bc18a Mon Sep 17 00:00:00 2001
From: bullhead <m.osamabinomar@gmail.com>
Date: Mon, 13 Jan 2020 01:37:37 +0500
Subject: [PATCH 2/2] updated from head

---
 .github/FUNDING.yml                           |  2 +-
 Contributors.md                               |  2 -
 Faq.md                                        |  5 +
 Libs.md                                       |  2 +
 project/app/build.gradle                      |  6 +-
 project/app/src/main/AndroidManifest.xml      | 12 ++-
 .../com/iven/musicplayergo/MainActivity.kt    | 91 +++++++++----------
 .../musicplayergo/MusicPlayerGoPreferences.kt |  6 +-
 .../fragments/FoldersFragment.kt              | 13 +--
 .../com/iven/musicplayergo/music/Music.kt     |  5 +-
 .../iven/musicplayergo/music/MusicLibrary.kt  | 25 +++--
 .../iven/musicplayergo/music/MusicUtils.kt    | 48 ++++++++--
 .../musicplayergo/music/MusicViewModel.kt     | 23 +++++
 .../musicplayergo/player/MediaPlayerHolder.kt | 87 ++++++------------
 .../musicplayergo/player/PlayerService.kt     | 84 ++++++++++++++++-
 .../com/iven/musicplayergo/ui/ThemeHelper.kt  | 34 ++-----
 .../java/com/iven/musicplayergo/ui/Utils.kt   | 47 ++++++++--
 .../main/res/drawable/seekbar_np_thumb.xml    | 11 +++
 .../main/res/drawable/seekbar_np_track.xml    | 26 +-----
 .../main/res/layout-land/fragment_details.xml |  2 +-
 .../src/main/res/layout-land/now_playing.xml  | 12 ++-
 .../res/layout-land/now_playing_controls.xml  |  5 +-
 .../now_playing_extended_controls.xml         |  2 +-
 .../app/src/main/res/layout/now_playing.xml   | 11 ++-
 .../main/res/layout/now_playing_controls.xml  |  6 +-
 .../layout/now_playing_extended_controls.xml  |  5 +-
 .../app/src/main/res/values-fr/strings.xml    | 69 +++++++++++++-
 .../app/src/main/res/values-in/strings.xml    | 26 +++---
 .../app/src/main/res/values-it/strings.xml    |  4 +-
 .../app/src/main/res/values-night/colors.xml  |  3 +-
 .../app/src/main/res/values-nl/strings.xml    |  4 +-
 .../app/src/main/res/values-ru/strings.xml    | 51 +++++++++++
 .../app/src/main/res/values-tr/strings.xml    | 75 ++++++++++++++-
 project/app/src/main/res/values/colors.xml    |  3 +-
 project/app/src/main/res/values/strings.xml   | 10 +-
 .../app/src/main/res/xml-land/preferences.xml |  9 +-
 .../app/src/main/res/xml-v27/preferences.xml  | 11 ++-
 project/app/src/main/res/xml/preferences.xml  |  9 +-
 38 files changed, 572 insertions(+), 274 deletions(-)
 create mode 100644 project/app/src/main/java/com/iven/musicplayergo/music/MusicViewModel.kt
 create mode 100644 project/app/src/main/res/drawable/seekbar_np_thumb.xml

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index 0aa5fca3d..403ab77a5 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1 +1 @@
-custom: ["https://www.paypal.me/enricocid"]
+custom: ["https://www.paypal.me/enricocid", "paypal.me/pools/c/8lCZfNnU0u"]
diff --git a/Contributors.md b/Contributors.md
index 08bb5afb2..56ec65376 100644
--- a/Contributors.md
+++ b/Contributors.md
@@ -40,8 +40,6 @@ Many thanks to all contributors (listed in no particular order :)
 
 - [**zmni**](https://github.com/zmni) for **Indonesian** translations
 
-- [**Heimen Stoffels**](https://github.com/Vistaus) for **Dutch** translations
-
 - [**Malte Kiefer**](https://github.com/beli3ver) for **German** translations
 
 - [**Luis F. Uceta**](https://github.com/uzluisf) for **Spanish** translations
diff --git a/Faq.md b/Faq.md
index 894b3788a..1abfc6218 100644
--- a/Faq.md
+++ b/Faq.md
@@ -15,6 +15,11 @@ It is a lightweight, original, privacy-friendly and **ads-free** music player th
 Music Player GO can be downloaded [here](https://play.google.com/store/apps/details?id=com.iven.musicplayergo) on the Google Play Store and [here](https://f-droid.org/repository/browse/?fdid=com.iven.musicplayergo) on F-Droid. 
 
 
+### How to contribute to translations?
+
+Please have a look [here](https://github.com/enricocid/Music-Player-GO/issues/114) :)
+
+
 ### Sometimes app crashes when opened from background
 
 It could happens on devices with Android versions >= Marshmallow because of the doze mode. Developers are not allowed to setup apps to ignore battery's system optimizations. All You can do is to disable it by yourself:
diff --git a/Libs.md b/Libs.md
index 452f46ec9..f70d28d3d 100644
--- a/Libs.md
+++ b/Libs.md
@@ -8,6 +8,8 @@
 
 - [**recyclical**](https://github.com/afollestad/recyclical) by [**Aidan Afollestad**](https://github.com/afollestad)
 
+- [**Edge-to-Edge**](https://github.com/beworker/edge-to-edge) by [**Sergej Shafarenka**](https://github.com/beworker)
+
 - [**Screener - Better screenshots**](https://play.google.com/store/apps/details?id=de.toastcode.screener) app by [**Toastcode**](https://toastco.de/)
 
 - [**Round icons**](https://material.io/tools/icons/?style=round) by Google
diff --git a/project/app/build.gradle b/project/app/build.gradle
index 774694953..a4cdfddd1 100644
--- a/project/app/build.gradle
+++ b/project/app/build.gradle
@@ -37,7 +37,6 @@ android {
 
     lintOptions {
         disable 'MissingTranslation'
-        disable 'UnusedAttribute'
     }
 }
 
@@ -46,9 +45,8 @@ dependencies {
 
     api 'com.google.android.material:material:1.0.0'
 
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.2.1'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.1.1'
     implementation 'androidx.core:core-ktx:1.1.0'
+    implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0'
     implementation 'androidx.media:media:1.1.0'
     implementation 'androidx.preference:preference-ktx:1.1.0'
 
@@ -60,5 +58,5 @@ dependencies {
     implementation 'com.afollestad.material-dialogs:core:3.1.1'
     implementation 'com.afollestad.material-dialogs:bottomsheets:3.1.1'
     implementation 'com.afollestad:recyclical:1.1.1'
-    implementation 'com.oze.music:MusicBar:1.0.5'
+    implementation 'de.halfbit:edge-to-edge:0.8'
 }
diff --git a/project/app/src/main/AndroidManifest.xml b/project/app/src/main/AndroidManifest.xml
index 2e2fa5d08..6df905d78 100644
--- a/project/app/src/main/AndroidManifest.xml
+++ b/project/app/src/main/AndroidManifest.xml
@@ -6,7 +6,6 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
-    <uses-permission android:name="android.permission.ACCESS_MEDIA_LOCATION"/>
 
     <application
             android:name=".MusicPlayerGoApp"
@@ -14,7 +13,6 @@
             android:icon="@mipmap/ic_launcher"
             android:label="@string/app_name"
             android:roundIcon="@mipmap/ic_launcher_round"
-            android:requestLegacyExternalStorage="true"
             android:theme="@style/BaseTheme.Default"
             tools:ignore="AllowBackup,GoogleAppIndexingWarning">
 
@@ -42,8 +40,16 @@
                 <data android:scheme="file"/>
                 <data android:mimeType="audio/*"/>
             </intent-filter>
+
         </activity>
-        <service android:name=".player.PlayerService"/>
+
+        <service android:name=".player.PlayerService" />
+
+        <receiver android:name="androidx.media.session.MediaButtonReceiver" >
+            <intent-filter>
+                <action android:name="android.intent.action.MEDIA_BUTTON" />
+            </intent-filter>
+        </receiver>
     </application>
 
 </manifest>
diff --git a/project/app/src/main/java/com/iven/musicplayergo/MainActivity.kt b/project/app/src/main/java/com/iven/musicplayergo/MainActivity.kt
index ad150c4c5..0d4693bff 100644
--- a/project/app/src/main/java/com/iven/musicplayergo/MainActivity.kt
+++ b/project/app/src/main/java/com/iven/musicplayergo/MainActivity.kt
@@ -7,6 +7,7 @@ import android.content.Intent
 import android.content.ServiceConnection
 import android.content.pm.PackageManager
 import android.content.res.ColorStateList
+import android.graphics.Color
 import android.os.Build
 import android.os.Bundle
 import android.os.IBinder
@@ -19,6 +20,8 @@ import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentPagerAdapter
+import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProviders
 import androidx.viewpager.widget.ViewPager
 import com.afollestad.materialdialogs.LayoutMode
 import com.afollestad.materialdialogs.MaterialDialog
@@ -31,13 +34,15 @@ import com.iven.musicplayergo.adapters.QueueAdapter
 import com.iven.musicplayergo.fragments.*
 import com.iven.musicplayergo.music.Music
 import com.iven.musicplayergo.music.MusicUtils
+import com.iven.musicplayergo.music.MusicViewModel
 import com.iven.musicplayergo.player.*
 import com.iven.musicplayergo.ui.ThemeHelper
 import com.iven.musicplayergo.ui.UIControlInterface
 import com.iven.musicplayergo.ui.Utils
+import de.halfbit.edgetoedge.Edge
+import de.halfbit.edgetoedge.edgeToEdge
 import kotlinx.android.synthetic.main.main_activity.*
 import kotlinx.android.synthetic.main.player_controls_panel.*
-import kotlinx.coroutines.*
 import kotlin.properties.Delegates
 
 const val RESTORE_SETTINGS_FRAGMENT = "restore_settings_fragment_key"
@@ -48,7 +53,7 @@ private const val FOLDERS_FRAGMENT_ACTIVE = "2"
 private const val SETTINGS_FRAGMENT_ACTIVE = "3"
 
 @Suppress("UNUSED_PARAMETER")
-class MainActivity : AppCompatActivity(), UIControlInterface, CoroutineScope by MainScope() {
+class MainActivity : AppCompatActivity(), UIControlInterface {
 
     //colors
     private var mResolvedAccentColor: Int by Delegates.notNull()
@@ -110,6 +115,10 @@ class MainActivity : AppCompatActivity(), UIControlInterface, CoroutineScope by
 
     //music player things
 
+    private val mMusicViewModel: MusicViewModel by lazy {
+        ViewModelProviders.of(this).get(MusicViewModel::class.java)
+    }
+
     private var mAllDeviceSongs: MutableList<Music>? = null
 
     //booleans
@@ -213,14 +222,6 @@ class MainActivity : AppCompatActivity(), UIControlInterface, CoroutineScope by
             ) else launchMusicLoading()
     }
 
-    override fun onWindowFocusChanged(hasFocus: Boolean) {
-        super.onWindowFocusChanged(hasFocus)
-        if (goPreferences.isEdgeToEdge && !sDeviceLand && window != null) ThemeHelper.handleEdgeToEdge(
-            window,
-            mainView
-        )
-    }
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -232,6 +233,19 @@ class MainActivity : AppCompatActivity(), UIControlInterface, CoroutineScope by
         //init views
         getViewsAndResources()
 
+        if (goPreferences.isEdgeToEdge) {
+            window?.apply {
+                if (!Utils.isAndroidQ()) {
+                    statusBarColor = Color.TRANSPARENT
+                    navigationBarColor = Color.TRANSPARENT
+                }
+                ThemeHelper.handleLightSystemBars(decorView)
+            }
+            edgeToEdge {
+                mainView.fit { Edge.Top + Edge.Bottom }
+            }
+        }
+
         setupControlsPanelSpecs()
 
         initMediaButtons()
@@ -283,42 +297,18 @@ class MainActivity : AppCompatActivity(), UIControlInterface, CoroutineScope by
     }
 
     private fun launchMusicLoading() {
-        launch {
-            callLoadAllMusic()
-        }
-    }
-
-    private suspend fun callLoadAllMusic() {
 
-        val result = loadAllMusic()
-
-        withContext(Dispatchers.Main) {
+        mMusicViewModel.musicLiveData.observe(this, Observer { result ->
             if (!result.isNullOrEmpty()) {
-
                 mAllDeviceSongs = result
-
+                musicLibrary.buildLibrary(this, mAllDeviceSongs)
                 finishSetup()
-
             } else {
-
-                Utils.makeToast(
-                    this@MainActivity,
-                    getString(R.string.error_unknown),
-                    Toast.LENGTH_LONG
-                )
-                finishAndRemoveTask()
+                Utils.notifyLoadingError(this)
             }
-        }
-    }
-
-    private suspend fun loadAllMusic(): MutableList<Music>? {
-        return withContext(Dispatchers.Default) {
-
-            val music = musicLibrary.queryForMusic(this@MainActivity)
-            if (!music.isNullOrEmpty()) musicLibrary.buildLibrary(this@MainActivity, music)
+        })
 
-            return@withContext music
-        }
+        mMusicViewModel.loadMusic()
     }
 
     private fun finishSetup() {
@@ -533,7 +523,7 @@ class MainActivity : AppCompatActivity(), UIControlInterface, CoroutineScope by
     /**
     UI related methods
      */
-    private fun setFixedMusicBarProgressListener() {
+    private fun setSeekBarProgressListener() {
 
         mSeekBarNP.setOnSeekBarChangeListener(
             object : SeekBar.OnSeekBarChangeListener {
@@ -675,7 +665,7 @@ class MainActivity : AppCompatActivity(), UIControlInterface, CoroutineScope by
                     ThemeHelper.updateIconTint(mVolumeNP, mResolvedDisabledIconsColor)
                 }
 
-                setFixedMusicBarProgressListener()
+                setSeekBarProgressListener()
 
                 mRatesTextNP = customView.findViewById(R.id.np_rates)
                 updateNowPlayingInfo()
@@ -683,12 +673,17 @@ class MainActivity : AppCompatActivity(), UIControlInterface, CoroutineScope by
                 onDismiss {
                     mSeekBarNP.setOnSeekBarChangeListener(null)
                 }
-            }
 
-            if (goPreferences.isEdgeToEdge && !sDeviceLand && mNowPlayingDialog.window != null) ThemeHelper.handleEdgeToEdge(
-                mNowPlayingDialog.window,
-                mNowPlayingDialog.view
-            )
+                if (goPreferences.isEdgeToEdge && !sDeviceLand) {
+                    window?.apply {
+                        ThemeHelper.handleLightSystemBars(decorView)
+                        edgeToEdge {
+                            customView.fit { Edge.Bottom }
+                            decorView.fit { Edge.Top }
+                        }
+                    }
+                }
+            }
         }
     }
 
@@ -736,7 +731,7 @@ class MainActivity : AppCompatActivity(), UIControlInterface, CoroutineScope by
 
                 } else {
 
-                    isSongRestoredFromPrefs = goPreferences.latestPlayedSong != null
+                    isSongRestoredFromPrefs = MusicUtils.getSavedSong() != null
 
                     val song =
                         if (isSongRestoredFromPrefs) MusicUtils.getSavedSong()
@@ -835,7 +830,7 @@ class MainActivity : AppCompatActivity(), UIControlInterface, CoroutineScope by
 
         mSeekBarNP.max = selectedSong.duration.toInt()
 
-        MusicUtils.getBitrate(selectedSong.path)?.let {
+        MusicUtils.getBitrate(MusicUtils.getContentUri(selectedSong.id!!), contentResolver)?.let {
             mRatesTextNP.text = getString(R.string.rates, it.first, it.second)
         }
 
diff --git a/project/app/src/main/java/com/iven/musicplayergo/MusicPlayerGoPreferences.kt b/project/app/src/main/java/com/iven/musicplayergo/MusicPlayerGoPreferences.kt
index 9e4bd7d0c..0815d5186 100644
--- a/project/app/src/main/java/com/iven/musicplayergo/MusicPlayerGoPreferences.kt
+++ b/project/app/src/main/java/com/iven/musicplayergo/MusicPlayerGoPreferences.kt
@@ -1,6 +1,7 @@
 package com.iven.musicplayergo
 
 import android.content.Context
+import android.os.Build
 import androidx.preference.PreferenceManager
 import com.google.gson.GsonBuilder
 import com.google.gson.reflect.TypeToken
@@ -68,7 +69,10 @@ class MusicPlayerGoPreferences(context: Context) {
         set(value) = mPrefs.edit().putInt(prefsAccent, value).apply()
 
     var isEdgeToEdge
-        get() = mPrefs.getBoolean(prefsEdgeToEdge, true)
+        get() = mPrefs.getBoolean(
+            prefsEdgeToEdge,
+            true
+        ) && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1
         set(value) = mPrefs.edit().putBoolean(prefsEdgeToEdge, value).apply()
 
     var isTabsEnabled
diff --git a/project/app/src/main/java/com/iven/musicplayergo/fragments/FoldersFragment.kt b/project/app/src/main/java/com/iven/musicplayergo/fragments/FoldersFragment.kt
index ae91df9bb..a14a9bc7a 100644
--- a/project/app/src/main/java/com/iven/musicplayergo/fragments/FoldersFragment.kt
+++ b/project/app/src/main/java/com/iven/musicplayergo/fragments/FoldersFragment.kt
@@ -27,7 +27,6 @@ import com.reddit.indicatorfastscroll.FastScrollerThumbView
 import com.reddit.indicatorfastscroll.FastScrollerView
 import kotlinx.android.synthetic.main.fragment_folders.*
 import kotlinx.android.synthetic.main.search_toolbar.*
-import java.io.File
 
 
 /**
@@ -118,7 +117,10 @@ class FoldersFragment : Fragment(), SearchView.OnQueryTextListener {
                         onBind(::GenericViewHolder) { _, item ->
                             // GenericViewHolder is `this` here
                             title.text = item
-                            subtitle.text = getParentFolder(item)
+                            subtitle.text = getString(
+                                R.string.folder_info,
+                                musicLibrary.allSongsByFolder?.getValue(item)?.size
+                            )
                         }
                         onClick {
                             // item is a `val` in `this` here
@@ -184,13 +186,6 @@ class FoldersFragment : Fragment(), SearchView.OnQueryTextListener {
         return false
     }
 
-    //getting parent path of the first song
-    private fun getParentFolder(item: String): String {
-        val songRootPath =
-            musicLibrary.allSongsByFolder?.getValue(item)?.get(0)?.path
-        return File(songRootPath!!).parentFile?.parent.toString()
-    }
-
     @SuppressLint("DefaultLocale")
     private fun setupIndicatorFastScrollerView() {
 
diff --git a/project/app/src/main/java/com/iven/musicplayergo/music/Music.kt b/project/app/src/main/java/com/iven/musicplayergo/music/Music.kt
index 7d8ad3ef4..83651c4fa 100644
--- a/project/app/src/main/java/com/iven/musicplayergo/music/Music.kt
+++ b/project/app/src/main/java/com/iven/musicplayergo/music/Music.kt
@@ -8,6 +8,7 @@ data class Music(
     val displayName: String?,
     val duration: Long,
     val album: String?,
-    val path: String?,
-    val albumId: String?
+    val relativePath: String?,
+    val albumId: String?,
+    val id: Long?
 )
diff --git a/project/app/src/main/java/com/iven/musicplayergo/music/MusicLibrary.kt b/project/app/src/main/java/com/iven/musicplayergo/music/MusicLibrary.kt
index 8dd5671cf..736918791 100644
--- a/project/app/src/main/java/com/iven/musicplayergo/music/MusicLibrary.kt
+++ b/project/app/src/main/java/com/iven/musicplayergo/music/MusicLibrary.kt
@@ -3,6 +3,7 @@ package com.iven.musicplayergo.music
 import android.annotation.SuppressLint
 import android.content.Context
 import android.provider.MediaStore
+import com.iven.musicplayergo.ui.Utils
 
 
 class MusicLibrary {
@@ -22,7 +23,6 @@ class MusicLibrary {
 
     val randomMusic get() = allSongsFiltered?.random()
 
-    @Suppress("DEPRECATION")
     @SuppressLint("InlinedApi")
     fun queryForMusic(context: Context): MutableList<Music>? {
 
@@ -48,10 +48,12 @@ class MusicLibrary {
                     cursor.getColumnIndexOrThrow(MediaStore.Audio.AudioColumns.DURATION)
                 val albumIndex =
                     cursor.getColumnIndexOrThrow(MediaStore.Audio.AudioColumns.ALBUM)
-                val pathIndex =
-                    cursor.getColumnIndexOrThrow(MediaStore.Audio.AudioColumns.DATA)
+                val relativePathIndex =
+                    cursor.getColumnIndexOrThrow(MusicUtils.getPathColumn())
                 val albumIdIndex =
                     cursor.getColumnIndexOrThrow(MediaStore.Audio.AudioColumns.ALBUM_ID)
+                val idIndex =
+                    cursor.getColumnIndexOrThrow(MediaStore.Audio.AudioColumns._ID)
 
                 while (cursor.moveToNext()) {
 
@@ -63,8 +65,14 @@ class MusicLibrary {
                     val audioDisplayName = cursor.getString(displayNameIndex)
                     val audioDuration = cursor.getLong(durationIndex)
                     val audioAlbum = cursor.getString(albumIndex)
-                    val audioPath = cursor.getString(pathIndex)
+                    val audioRelativePath = cursor.getString(relativePathIndex)
                     val audioAlbumId = cursor.getString(albumIdIndex)
+                    val audioId = cursor.getLong(idIndex)
+
+                    val audioFolderName =
+                        if (Utils.isAndroidQ()) audioRelativePath else MusicUtils.getFolderName(
+                            audioRelativePath
+                        )
 
                     // Add the current music to the list
                     allSongsUnfiltered?.add(
@@ -76,8 +84,9 @@ class MusicLibrary {
                             audioDisplayName,
                             audioDuration,
                             audioAlbum,
-                            audioPath,
-                            audioAlbumId
+                            audioFolderName,
+                            audioAlbumId,
+                            audioId
                         )
                     )
                 }
@@ -90,8 +99,6 @@ class MusicLibrary {
     }
 
     // Extension method to sort the device music
-    @Suppress("DEPRECATION")
-    @SuppressLint("InlinedApi")
     fun buildLibrary(
         context: Context,
         loadedSongs: MutableList<Music>?
@@ -115,7 +122,7 @@ class MusicLibrary {
         }
 
         allSongsByFolder = allSongsFiltered?.groupBy {
-            MusicUtils.getFolderName(it.path!!)
+            it.relativePath!!
         }
 
         return allAlbumsByArtist
diff --git a/project/app/src/main/java/com/iven/musicplayergo/music/MusicUtils.kt b/project/app/src/main/java/com/iven/musicplayergo/music/MusicUtils.kt
index e15dc84c9..f566f64a2 100644
--- a/project/app/src/main/java/com/iven/musicplayergo/music/MusicUtils.kt
+++ b/project/app/src/main/java/com/iven/musicplayergo/music/MusicUtils.kt
@@ -2,24 +2,44 @@ package com.iven.musicplayergo.music
 
 import android.annotation.SuppressLint
 import android.content.ContentResolver
+import android.content.ContentUris
 import android.content.res.Resources
 import android.database.Cursor
 import android.media.MediaExtractor
 import android.media.MediaFormat
+import android.net.Uri
+import android.os.ParcelFileDescriptor
 import android.provider.MediaStore
 import android.provider.MediaStore.Audio.AudioColumns
 import com.iven.musicplayergo.R
 import com.iven.musicplayergo.goPreferences
 import com.iven.musicplayergo.musicLibrary
 import com.iven.musicplayergo.player.MediaPlayerHolder
+import com.iven.musicplayergo.ui.Utils
 import java.io.File
 import java.util.*
 import java.util.concurrent.TimeUnit
 
 
-@Suppress("DEPRECATION")
 object MusicUtils {
 
+    @JvmStatic
+    fun getContentUri(audioId: Long): Uri {
+        return ContentUris.withAppendedId(
+            MediaStore.Audio.Media.EXTERNAL_CONTENT_URI,
+            audioId
+        )
+    }
+
+    @JvmStatic
+    private fun getAudioFileDescriptor(
+        contentUri: Uri,
+        contentResolver: ContentResolver
+    ): ParcelFileDescriptor? {
+        val readOnlyMode = "r"
+        return contentResolver.openFileDescriptor(contentUri, readOnlyMode)
+    }
+
     @JvmStatic
     fun getSavedSong(): Music? {
         return try {
@@ -151,10 +171,11 @@ object MusicUtils {
         AudioColumns.TRACK, // 2
         AudioColumns.TITLE, // 3
         AudioColumns.DISPLAY_NAME, // 4,
-        AudioColumns.DURATION, // 5
+        AudioColumns.DURATION, //5,
         AudioColumns.ALBUM, // 6
-        AudioColumns.DATA, // 7
-        AudioColumns.ALBUM_ID //8
+        getPathColumn(), // 7
+        AudioColumns.ALBUM_ID, //8
+        AudioColumns._ID //9
     )
 
     @JvmStatic
@@ -166,10 +187,20 @@ object MusicUtils {
     }
 
     @JvmStatic
-    fun getBitrate(path: String?): Pair<Int, Int>? {
+    @Suppress("DEPRECATION")
+    fun getPathColumn(): String {
+        return if (Utils.isAndroidQ()) AudioColumns.BUCKET_DISPLAY_NAME else AudioColumns.DATA
+    }
+
+    @JvmStatic
+    fun getBitrate(contentUri: Uri, contentResolver: ContentResolver): Pair<Int, Int>? {
         val mediaExtractor = MediaExtractor()
         return try {
-            mediaExtractor.setDataSource(path!!)
+
+            getAudioFileDescriptor(contentUri, contentResolver)?.use { pfd ->
+                mediaExtractor.setDataSource(pfd.fileDescriptor)
+            }
+
             val mediaFormat = mediaExtractor.getTrackFormat(0)
 
             val sampleRate = mediaFormat.getInteger(MediaFormat.KEY_SAMPLE_RATE)
@@ -183,8 +214,7 @@ object MusicUtils {
     }
 
     @JvmStatic
-    fun getFolderName(path: String?): String {
-        val file = File(path!!).parentFile
-        return file?.name!!
+    fun getFolderName(path: String?): String? {
+        return File(path!!).parentFile?.name
     }
 }
diff --git a/project/app/src/main/java/com/iven/musicplayergo/music/MusicViewModel.kt b/project/app/src/main/java/com/iven/musicplayergo/music/MusicViewModel.kt
new file mode 100644
index 000000000..3d618d470
--- /dev/null
+++ b/project/app/src/main/java/com/iven/musicplayergo/music/MusicViewModel.kt
@@ -0,0 +1,23 @@
+package com.iven.musicplayergo.music
+
+import android.app.Application
+import androidx.lifecycle.AndroidViewModel
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import com.iven.musicplayergo.musicLibrary
+
+class MusicViewModel(application: Application) : AndroidViewModel(application) {
+
+    val musicLiveData: MutableLiveData<MutableList<Music>> = MutableLiveData()
+
+    private fun performLoadMusic() {
+        val music = musicLibrary.queryForMusic(getApplication())
+        musicLibrary.buildLibrary(getApplication(), music)
+        musicLiveData.value = music
+    }
+
+    fun loadMusic(): LiveData<MutableList<Music>> {
+        performLoadMusic()
+        return musicLiveData
+    }
+}
diff --git a/project/app/src/main/java/com/iven/musicplayergo/player/MediaPlayerHolder.kt b/project/app/src/main/java/com/iven/musicplayergo/player/MediaPlayerHolder.kt
index dbfbea09f..805cb139a 100644
--- a/project/app/src/main/java/com/iven/musicplayergo/player/MediaPlayerHolder.kt
+++ b/project/app/src/main/java/com/iven/musicplayergo/player/MediaPlayerHolder.kt
@@ -11,16 +11,17 @@ import android.media.AudioAttributes
 import android.media.AudioFocusRequest
 import android.media.AudioManager
 import android.media.MediaPlayer
+import android.media.session.PlaybackState
 import android.os.Build
 import android.os.Handler
-import android.os.Parcelable
 import android.os.PowerManager
-import android.view.KeyEvent
+import android.support.v4.media.session.PlaybackStateCompat
 import android.widget.Toast
 import com.iven.musicplayergo.MainActivity
 import com.iven.musicplayergo.R
 import com.iven.musicplayergo.goPreferences
 import com.iven.musicplayergo.music.Music
+import com.iven.musicplayergo.music.MusicUtils
 import com.iven.musicplayergo.ui.Utils
 import java.util.concurrent.Executors
 import java.util.concurrent.ScheduledExecutorService
@@ -48,15 +49,25 @@ private const val HEADSET_DISCONNECTED = 0
 private const val HEADSET_CONNECTED = 1
 
 // Player playing statuses
-const val PLAYING = 0
-const val PAUSED = 1
-const val RESUMED = 2
+const val PLAYING = PlaybackState.STATE_PLAYING
+const val PAUSED = PlaybackState.STATE_PAUSED
+const val RESUMED = PlaybackState.STATE_NONE
 
 @Suppress("DEPRECATION")
 class MediaPlayerHolder(private val playerService: PlayerService) :
     MediaPlayer.OnCompletionListener,
     MediaPlayer.OnPreparedListener {
 
+    private val stateBuilder =
+        PlaybackStateCompat.Builder().setActions(
+            PlaybackStateCompat.ACTION_PLAY
+                    or PlaybackStateCompat.ACTION_STOP
+                    or PlaybackStateCompat.ACTION_PAUSE
+                    or PlaybackStateCompat.ACTION_PLAY_PAUSE
+                    or PlaybackStateCompat.ACTION_SKIP_TO_NEXT
+                    or PlaybackStateCompat.ACTION_SKIP_TO_PREVIOUS
+        )
+
     lateinit var mediaPlayerInterface: MediaPlayerInterface
 
     //audio focus
@@ -120,9 +131,6 @@ class MediaPlayerHolder(private val playerService: PlayerService) :
     var state = PAUSED
     var isPlay = false
 
-    //receivers
-    private lateinit var mMediaButtonsReceiver: MediaButtonIntentReceiver
-
     //notifications
     private lateinit var mNotificationActionsReceiver: NotificationReceiver
     private lateinit var mMusicNotificationManager: MusicNotificationManager
@@ -168,25 +176,6 @@ class MediaPlayerHolder(private val playerService: PlayerService) :
         }
     }
 
-    //https://stackoverflow.com/a/44709784
-    private fun registerMediaButtonsReceiver() {
-        mMediaButtonsReceiver = MediaButtonIntentReceiver()
-        val mediaFilter = IntentFilter(Intent.ACTION_MEDIA_BUTTON).apply {
-            priority = 10000
-        }
-        playerService.registerReceiver(mMediaButtonsReceiver, mediaFilter)
-    }
-
-    private fun unregisterMediaButtonsReceiver() {
-        if (::mMediaButtonsReceiver.isInitialized) {
-            try {
-                playerService.unregisterReceiver(mMediaButtonsReceiver)
-            } catch (e: IllegalArgumentException) {
-                e.printStackTrace()
-            }
-        }
-    }
-
     fun setCurrentSong(song: Music?, songs: List<Music>?, isFromQueue: Boolean) {
         currentSong = Pair(song, isFromQueue)
         mPlayingAlbumSongs = songs
@@ -258,10 +247,17 @@ class MediaPlayerHolder(private val playerService: PlayerService) :
 
     private fun setStatus(status: Int) {
         state = status
+        playerService.getMediaSession().setPlaybackState(
+            stateBuilder.setState(
+                state,
+                PlaybackStateCompat.PLAYBACK_POSITION_UNKNOWN,
+                1F
+            ).build()
+        )
         mediaPlayerInterface.onStateChanged()
     }
 
-    private fun resumeMediaPlayer() {
+    fun resumeMediaPlayer() {
         if (!isPlaying) {
             if (isMediaPlayer) mediaPlayer.start()
             val status = if (isSongRestoredFromPrefs) {
@@ -279,7 +275,7 @@ class MediaPlayerHolder(private val playerService: PlayerService) :
         }
     }
 
-    private fun pauseMediaPlayer() {
+    fun pauseMediaPlayer() {
         setStatus(PAUSED)
         mediaPlayer.pause()
         playerService.stopForeground(false)
@@ -287,7 +283,7 @@ class MediaPlayerHolder(private val playerService: PlayerService) :
         updateNotification()
     }
 
-    private fun repeatSong() {
+    fun repeatSong() {
         isRepeat = false
         updateNotification()
         mediaPlayer.seekTo(0)
@@ -417,12 +413,12 @@ class MediaPlayerHolder(private val playerService: PlayerService) :
 
                 mMusicNotificationManager = playerService.musicNotificationManager
                 tryToGetAudioFocus()
-                registerMediaButtonsReceiver()
+                // registerMediaButtonsReceiver()
 
                 if (goPreferences.isPreciseVolumeEnabled) setPreciseVolume(currentVolumeInPercent)
             }
 
-            mediaPlayer.setDataSource(song?.path)
+            mediaPlayer.setDataSource(playerService, MusicUtils.getContentUri(song?.id!!))
             mediaPlayer.prepare()
 
         } catch (e: Exception) {
@@ -465,7 +461,6 @@ class MediaPlayerHolder(private val playerService: PlayerService) :
             mediaPlayer.release()
             giveUpAudioFocus()
             stopUpdatingCallbackWithPosition()
-            unregisterMediaButtonsReceiver()
         }
         unregisterActionsReceiver()
     }
@@ -609,30 +604,4 @@ class MediaPlayerHolder(private val playerService: PlayerService) :
             if (isOrderedBroadcast) abortBroadcast()
         }
     }
-
-    private inner class MediaButtonIntentReceiver : BroadcastReceiver() {
-
-        override fun onReceive(context: Context, intent: Intent) {
-
-            if (Intent.ACTION_MEDIA_BUTTON != intent.action) {
-                return
-            }
-
-            val event = intent.getParcelableExtra<Parcelable>(Intent.EXTRA_KEY_EVENT) as KeyEvent
-
-            if (event.action == KeyEvent.ACTION_DOWN) { // do something
-                when (event.keyCode) {
-                    KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE -> resumeOrPause()
-                    KeyEvent.KEYCODE_MEDIA_CLOSE -> stopPlaybackService(true)
-                    KeyEvent.KEYCODE_MEDIA_PREVIOUS -> skip(false)
-                    KeyEvent.KEYCODE_MEDIA_NEXT -> skip(true)
-                    KeyEvent.KEYCODE_MEDIA_STOP -> stopPlaybackService(true)
-                    KeyEvent.KEYCODE_MEDIA_REWIND -> repeatSong()
-                    KeyEvent.KEYCODE_MEDIA_PAUSE -> pauseMediaPlayer()
-                    KeyEvent.KEYCODE_MEDIA_PLAY -> resumeMediaPlayer()
-                }
-            }
-            if (isOrderedBroadcast) abortBroadcast()
-        }
-    }
 }
diff --git a/project/app/src/main/java/com/iven/musicplayergo/player/PlayerService.kt b/project/app/src/main/java/com/iven/musicplayergo/player/PlayerService.kt
index 56a90a5ed..42401bc1c 100644
--- a/project/app/src/main/java/com/iven/musicplayergo/player/PlayerService.kt
+++ b/project/app/src/main/java/com/iven/musicplayergo/player/PlayerService.kt
@@ -1,12 +1,19 @@
 package com.iven.musicplayergo.player
 
-import android.app.Service
 import android.content.Intent
 import android.os.Binder
+import android.os.Bundle
 import android.os.IBinder
+import android.os.Parcelable
+import android.support.v4.media.MediaBrowserCompat
+import android.support.v4.media.session.MediaSessionCompat
+import android.view.KeyEvent
+import androidx.media.MediaBrowserServiceCompat
+import com.iven.musicplayergo.R
 import com.iven.musicplayergo.goPreferences
 
-class PlayerService : Service() {
+
+class PlayerService : MediaBrowserServiceCompat() {
 
     // Binder given to clients
     private val binder = LocalBinder()
@@ -19,6 +26,39 @@ class PlayerService : Service() {
     lateinit var musicNotificationManager: MusicNotificationManager
     var isRestoredFromPause = false
 
+    private lateinit var mMediaSessionCompat: MediaSessionCompat
+
+    override fun onLoadChildren(
+        parentId: String,
+        result: Result<MutableList<MediaBrowserCompat.MediaItem>>
+    ) {
+        result.sendResult(null)
+    }
+
+    override fun onGetRoot(
+        clientPackageName: String,
+        clientUid: Int,
+        rootHints: Bundle?
+    ): BrowserRoot? {
+        return BrowserRoot(getString(R.string.app_name), null)
+    }
+
+    private val mMediaSessionCallback = object : MediaSessionCompat.Callback() {
+
+        override fun onMediaButtonEvent(mediaButtonEvent: Intent?): Boolean {
+            return handleMediaIntent(mediaButtonEvent)
+        }
+    }
+
+    private fun configureMediaSession() {
+        mMediaSessionCompat = MediaSessionCompat(this, packageName)
+        mMediaSessionCompat.setCallback(mMediaSessionCallback)
+    }
+
+    fun getMediaSession(): MediaSessionCompat {
+        return mMediaSessionCompat
+    }
+
     override fun onDestroy() {
         super.onDestroy()
 
@@ -31,6 +71,7 @@ class PlayerService : Service() {
 
             goPreferences.latestVolume = mediaPlayerHolder.currentVolumeInPercent
 
+            mMediaSessionCompat.release()
             mediaPlayerHolder.release()
         }
     }
@@ -53,8 +94,47 @@ class PlayerService : Service() {
         return binder
     }
 
+    override fun onCreate() {
+        super.onCreate()
+        configureMediaSession()
+    }
+
     inner class LocalBinder : Binder() {
         // Return this instance of PlayerService so we can call public methods
         fun getService() = this@PlayerService
     }
+
+    private fun handleMediaIntent(intent: Intent?): Boolean {
+
+        var isSuccess = false
+
+        intent?.let {
+            val event = intent.getParcelableExtra<Parcelable>(Intent.EXTRA_KEY_EVENT) as KeyEvent
+            if (event.action == KeyEvent.ACTION_DOWN) { // do something
+                when (event.keyCode) {
+                    KeyEvent.KEYCODE_MEDIA_PAUSE, KeyEvent.KEYCODE_MEDIA_PLAY, KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE, KeyEvent.KEYCODE_HEADSETHOOK -> {
+                        mediaPlayerHolder.resumeOrPause()
+                        isSuccess = true
+                    }
+                    KeyEvent.KEYCODE_MEDIA_CLOSE, KeyEvent.KEYCODE_MEDIA_STOP -> {
+                        mediaPlayerHolder.stopPlaybackService(true)
+                        isSuccess = true
+                    }
+                    KeyEvent.KEYCODE_MEDIA_PREVIOUS -> {
+                        mediaPlayerHolder.skip(false)
+                        isSuccess = true
+                    }
+                    KeyEvent.KEYCODE_MEDIA_NEXT -> {
+                        mediaPlayerHolder.skip(true)
+                        isSuccess = true
+                    }
+                    KeyEvent.KEYCODE_MEDIA_REWIND -> {
+                        mediaPlayerHolder.repeatSong()
+                        isSuccess = true
+                    }
+                }
+            }
+        }
+        return isSuccess
+    }
 }
diff --git a/project/app/src/main/java/com/iven/musicplayergo/ui/ThemeHelper.kt b/project/app/src/main/java/com/iven/musicplayergo/ui/ThemeHelper.kt
index 4b9dbd803..8b475e1f9 100644
--- a/project/app/src/main/java/com/iven/musicplayergo/ui/ThemeHelper.kt
+++ b/project/app/src/main/java/com/iven/musicplayergo/ui/ThemeHelper.kt
@@ -1,13 +1,13 @@
 package com.iven.musicplayergo.ui
 
 import android.annotation.SuppressLint
+import android.annotation.TargetApi
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.content.res.ColorStateList
 import android.content.res.Configuration
 import android.content.res.Resources
-import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
 import android.os.Build
 import android.os.Handler
@@ -15,7 +15,6 @@ import android.text.Html
 import android.text.Spanned
 import android.util.TypedValue
 import android.view.View
-import android.view.Window
 import android.widget.ImageButton
 import androidx.annotation.AttrRes
 import androidx.annotation.ColorInt
@@ -63,37 +62,16 @@ object ThemeHelper {
         return AppCompatDelegate.getDefaultNightMode() == AppCompatDelegate.MODE_NIGHT_YES
     }
 
+    @JvmStatic
     fun getAlphaForAccent(): Int {
         return if (goPreferences.accent != R.color.yellow) 100 else 150
     }
 
     @JvmStatic
-    fun handleEdgeToEdge(window: Window?, view: View) {
-
-        window?.apply {
-            statusBarColor = Color.TRANSPARENT
-            navigationBarColor = Color.TRANSPARENT
-        }
-
-        var flags =
-            View.SYSTEM_UI_FLAG_LAYOUT_STABLE or View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
-
-        view.apply {
-            when {
-                Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1 -> {
-                    val systemBarsFlag =
-                        if (isThemeNight()) 0 else View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR or View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR
-                    flags =
-                        flags or systemBarsFlag
-                }
-                Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q -> {
-                    flags =
-                        View.SYSTEM_UI_FLAG_LAYOUT_STABLE or View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
-                }
-            }
-
-            systemUiVisibility = flags
-        }
+    @TargetApi(Build.VERSION_CODES.O_MR1)
+    fun handleLightSystemBars(view: View) {
+        view.systemUiVisibility =
+            if (isThemeNight()) 0 else View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR or View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR
     }
 
     //fixed array of pairs (first: accent, second: theme)
diff --git a/project/app/src/main/java/com/iven/musicplayergo/ui/Utils.kt b/project/app/src/main/java/com/iven/musicplayergo/ui/Utils.kt
index f249898a5..fe72f131f 100644
--- a/project/app/src/main/java/com/iven/musicplayergo/ui/Utils.kt
+++ b/project/app/src/main/java/com/iven/musicplayergo/ui/Utils.kt
@@ -6,6 +6,7 @@ import android.app.Activity
 import android.content.Context
 import android.content.pm.PackageManager
 import android.net.Uri
+import android.os.Build
 import android.view.Gravity
 import android.view.Menu
 import android.view.MenuItem
@@ -29,11 +30,30 @@ import com.iven.musicplayergo.adapters.QueueAdapter
 import com.iven.musicplayergo.music.Music
 import com.iven.musicplayergo.music.MusicUtils
 import com.iven.musicplayergo.player.MediaPlayerHolder
+import de.halfbit.edgetoedge.Edge
+import de.halfbit.edgetoedge.edgeToEdge
 import java.util.*
 
 @SuppressLint("DefaultLocale")
 object Utils {
 
+    @JvmStatic
+    fun isAndroidQ(): Boolean {
+        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q
+    }
+
+    @JvmStatic
+    fun notifyLoadingError(activity: Activity) {
+        activity.apply {
+            makeToast(
+                activity,
+                activity.getString(R.string.error_unknown),
+                Toast.LENGTH_LONG
+            )
+            finishAndRemoveTask()
+        }
+    }
+
     @JvmStatic
     fun hasToShowPermissionRationale(context: Context): Boolean {
         return ActivityCompat.checkSelfPermission(
@@ -188,10 +208,15 @@ object Utils {
                         context
                     )
                 )
-                if (goPreferences.isEdgeToEdge && window != null) ThemeHelper.handleEdgeToEdge(
-                    window,
-                    view
-                )
+                if (goPreferences.isEdgeToEdge) {
+                    window?.apply {
+                        ThemeHelper.handleLightSystemBars(decorView)
+                        edgeToEdge {
+                            recyclerView.fit { Edge.Bottom }
+                            decorView.fit { Edge.Top }
+                        }
+                    }
+                }
             }
         }
         return Pair(dialog, dialog.getListAdapter() as QueueAdapter)
@@ -319,10 +344,15 @@ object Utils {
                         context
                     )
                 )
-                if (goPreferences.isEdgeToEdge && window != null) ThemeHelper.handleEdgeToEdge(
-                    window,
-                    view
-                )
+                if (goPreferences.isEdgeToEdge) {
+                    window?.apply {
+                        ThemeHelper.handleLightSystemBars(decorView)
+                        edgeToEdge {
+                            recyclerView.fit { Edge.Bottom }
+                            decorView.fit { Edge.Top }
+                        }
+                    }
+                }
             }
         }
     }
@@ -355,6 +385,7 @@ object Utils {
                 goPreferences.lovedSongs = lovedSongs
                 lovedSongsAdapter.swapSongs(lovedSongs)
             }
+
             negativeButton {}
         }
     }
diff --git a/project/app/src/main/res/drawable/seekbar_np_thumb.xml b/project/app/src/main/res/drawable/seekbar_np_thumb.xml
new file mode 100644
index 000000000..9a7a18a4e
--- /dev/null
+++ b/project/app/src/main/res/drawable/seekbar_np_thumb.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle"
+    android:thickness="4dp"
+    android:tint="?attr/colorPrimary"
+    android:useLevel="false">
+    <corners android:radius="8dp" />
+    <size
+        android:width="4dp"
+        android:height="@android:dimen/app_icon_size" />
+</shape>
diff --git a/project/app/src/main/res/drawable/seekbar_np_track.xml b/project/app/src/main/res/drawable/seekbar_np_track.xml
index f8ebed547..3ebb3006c 100644
--- a/project/app/src/main/res/drawable/seekbar_np_track.xml
+++ b/project/app/src/main/res/drawable/seekbar_np_track.xml
@@ -6,29 +6,11 @@
         <shape
             android:shape="rectangle"
             android:tint="?attr/colorPrimary">
-            <corners android:radius="8dp" />
             <size android:height="@android:dimen/app_icon_size" />
-            <solid android:color="?attr/colorControlNormal" />
+            <gradient
+                android:angle="0"
+                android:endColor="@color/seekbarBgColorLight"
+                android:startColor="@color/seekbarBgColorDark" />
         </shape>
     </item>
-    <item
-        android:id="@android:id/progress"
-        android:gravity="center_vertical">
-        <scale android:scaleWidth="100%">
-            <selector>
-                <item
-                    android:drawable="@android:color/transparent"
-                    android:state_enabled="false" />
-                <item>
-                    <shape
-                        android:shape="rectangle"
-                        android:tint="?attr/colorPrimary">
-                        <corners android:radius="8dp" />
-                        <size android:height="@android:dimen/app_icon_size" />
-                        <solid android:color="?attr/colorPrimary" />
-                    </shape>
-                </item>
-            </selector>
-        </scale>
-    </item>
 </layer-list>
diff --git a/project/app/src/main/res/layout-land/fragment_details.xml b/project/app/src/main/res/layout-land/fragment_details.xml
index 0f1b6b97a..689a0909d 100644
--- a/project/app/src/main/res/layout-land/fragment_details.xml
+++ b/project/app/src/main/res/layout-land/fragment_details.xml
@@ -62,9 +62,9 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
+                android:layout_marginBottom="4dp"
                 android:paddingStart="12dp"
                 android:paddingEnd="12dp"
-                android:layout_marginBottom="4dp"
                 android:singleLine="true"
                 android:textAppearance="@android:style/TextAppearance.Material.Caption"
                 android:textColor="?android:attr/textColorSecondary" />
diff --git a/project/app/src/main/res/layout-land/now_playing.xml b/project/app/src/main/res/layout-land/now_playing.xml
index 16a4b3e29..535ae2cec 100644
--- a/project/app/src/main/res/layout-land/now_playing.xml
+++ b/project/app/src/main/res/layout-land/now_playing.xml
@@ -16,6 +16,7 @@
         <LinearLayout
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp"
             android:layout_weight="1"
             android:background="@drawable/ripple"
             android:onClick="openPlayingArtistAlbum"
@@ -81,22 +82,23 @@
                     android:layout_height="wrap_content"
                     android:clickable="false"
                     android:focusable="false"
-                    android:paddingStart="8dp"
-                    android:paddingEnd="8dp"
+                    android:paddingStart="0dp"
+                    android:paddingEnd="0dp"
                     android:progressDrawable="@drawable/seekbar_np_track"
                     android:splitTrack="false"
-                    android:thumbOffset="0dp"
-                    android:thumbTint="@android:color/transparent" />
+                    android:thumb="@drawable/seekbar_np_thumb"
+                    android:thumbOffset="0dp" />
 
                 <TextView
                     android:id="@+id/np_rates"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
+                    android:alpha="0.5"
                     android:fontFamily="@font/raleway_bold_italic"
                     android:textAlignment="center"
                     android:textAppearance="@android:style/TextAppearance.Material.Caption"
-                    android:textColor="@color/ratesColor" />
+                    android:textColor="?android:attr/textColorPrimary" />
             </FrameLayout>
 
             <LinearLayout
diff --git a/project/app/src/main/res/layout-land/now_playing_controls.xml b/project/app/src/main/res/layout-land/now_playing_controls.xml
index 30fc04230..ae8e9119f 100644
--- a/project/app/src/main/res/layout-land/now_playing_controls.xml
+++ b/project/app/src/main/res/layout-land/now_playing_controls.xml
@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="0dp"
     android:layout_height="match_parent"
+    android:layout_marginBottom="8dp"
     android:layout_weight="1"
     android:gravity="center"
     android:orientation="horizontal">
@@ -33,10 +34,10 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:padding="16dp"
-        android:scaleType="fitCenter"
         android:adjustViewBounds="true"
         android:background="?android:attr/actionBarItemBackground"
+        android:padding="16dp"
+        android:scaleType="fitCenter"
         android:src="@drawable/ic_play"
         tools:ignore="ContentDescription" />
 
diff --git a/project/app/src/main/res/layout-land/now_playing_extended_controls.xml b/project/app/src/main/res/layout-land/now_playing_extended_controls.xml
index b9cc3a243..aeba4e023 100644
--- a/project/app/src/main/res/layout-land/now_playing_extended_controls.xml
+++ b/project/app/src/main/res/layout-land/now_playing_extended_controls.xml
@@ -38,9 +38,9 @@
         android:layout_gravity="center"
         android:layout_marginStart="4dp"
         android:background="@android:color/transparent"
-        android:src="@drawable/ic_volume_up"
         android:clickable="false"
         android:focusable="false"
+        android:src="@drawable/ic_volume_up"
         tools:ignore="ContentDescription" />
 
 </LinearLayout>
diff --git a/project/app/src/main/res/layout/now_playing.xml b/project/app/src/main/res/layout/now_playing.xml
index 94540cd52..171503886 100644
--- a/project/app/src/main/res/layout/now_playing.xml
+++ b/project/app/src/main/res/layout/now_playing.xml
@@ -59,22 +59,23 @@
             android:layout_height="wrap_content"
             android:clickable="false"
             android:focusable="false"
-            android:paddingStart="8dp"
-            android:paddingEnd="8dp"
+            android:paddingStart="0dp"
+            android:paddingEnd="0dp"
             android:progressDrawable="@drawable/seekbar_np_track"
             android:splitTrack="false"
-            android:thumbOffset="0dp"
-            android:thumbTint="@android:color/transparent" />
+            android:thumb="@drawable/seekbar_np_thumb"
+            android:thumbOffset="0dp" />
 
         <TextView
             android:id="@+id/np_rates"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
+            android:alpha="0.5"
             android:fontFamily="@font/raleway_bold_italic"
             android:textAlignment="center"
             android:textAppearance="@android:style/TextAppearance.Material.Caption"
-            android:textColor="@color/ratesColor" />
+            android:textColor="?android:attr/textColorPrimary" />
     </FrameLayout>
 
     <LinearLayout
diff --git a/project/app/src/main/res/layout/now_playing_controls.xml b/project/app/src/main/res/layout/now_playing_controls.xml
index f9c9aef9a..cc1ef9a3b 100644
--- a/project/app/src/main/res/layout/now_playing_controls.xml
+++ b/project/app/src/main/res/layout/now_playing_controls.xml
@@ -33,11 +33,11 @@
         android:id="@+id/np_play"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:padding="20dp"
-        android:scaleType="fitCenter"
-        android:adjustViewBounds="true"
         android:layout_weight="1"
+        android:adjustViewBounds="true"
         android:background="?android:attr/actionBarItemBackground"
+        android:padding="20dp"
+        android:scaleType="fitCenter"
         android:src="@drawable/ic_play"
         tools:ignore="ContentDescription" />
 
diff --git a/project/app/src/main/res/layout/now_playing_extended_controls.xml b/project/app/src/main/res/layout/now_playing_extended_controls.xml
index 1be18eab0..0a8deded5 100644
--- a/project/app/src/main/res/layout/now_playing_extended_controls.xml
+++ b/project/app/src/main/res/layout/now_playing_extended_controls.xml
@@ -6,8 +6,7 @@
     android:layout_height="wrap_content"
     android:gravity="center"
     android:orientation="horizontal"
-    android:padding="16dp"
-    android:layout_marginBottom="16dp">
+    android:padding="16dp">
 
     <ImageButton
         android:id="@+id/np_love"
@@ -36,9 +35,9 @@
         android:layout_gravity="center"
         android:layout_marginStart="16dp"
         android:background="@android:color/transparent"
-        android:src="@drawable/ic_volume_up"
         android:clickable="false"
         android:focusable="false"
+        android:src="@drawable/ic_volume_up"
         tools:ignore="ContentDescription" />
 
 </LinearLayout>
diff --git a/project/app/src/main/res/values-fr/strings.xml b/project/app/src/main/res/values-fr/strings.xml
index 6993ba2a3..345af0471 100644
--- a/project/app/src/main/res/values-fr/strings.xml
+++ b/project/app/src/main/res/values-fr/strings.xml
@@ -1,7 +1,68 @@
 <resources>
-    <string name="no_eq">Aucun égaliseur sur l\'appareil!</string>
-    <string name="bad_id">Démarrer une piste musicale d\'abord!</string>
-    <string name="no_browser">No navigateur trouvé!</string>
+    <!-- Main - Artists -->
+    <string name="artists">Artistes</string>
+    <string name="artist_info">%1d&#160;Albums,&#160;%2d&#160;Titres</string>
+    <string name="folder_info">%1d&#160;Titres</string>
+    <!-- Main - All songs -->
+    <string name="songs">Titres</string>
+    <string name="shuffle_am">Lecture aléatoire de tous les titres</string>
+    <string name="shuffle_sa">Lecture aléatoire de l\'album</string>
+    <!-- Main - Folders -->
+    <string name="folders">Dossiers</string>
+    <!-- Queue -->
+    <string name="queue">File d\'attente</string>
+    <string name="queue_add">Ajouter à la file d\'attente</string>
+    <string name="queue_song_add">%1s ajouté à la file d\'attente!</string>
+    <string name="queue_song_remove">%1s va être retiré de la file d\'attente. Continuer?</string>
+    <string name="queue_songs_clear">La file d\'attente va être effacée. Continuer?</string>
+    <string name="error_no_queue">Aucun titre dans la file d\'attente!</string>
+    <!-- Loved songs -->
+    <string name="loved_songs">Titres favoris</string>
+    <string name="loved_song_added">%1s (%2s) ajouté aux titres favoris</string>
+    <string name="loved_song_remove">%1s (%2s) va être retiré des titres favoris. Continuer?</string>
+    <string name="loved_songs_clear">La liste des titres favoris va être effacée. Continuer?</string>
+    <string name="loved_song_add">Ajouter aux titres favoris</string>
+    <string name="error_no_loved_songs">Aucun titre favoris!</string>
+    <!-- Messages -->
     <string name="perm_rationale">Pour vous permettre de lire la musique sur votre appareil, Music Player GO a besoin d\'accèder à vos fichiers</string>
-    <string name="artist_info">%1d&#160;Albums,&#160;%2d&#160;Pistes</string>
+    <string name="no_browser">Aucun navigateur n\'a été trouvé!</string>
+    <string name="bad_id">Lancez d\'abord la lecture d\'un titre!</string>
+    <string name="no_eq">Aucun égaliseur n\'a été trouvé!</string>
+    <string name="error_unknown">Une erreur s\'est produite! :(</string>
+    <string name="error_unknown_unsupported">Une erreur s\'est produite! :( Peut-être que le format sélectionné n\'est pas supporté, ou que le dossier n\'est pas accessible (Ce n\'est pas de la faute de l\'application&#160;!).</string>
+    <string name="on_close_activity">Voulez-vous arrêter la lecture?</string>
+    <string name="repeat_enabled">Répétition x1 activée!</string>
+    <string name="repeat_disabled">Répétition x1 désactivée!</string>
+    <!-- Settings -->
+    <!-- Preferences -->
+    <string name="settings">Paramètres</string>
+    <string name="category_appearance">Apparence</string>
+    <string name="category_general">Général</string>
+    <string name="open_git_pref_title">Page GitHub</string>
+    <string name="open_git_pref_summary">Ouvre la page du projet pour plus d\'informations :)</string>
+    <string name="faq_summary">FAQ et formats supportés :P</string>
+    <string name="theme_pref_title">Thème</string>
+    <string name="theme_pref_light_title">Clair</string>
+    <string name="theme_pref_dark_title">Sombre</string>
+    <string name="theme_pref_auto_title">Automatique</string>
+    <string name="accent_pref_title">Couleur d\'accentuation</string>
+    <string name="edge_pref_summary_on">Désactiver edge-to-edge</string>
+    <string name="edge_pref_summary_off">Activer edge-to-edge</string>
+    <string name="tabs_pref_title">Onglets</string>
+    <string name="tabs_pref_summary_on">Désactiver les onglets</string>
+    <string name="tabs_pref_summary_off">Activer les onglets</string>
+    <string name="active_fragments_pref_title">Onglets actifs</string>
+    <string name="active_fragments_pref_warning">Vous ne pouvez pas retirer tous les onglets! :P</string>
+    <string name="sorting_pref_default">Par défaut</string>
+    <string name="sorting_pref_ascending">A-Z</string>
+    <string name="sorting_pref_descending">Z-A</string>
+    <string name="precise_volume_pref_title">Contrôle précis du volume</string>
+    <string name="precise_volume_pref_summary_on">Activer le contrôle précis du volume</string>
+    <string name="precise_volume_pref_summary_off">Désactiver le contrôle précis du volume</string>
+    <string name="focus_pref_title">Concentration audio</string>
+    <string name="focus_pref_summary_on">Désactiver la gestion de la concentration du volume</string>
+    <string name="focus_pref_summary_off">Activer la gestion de la concentration du volume</string>
+    <string name="headset_pref_title">Branchement du casque</string>
+    <string name="headset_pref_summary_on">Désactiver la gestion du branchement du casque</string>
+    <string name="headset_pref_summary_off">Activer la gestion du branchement du casque</string>
 </resources>
diff --git a/project/app/src/main/res/values-in/strings.xml b/project/app/src/main/res/values-in/strings.xml
index 75c6e3614..b75811c99 100644
--- a/project/app/src/main/res/values-in/strings.xml
+++ b/project/app/src/main/res/values-in/strings.xml
@@ -29,7 +29,7 @@
     <string name="loved_song_remove">%1s (%2s) akan dihapus dari favorit. Lanjutkan?</string>
     <string name="loved_songs_clear">Favorit akan dikosongkan. Lanjutkan?</string>
     <string name="loved_song_add">Tambahkan ke favorit</string>
-    <string name="error_no_loved_songs">Tidak ada favorit yang ditemukan!</string>
+    <string name="error_no_loved_songs">Tidak ada lagu favorit yang ditemukan!</string>
 
     <!-- Messages -->
     <string name="perm_rationale">Music Player GO membutuhkan akses ke berkas musik untuk dapat memutar musik!</string>
@@ -49,7 +49,7 @@
     <string name="category_general">Umum</string>
 
     <string name="open_git_pref_title">Halaman GitHub</string>
-    <string name="open_git_pref_summary">Silakan buka halaman proyek untuk informasi lebih lanjut :)</string>
+    <string name="open_git_pref_summary">Buka halaman proyek untuk informasi lebih lanjut :)</string>
 
     <string name="faq_summary">FAQ dan format media yang didukung :P</string>
 
@@ -60,25 +60,27 @@
 
     <string name="accent_pref_title">Aksen</string>
 
-    <string name="edge_pref_summary_on">Menonaktifkan edge-to-edge</string>
-    <string name="edge_pref_summary_off">Mengaktifkan edge-to-edge</string>
+    <string name="edge_pref_summary_on">Edge-to-edge diaktifkan</string>
+    <string name="edge_pref_summary_off">Edge-to-edge dinonaktifkan</string>
 
     <string name="tabs_pref_title">Tab</string>
-    <string name="tabs_pref_summary_on">Menonaktifkan tab</string>
-    <string name="tabs_pref_summary_off">Menampilkan tab untuk navigasi</string>
+    <string name="tabs_pref_summary_on">Tab navigasi diaktifkan</string>
+    <string name="tabs_pref_summary_off">Tab navigasi dinonaktifkan</string>
 
     <string name="active_fragments_pref_title">Tab aktif</string>
     <string name="active_fragments_pref_warning">Anda tidak bisa membuang semua tab! :P</string>
 
     <string name="sorting_pref_default">Default</string>
-    <string name="sorting_pref_ascending">Naik</string>
-    <string name="sorting_pref_descending">Turun</string>
+
+    <string name="precise_volume_pref_title">Kontrol volume tepat</string>
+    <string name="precise_volume_pref_summary_on">Pengontrol ketepatan volume diaktifkan</string>
+    <string name="precise_volume_pref_summary_off">Pengontrol ketepatan volume dinonaktifkan</string>
 
     <string name="focus_pref_title">Fokus audio</string>
-    <string name="focus_pref_summary_on">Menonaktifkan manajemen fokus audio</string>
-    <string name="focus_pref_summary_off">Mengaktifkan manajemen fokus audio</string>
+    <string name="focus_pref_summary_on">Manajemen fokus audio diaktifkan</string>
+    <string name="focus_pref_summary_off">Manajemen fokus audio dinonaktifkan</string>
 
     <string name="headset_pref_title">Headset</string>
-    <string name="headset_pref_summary_on">Menonaktifkan manajemen headset</string>
-    <string name="headset_pref_summary_off">Mengaktifkan manajemen headset</string>
+    <string name="headset_pref_summary_on">Manajemen headset diaktifkan</string>
+    <string name="headset_pref_summary_off">Manajemen headset dinonaktifkan</string>
 </resources>
diff --git a/project/app/src/main/res/values-it/strings.xml b/project/app/src/main/res/values-it/strings.xml
index 97f3e767b..d557e090d 100644
--- a/project/app/src/main/res/values-it/strings.xml
+++ b/project/app/src/main/res/values-it/strings.xml
@@ -3,7 +3,7 @@
     <!-- Main - Artists -->
     <string name="artists">Artisti</string>
     <string name="artist_info">%1d&#160;Album,&#160;%2d&#160;Canzoni</string>
-    <string name="folder_info">%2d&#160;Canzoni</string>
+    <string name="folder_info">%1d&#160;Canzoni</string>
 
     <!-- Main - All songs -->
     <string name="songs">Canzoni</string>
@@ -69,8 +69,6 @@
     <string name="active_fragments_pref_warning">Non puoi rimuovere tutte le tabs! :P</string>
 
     <string name="sorting_pref_default">Predefinito</string>
-    <string name="sorting_pref_ascending">Ascendente</string>
-    <string name="sorting_pref_descending">Discendente</string>
 
     <string name="precise_volume_pref_title">Controllo preciso del volume</string>
     <string name="precise_volume_pref_summary_on">Disabilita controllo preciso del volume</string>
diff --git a/project/app/src/main/res/values-night/colors.xml b/project/app/src/main/res/values-night/colors.xml
index c874be72a..54c3fe574 100644
--- a/project/app/src/main/res/values-night/colors.xml
+++ b/project/app/src/main/res/values-night/colors.xml
@@ -21,5 +21,6 @@
     <color name="grey">#eeeeee</color>
     <color name="blue_grey">#b0bec5</color>
 
-    <color name="ratesColor">#50FFFFFF</color>
+    <color name="seekbarBgColorDark">#10000000</color>
+    <color name="seekbarBgColorLight">#20000000</color>
 </resources>
diff --git a/project/app/src/main/res/values-nl/strings.xml b/project/app/src/main/res/values-nl/strings.xml
index 46bcc0cbd..0e0c076b2 100644
--- a/project/app/src/main/res/values-nl/strings.xml
+++ b/project/app/src/main/res/values-nl/strings.xml
@@ -3,7 +3,7 @@
     <!-- Main - Artists -->
     <string name="artists">Artiesten</string>
     <string name="artist_info">%1d&#160;Albums,&#160;%2d&#160;Nummers</string>
-    <string name="folder_info">%2d&#160;Nummers</string>
+    <string name="folder_info">%1d&#160;Nummers</string>
 
     <!-- Main - All songs -->
     <string name="songs">Nummers</string>
@@ -69,8 +69,6 @@
     <string name="active_fragments_pref_warning">Je kunt niet álle tabbladen verwijderen! :P</string>
 
     <string name="sorting_pref_default">Standaard</string>
-    <string name="sorting_pref_ascending">Oplopend</string>
-    <string name="sorting_pref_descending">Aflopend</string>
 
     <string name="focus_pref_title">Audiofocus</string>
     <string name="focus_pref_summary_on">Audiofocusbeheer uitschakelen</string>
diff --git a/project/app/src/main/res/values-ru/strings.xml b/project/app/src/main/res/values-ru/strings.xml
index dc9493f02..18c311468 100644
--- a/project/app/src/main/res/values-ru/strings.xml
+++ b/project/app/src/main/res/values-ru/strings.xml
@@ -4,4 +4,55 @@
     <string name="no_browser">Браузер не найден!</string>
     <string name="perm_rationale">Для воспроизведения музыки нужен доступ Music Player-GO к Вашим файлам</string>
     <string name="artist_info">%1d&#160;Aльбомов,&#160;%2d&#160;Песен</string>
+    <string name="active_fragments_pref_title">Активные вкладки</string>
+    <string name="active_fragments_pref_warning">Вы не можете закрыть все вкладки! :D</string>
+    <string name="artists">Исполнители</string>
+    <string name="category_appearance">Внешний вид</string>
+    <string name="category_general">Общее</string>
+    <string name="edge_pref_summary_off">Включить полное заполнение экрана</string>
+    <string name="edge_pref_summary_on">Отключить полное заполнение экрана</string>
+    <string name="error_no_queue">В очереди нет треков!</string>
+    <string name="error_no_loved_songs">В избранном нет треков!</string>
+    <string name="error_unknown">Что-то пошло не так! :(</string>
+    <string name="error_unknown_unsupported">Что-то пошло не так! :( Возможно, формат не поддерживается или папка недоступна (не вина приложения!)</string>
+    <string name="faq_summary">FAQ и поддерживаемые форматы :D</string>
+    <string name="focus_pref_summary_off">Включить управление фокусировкой аудио</string>
+    <string name="focus_pref_summary_on">Выключить управление фокусировкой аудио</string>
+    <string name="folders">Папки</string>
+    <string name="folder_info">%1d Треки</string>
+    <string name="accent_pref_title">Акцент</string>
+    <string name="focus_pref_title">Фокусировка аудио</string>
+    <string name="headset_pref_summary_off">Включить управление гарнитурой</string>
+    <string name="headset_pref_summary_on">Выключить управление гарнитурой</string>
+    <string name="headset_pref_title">Гарнитура</string>
+    <string name="loved_song_add">Добавить в избранное</string>
+    <string name="loved_song_added">%1s (%2s) добавленно в избранное</string>
+    <string name="loved_song_remove">%1s (%2s) будет удалена из избранного. Продолжить?</string>
+    <string name="loved_songs">Избранное</string>
+    <string name="loved_songs_clear">Избранные будут очищенны. Продолжить?</string>
+    <string name="on_close_activity">Вы хотите остановить воспроизведение?</string>
+    <string name="open_git_pref_title">Страница на GitHub</string>
+    <string name="open_git_pref_summary">Откройте страницу проекта для что бы узнать больше :)</string>
+    <string name="precise_volume_pref_summary_off">Включить точный контроль громкости</string>
+    <string name="precise_volume_pref_summary_on">Выключить точный контроль громкости</string>
+    <string name="precise_volume_pref_title">Точный контроль громкости</string>
+    <string name="queue">Очередь</string>
+    <string name="queue_add">Добавить в очередь</string>
+    <string name="queue_song_add">%1s добавлена в очередь!</string>
+    <string name="queue_song_remove">%1s будет удалена из очереди. Продолжить?</string>
+    <string name="queue_songs_clear">Очередь будет очищена. Продолжить?</string>
+    <string name="repeat_disabled">Однократное повторение выключено!</string>
+    <string name="repeat_enabled">Однократное повторение включено!</string>
+    <string name="settings">Настройки</string>
+    <string name="shuffle_am">Перемешать треки</string>
+    <string name="shuffle_sa">Перемешать выбранный альбом</string>
+    <string name="songs">Треки</string>
+    <string name="theme_pref_title">Тема</string>
+    <string name="theme_pref_light_title">Светлая</string>
+    <string name="theme_pref_dark_title">Темная</string>
+    <string name="theme_pref_auto_title">Автоматически</string>
+    <string name="tabs_pref_title">Вкладки</string>
+    <string name="tabs_pref_summary_on">Отключить вкладки</string>
+    <string name="tabs_pref_summary_off">Показать вкладки для переключения сессий</string>
+    <string name="sorting_pref_default">По умолчанию</string>
 </resources>
diff --git a/project/app/src/main/res/values-tr/strings.xml b/project/app/src/main/res/values-tr/strings.xml
index 275e1bef9..38024a468 100644
--- a/project/app/src/main/res/values-tr/strings.xml
+++ b/project/app/src/main/res/values-tr/strings.xml
@@ -1,9 +1,74 @@
-<?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="no_eq">Ekolayzer ayarları bulunamadı!</string>
-    <string name="bad_id">Oynatmak için şarkı seçin!</string>
-    <string name="artist_info">%1d Albüm, %2d Şarkı</string>
-    <string name="no_browser">Tarayıcı uygulaması bulunamadı!</string>
+
+    <!-- Main - Artists -->
+    <string name="artists">Sanatçılar</string>
+    <string name="artist_info">%1d&#160;Albüm,&#160;%2d&#160;Şarkı</string>
+    <string name="folder_info">%1d&#160;Şarkı</string>
+
+    <!-- Main - All songs -->
+    <string name="songs">Şarkılar</string>
+    <string name="shuffle_am">Tüm şarkıları karışık çal</string>
+    <string name="shuffle_sa">Seçilen albümü karışık çal</string>
+
+    <!-- Main - Folders -->
+    <string name="folders">Klasörler</string>
+
+    <!-- Queue -->
+    <string name="queue">Kuyruk</string>
+    <string name="queue_add">Kuyruğa ekle</string>
+    <string name="queue_song_add">%1s kuyruğa eklendi!</string>
+    <string name="queue_song_remove">%1s kuyruktan silinecek. Devam et?</string>
+    <string name="queue_songs_clear">Kuyruk temizlenecek. Devam et?</string>
+    <string name="error_no_queue">Kuyrukta şarkı bulunamadı!</string>
+
+    <!-- Loved songs -->
+    <string name="loved_songs">Favori şarkılar</string>
+    <string name="loved_song_added">%1s (%2s) favori şarkılara eklendi</string>
+    <string name="loved_song_remove">%1s (%2s) favori şarkılardan silinecek. Devam et?</string>
+    <string name="loved_songs_clear">Favori şarkılar temizlenecek. Devam et?</string>
+    <string name="loved_song_add">Favori şarkılara eklendi</string>
+    <string name="error_no_loved_songs">Favori şarkı bulunamadı!</string>
+
+    <!-- Messages -->
     <string name="perm_rationale">Music Player GO\'nun müziklerinizi oynatması için dosyalarınıza erişmesi gerekiyor!</string>
+    <string name="no_browser">Tarayıcı uygulaması bulunamadı!</string>
+    <string name="bad_id">Oynatmak için şarkı seçin!</string>
+    <string name="no_eq">Ekolayzer bulunamadı!</string>
     <string name="error_unknown">Bir şeyler yanlış gitti! :(</string>
+    <string name="error_unknown_unsupported">Bir şeyler yanlış gitti! :( Muhtemelen seçilen biçim desteklenmiyor veya klasöre erişilemiyor (uygulamanın hatası değil!)</string>
+    <string name="on_close_activity">Oynatmayı durdurmak ister misin?</string>
+    <string name="repeat_enabled">Tekrar etme aktif</string>
+    <string name="repeat_disabled">Tekrar etme devre dışı!</string>
+
+    <!-- Preferences -->
+    <string name="settings">Ayarlar</string>
+    <string name="category_appearance">Görünüm</string>
+    <string name="category_general">Genel</string>
+    <string name="open_git_pref_title">GitHub Sayfası</string>
+    <string name="open_git_pref_summary">Daha fazla bilgi için projenin sayfasını açın :)</string>
+    <string name="faq_summary">SSS ve desteklenen medya formatları :P</string>
+    <string name="theme_pref_title">Tema</string>
+    <string name="theme_pref_light_title">Açık</string>
+    <string name="theme_pref_dark_title">Koyu</string>
+    <string name="theme_pref_auto_title">Otomatik</string>
+    <string name="accent_pref_title">Ana Renk</string>
+    <string name="edge_pref_summary_on">Edge-to-edge\’i devre dışı bırak</string>
+    <string name="edge_pref_summary_off">Edge-to-edge\’i aktif et</string>
+    <string name="tabs_pref_title">Sekmeler</string>
+    <string name="tabs_pref_summary_on">Sekmeleri devre dışı bırak</string>
+    <string name="tabs_pref_summary_off">Bölümlerde gezinmek için sekmeleri göster</string>
+    <string name="active_fragments_pref_title">Aktif sekmeler</string>
+    <string name="active_fragments_pref_warning">Bütün sekmeleri kaldıramazsınız! : P</string>
+    <string name="sorting_pref_default">Varsayılan</string>
+    <string name="sorting_pref_ascending">Artan</string>
+    <string name="sorting_pref_descending">Azalan</string>
+    <string name="precise_volume_pref_title">Hassas ses kontrolü</string>
+    <string name="precise_volume_pref_summary_on">Hassas ses kontrolünü devre dışı bırak</string>
+    <string name="precise_volume_pref_summary_off">Hassas ses kontrolünü aktif et</string>
+    <string name="focus_pref_title">Ses odaklama</string>
+    <string name="focus_pref_summary_on">Ses odaklamasını devre dışı bırak</string>
+    <string name="focus_pref_summary_off">Ses odaklamasını aktif et</string>
+    <string name="headset_pref_title">Kulaklık girişi</string>
+    <string name="headset_pref_summary_on">Kulaklık girişi yönetimini devre dışı bırak</string>
+    <string name="headset_pref_summary_off">Kulaklık girişi yönetimini aktif et</string>
 </resources>
diff --git a/project/app/src/main/res/values/colors.xml b/project/app/src/main/res/values/colors.xml
index 3292fff19..2e3b83574 100644
--- a/project/app/src/main/res/values/colors.xml
+++ b/project/app/src/main/res/values/colors.xml
@@ -40,5 +40,6 @@
     <color name="greyPrimaryDark">#707070</color>
     <color name="blueGreyPrimaryDark">#34515e</color>
 
-    <color name="ratesColor">#50000000</color>
+    <color name="seekbarBgColorDark">#10ffffff</color>
+    <color name="seekbarBgColorLight">#20ffffff</color>
 </resources>
diff --git a/project/app/src/main/res/values/strings.xml b/project/app/src/main/res/values/strings.xml
index 7f37638a5..99e4cb88a 100644
--- a/project/app/src/main/res/values/strings.xml
+++ b/project/app/src/main/res/values/strings.xml
@@ -11,7 +11,7 @@
     <!-- Main - Artists -->
     <string name="artists">Artists</string>
     <string name="artist_info">%1d&#160;Albums,&#160;%2d&#160;Tracks</string>
-    <string name="folder_info">%2d&#160;Tracks</string>
+    <string name="folder_info">%1d&#160;Tracks</string>
 
     <!-- Main - All songs -->
     <string name="songs">Songs</string>
@@ -62,8 +62,8 @@
     <string name="category_general">General</string>
 
     <string name="latest_volume_pref" translatable="false">latest_volume_pref</string>
-    <string name="latest_played_song_pref" translatable="false">latest_played_song_pref</string>
-    <string name="loved_songs_pref" translatable="false">loved_songs_pref</string>
+    <string name="latest_played_song_pref" translatable="false">latest_reproduced_song_pref</string>
+    <string name="loved_songs_pref" translatable="false">preferred_songs_pref</string>
 
     <string name="open_git_pref" translatable="false">open_git_pref</string>
     <string name="open_git_pref_title">GitHub page</string>
@@ -109,8 +109,8 @@
     <string name="artists_sorting_pref" translatable="false">artists_sorting_pref</string>
     <string name="folders_sorting_pref" translatable="false">folders_sorting_pref</string>
     <string name="sorting_pref_default">Default</string>
-    <string name="sorting_pref_ascending">Ascending</string>
-    <string name="sorting_pref_descending">Descending</string>
+    <string name="sorting_pref_ascending" translatable="false">A-Z</string>
+    <string name="sorting_pref_descending" translatable="false">Z-A</string>
 
     <string name="precise_volume_pref" translatable="false">precise_volume_pref</string>
     <string name="precise_volume_pref_title">Precise volume control</string>
diff --git a/project/app/src/main/res/xml-land/preferences.xml b/project/app/src/main/res/xml-land/preferences.xml
index 4b6aaded0..cc3324a98 100644
--- a/project/app/src/main/res/xml-land/preferences.xml
+++ b/project/app/src/main/res/xml-land/preferences.xml
@@ -43,6 +43,7 @@
             app:useSimpleSummaryProvider="true" />
 
         <Preference
+            app:enableCopying="true"
             app:icon="@drawable/ic_circle"
             app:key="@string/accent_pref"
             app:title="@string/accent_pref_title" />
@@ -56,7 +57,7 @@
             app:key="@string/active_fragments_pref"
             app:title="@string/active_fragments_pref_title" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:summaryOff="@string/tabs_pref_summary_off"
             app:defaultValue="true"
             app:dialogTitle="@string/tabs_pref_title"
@@ -64,7 +65,7 @@
             app:summaryOn="@string/tabs_pref_summary_on"
             app:title="@string/tabs_pref_title" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:summaryOff="@string/precise_volume_pref_summary_off"
             app:defaultValue="true"
             app:dialogTitle="@string/precise_volume_pref_title"
@@ -72,7 +73,7 @@
             app:summaryOn="@string/precise_volume_pref_summary_on"
             app:title="@string/precise_volume_pref_title" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:summaryOff="@string/focus_pref_summary_off"
             app:defaultValue="true"
             app:dialogTitle="@string/focus_pref_title"
@@ -80,7 +81,7 @@
             app:summaryOn="@string/focus_pref_summary_on"
             app:title="@string/focus_pref_title" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:summaryOff="@string/headset_pref_summary_off"
             app:defaultValue="true"
             app:dialogTitle="@string/headset_pref_title"
diff --git a/project/app/src/main/res/xml-v27/preferences.xml b/project/app/src/main/res/xml-v27/preferences.xml
index ba6e5a7cf..c445bc70c 100644
--- a/project/app/src/main/res/xml-v27/preferences.xml
+++ b/project/app/src/main/res/xml-v27/preferences.xml
@@ -43,11 +43,12 @@
             app:useSimpleSummaryProvider="true" />
 
         <Preference
+            app:enableCopying="true"
             app:icon="@drawable/ic_circle"
             app:key="@string/accent_pref"
             app:title="@string/accent_pref_title" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:summaryOff="@string/edge_pref_summary_off"
             app:defaultValue="true"
             app:dialogTitle="@string/edge_pref_title"
@@ -64,7 +65,7 @@
             app:key="@string/active_fragments_pref"
             app:title="@string/active_fragments_pref_title" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:summaryOff="@string/tabs_pref_summary_off"
             app:defaultValue="true"
             app:dialogTitle="@string/tabs_pref_title"
@@ -72,7 +73,7 @@
             app:summaryOn="@string/tabs_pref_summary_on"
             app:title="@string/tabs_pref_title" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:summaryOff="@string/precise_volume_pref_summary_off"
             app:defaultValue="true"
             app:dialogTitle="@string/precise_volume_pref_title"
@@ -80,7 +81,7 @@
             app:summaryOn="@string/precise_volume_pref_summary_on"
             app:title="@string/precise_volume_pref_title" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:summaryOff="@string/focus_pref_summary_off"
             app:defaultValue="true"
             app:dialogTitle="@string/focus_pref_title"
@@ -88,7 +89,7 @@
             app:summaryOn="@string/focus_pref_summary_on"
             app:title="@string/focus_pref_title" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:summaryOff="@string/headset_pref_summary_off"
             app:defaultValue="true"
             app:dialogTitle="@string/headset_pref_title"
diff --git a/project/app/src/main/res/xml/preferences.xml b/project/app/src/main/res/xml/preferences.xml
index 4b6aaded0..cc3324a98 100644
--- a/project/app/src/main/res/xml/preferences.xml
+++ b/project/app/src/main/res/xml/preferences.xml
@@ -43,6 +43,7 @@
             app:useSimpleSummaryProvider="true" />
 
         <Preference
+            app:enableCopying="true"
             app:icon="@drawable/ic_circle"
             app:key="@string/accent_pref"
             app:title="@string/accent_pref_title" />
@@ -56,7 +57,7 @@
             app:key="@string/active_fragments_pref"
             app:title="@string/active_fragments_pref_title" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:summaryOff="@string/tabs_pref_summary_off"
             app:defaultValue="true"
             app:dialogTitle="@string/tabs_pref_title"
@@ -64,7 +65,7 @@
             app:summaryOn="@string/tabs_pref_summary_on"
             app:title="@string/tabs_pref_title" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:summaryOff="@string/precise_volume_pref_summary_off"
             app:defaultValue="true"
             app:dialogTitle="@string/precise_volume_pref_title"
@@ -72,7 +73,7 @@
             app:summaryOn="@string/precise_volume_pref_summary_on"
             app:title="@string/precise_volume_pref_title" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:summaryOff="@string/focus_pref_summary_off"
             app:defaultValue="true"
             app:dialogTitle="@string/focus_pref_title"
@@ -80,7 +81,7 @@
             app:summaryOn="@string/focus_pref_summary_on"
             app:title="@string/focus_pref_title" />
 
-        <SwitchPreference
+        <SwitchPreferenceCompat
             android:summaryOff="@string/headset_pref_summary_off"
             app:defaultValue="true"
             app:dialogTitle="@string/headset_pref_title"