From 1c85dd0e32a621422a63890ad71305adc590591e Mon Sep 17 00:00:00 2001
From: TacoTheDank <SkytkRSfan3895@gmail.com>
Date: Thu, 7 Apr 2022 17:29:28 -0400
Subject: [PATCH] Utilize sharedPref edit KTX extension

---
 .../fragments/settings/ThemeSettingsFragment.kt           | 8 ++++----
 .../code/name/monkey/retromusic/service/MusicService.kt   | 7 +++----
 .../name/monkey/retromusic/util/CustomArtistImageUtil.kt  | 5 +++--
 .../java/code/name/monkey/appthemehelper/ThemeStore.kt    | 3 ++-
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/ThemeSettingsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/ThemeSettingsFragment.kt
index b5ec3f5bd..c0c19fa78 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/ThemeSettingsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/ThemeSettingsFragment.kt
@@ -16,6 +16,7 @@ package code.name.monkey.retromusic.fragments.settings
 
 import android.annotation.SuppressLint
 import android.os.Bundle
+import androidx.core.content.edit
 import androidx.preference.Preference
 import androidx.preference.TwoStatePreference
 import code.name.monkey.appthemehelper.ACCENT_COLORS
@@ -93,10 +94,9 @@ class ThemeSettingsFragment : AbsSettingsFragment() {
         val desaturatedColor: ATESwitchPreference? = findPreference(DESATURATED_COLOR)
         desaturatedColor?.setOnPreferenceChangeListener { _, value ->
             val desaturated = value as Boolean
-            ThemeStore.prefs(requireContext())
-                .edit()
-                .putBoolean("desaturated_color", desaturated)
-                .apply()
+            ThemeStore.prefs(requireContext()).edit {
+                putBoolean("desaturated_color", desaturated)
+            }
             PreferenceUtil.isDesaturatedColor = desaturated
             restartActivity()
             true
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/MusicService.kt b/app/src/main/java/code/name/monkey/retromusic/service/MusicService.kt
index c5a4092c8..e39ddf6bf 100644
--- a/app/src/main/java/code/name/monkey/retromusic/service/MusicService.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/service/MusicService.kt
@@ -540,10 +540,9 @@ class MusicService : MediaBrowserServiceCompat(),
     }
 
     fun setShuffleMode(shuffleMode: Int) {
-        PreferenceManager.getDefaultSharedPreferences(this)
-            .edit()
-            .putInt(SAVED_SHUFFLE_MODE, shuffleMode)
-            .apply()
+        PreferenceManager.getDefaultSharedPreferences(this).edit {
+            putInt(SAVED_SHUFFLE_MODE, shuffleMode)
+        }
         when (shuffleMode) {
             SHUFFLE_MODE_SHUFFLE -> {
                 this.shuffleMode = shuffleMode
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/CustomArtistImageUtil.kt b/app/src/main/java/code/name/monkey/retromusic/util/CustomArtistImageUtil.kt
index 3dd3ea638..4836032a1 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/CustomArtistImageUtil.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/util/CustomArtistImageUtil.kt
@@ -23,6 +23,7 @@ import android.net.Uri
 import android.os.AsyncTask
 import android.provider.MediaStore
 import android.widget.Toast
+import androidx.core.content.edit
 import code.name.monkey.retromusic.App
 import code.name.monkey.retromusic.model.Artist
 import com.bumptech.glide.Glide
@@ -79,7 +80,7 @@ class CustomArtistImageUtil private constructor(context: Context) {
                             }
 
                             if (succesful) {
-                                mPreferences.edit().putBoolean(getFileName(artist), true).apply()
+                                mPreferences.edit { putBoolean(getFileName(artist), true) }
                                 ArtistSignatureUtil.getInstance(App.getContext())
                                     .updateArtistSignature(artist.name)
                                 App.getContext().contentResolver.notifyChange(
@@ -99,7 +100,7 @@ class CustomArtistImageUtil private constructor(context: Context) {
         object : AsyncTask<Void, Void, Void>() {
             @SuppressLint("ApplySharedPref")
             override fun doInBackground(vararg params: Void): Void? {
-                mPreferences.edit().putBoolean(getFileName(artist), false).commit()
+                mPreferences.edit(commit = true) { putBoolean(getFileName(artist), false) }
                 ArtistSignatureUtil.getInstance(App.getContext()).updateArtistSignature(artist.name)
                 App.getContext().contentResolver.notifyChange(
                     MediaStore.Audio.Artists.EXTERNAL_CONTENT_URI,
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ThemeStore.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ThemeStore.kt
index c095c9025..6b8406b8d 100644
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ThemeStore.kt
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ThemeStore.kt
@@ -6,6 +6,7 @@ import android.graphics.Color
 import androidx.annotation.*
 import androidx.annotation.IntRange
 import androidx.core.content.ContextCompat
+import androidx.core.content.edit
 import androidx.preference.PreferenceManager
 import code.name.monkey.appthemehelper.util.ATHUtil.isWindowBackgroundDark
 import code.name.monkey.appthemehelper.util.ATHUtil.resolveColor
@@ -336,7 +337,7 @@ private constructor(private val mContext: Context) : ThemeStorePrefKeys, ThemeSt
             val prefs = prefs(context)
             val lastVersion = prefs.getInt(ThemeStorePrefKeys.IS_CONFIGURED_VERSION_KEY, -1)
             if (version > lastVersion) {
-                prefs.edit().putInt(ThemeStorePrefKeys.IS_CONFIGURED_VERSION_KEY, version).apply()
+                prefs.edit { putInt(ThemeStorePrefKeys.IS_CONFIGURED_VERSION_KEY, version) }
                 return false
             }
             return true