Updating

Constants names
Proper namings
Bottom tabs slide animation
Added home album list style change

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

@@ -63,7 +63,6 @@ abstract class AbsSettingsFragment : ATEPreferenceFragmentCompat() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         setDivider(ColorDrawable(Color.TRANSPARENT))
-        //listView.setBackgroundColor(ATHUtil.resolveColor(requireContext(), R.attr.colorSurface))
         listView.overScrollMode = View.OVER_SCROLL_NEVER
         listView.setPadding(0, 0, 0, 0)
         listView.setPaddingRelative(0, 0, 0, 0)

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

@@ -18,6 +18,7 @@ import android.content.Intent
 import android.media.audiofx.AudioEffect
 import android.os.Bundle
 import androidx.preference.Preference
+import code.name.monkey.retromusic.EQUALIZER
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.util.NavigationUtil
 
@@ -28,14 +29,14 @@ import code.name.monkey.retromusic.util.NavigationUtil
 
 class AudioSettings : AbsSettingsFragment() {
     override fun invalidateSettings() {
-        val findPreference: Preference = findPreference("equalizer")!!
+        val findPreference: Preference? = findPreference(EQUALIZER)
         if (!hasEqualizer()) {
-            findPreference.isEnabled = false
-            findPreference.summary = resources.getString(R.string.no_equalizer)
+            findPreference?.isEnabled = false
+            findPreference?.summary = resources.getString(R.string.no_equalizer)
         } else {
-            findPreference.isEnabled = true
+            findPreference?.isEnabled = true
         }
-        findPreference.setOnPreferenceClickListener {
+        findPreference?.setOnPreferenceClickListener {
             NavigationUtil.openEqualizer(requireActivity())
             true
         }

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

@@ -17,6 +17,7 @@ package code.name.monkey.retromusic.fragments.settings
 import android.os.Bundle
 import android.view.View
 import androidx.preference.Preference
+import code.name.monkey.retromusic.AUTO_DOWNLOAD_IMAGES_POLICY
 import code.name.monkey.retromusic.R
 
 /**
@@ -25,7 +26,7 @@ import code.name.monkey.retromusic.R
 
 class ImageSettingFragment : AbsSettingsFragment() {
     override fun invalidateSettings() {
-        val autoDownloadImagesPolicy: Preference = findPreference("auto_download_images_policy")!!
+        val autoDownloadImagesPolicy: Preference = findPreference(AUTO_DOWNLOAD_IMAGES_POLICY)!!
         setSummary(autoDownloadImagesPolicy)
         autoDownloadImagesPolicy.setOnPreferenceChangeListener { _, o ->
             setSummary(autoDownloadImagesPolicy, o)
@@ -39,7 +40,7 @@ class ImageSettingFragment : AbsSettingsFragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        val preference: Preference? = findPreference("auto_download_images_policy")
+        val preference: Preference? = findPreference(AUTO_DOWNLOAD_IMAGES_POLICY)
         preference?.let { setSummary(it) }
     }
 }

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

@@ -21,6 +21,7 @@ import android.os.Bundle
 import androidx.preference.Preference
 import androidx.preference.TwoStatePreference
 import code.name.monkey.retromusic.CLASSIC_NOTIFICATION
+import code.name.monkey.retromusic.COLORED_NOTIFICATION
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.util.PreferenceUtil
 
@@ -34,7 +35,7 @@ class NotificationSettingsFragment : AbsSettingsFragment(),
     override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
         if (key == CLASSIC_NOTIFICATION) {
             if (VERSION.SDK_INT >= VERSION_CODES.O) {
-                findPreference<Preference>("colored_notification")?.isEnabled =
+                findPreference<Preference>(COLORED_NOTIFICATION)?.isEnabled =
                     sharedPreferences?.getBoolean(key, false)!!
             }
         }
@@ -42,7 +43,7 @@ class NotificationSettingsFragment : AbsSettingsFragment(),
 
     override fun invalidateSettings() {
 
-        val classicNotification: TwoStatePreference? = findPreference("classic_notification")
+        val classicNotification: TwoStatePreference? = findPreference(CLASSIC_NOTIFICATION)
         if (VERSION.SDK_INT < VERSION_CODES.N) {
             classicNotification?.isVisible = false
         } else {
@@ -57,7 +58,7 @@ class NotificationSettingsFragment : AbsSettingsFragment(),
             }
         }
 
-        val coloredNotification: TwoStatePreference? = findPreference("colored_notification")
+        val coloredNotification: TwoStatePreference? = findPreference(COLORED_NOTIFICATION)
         if (VERSION.SDK_INT >= VERSION_CODES.O) {
             coloredNotification?.isEnabled = PreferenceUtil.isClassicNotification
         } else {

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

@@ -33,8 +33,8 @@ class NowPlayingSettingsFragment : AbsSettingsFragment(),
         updateNowPlayingScreenSummary()
         updateAlbumCoverStyleSummary()
 
-        val carouselEffect: TwoStatePreference = findPreference("carousel_effect")!!
-        carouselEffect.setOnPreferenceChangeListener { _, newValue ->
+        val carouselEffect: TwoStatePreference? = findPreference(CAROUSEL_EFFECT)
+        carouselEffect?.setOnPreferenceChangeListener { _, newValue ->
             if (newValue as Boolean && !App.isProVersion()) {
                 showProToastAndNavigate(getString(R.string.pref_title_toggle_carousel_effect))
                 return@setOnPreferenceChangeListener false
@@ -60,7 +60,7 @@ class NowPlayingSettingsFragment : AbsSettingsFragment(),
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         PreferenceUtil.registerOnSharedPreferenceChangedListener(this)
-        val preference: Preference? = findPreference("album_cover_transform")
+        val preference: Preference? = findPreference(ALBUM_COVER_TRANSFORM)
         preference?.setOnPreferenceChangeListener { albumPrefs, newValue ->
             setSummary(albumPrefs, newValue)
             true

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

@@ -18,6 +18,8 @@ import android.os.Bundle
 import android.view.View
 import androidx.preference.Preference
 import code.name.monkey.appthemehelper.common.prefs.supportv7.ATEListPreference
+import code.name.monkey.retromusic.LANGUAGE_NAME
+import code.name.monkey.retromusic.LAST_ADDED_CUTOFF
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.fragments.LibraryViewModel
 import code.name.monkey.retromusic.fragments.ReloadType.HomeSections
@@ -29,8 +31,9 @@ import org.koin.androidx.viewmodel.ext.android.sharedViewModel
 
 class OtherSettingsFragment : AbsSettingsFragment() {
     private val libraryViewModel by sharedViewModel<LibraryViewModel>()
+
     override fun invalidateSettings() {
-        val languagePreference: ATEListPreference? = findPreference("language_name")
+        val languagePreference: ATEListPreference? = findPreference(LANGUAGE_NAME)
         languagePreference?.setOnPreferenceChangeListener { _, _ ->
             requireActivity().recreate()
             return@setOnPreferenceChangeListener true
@@ -43,13 +46,13 @@ class OtherSettingsFragment : AbsSettingsFragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        val preference: Preference? = findPreference("last_added_interval")
+        val preference: Preference? = findPreference(LAST_ADDED_CUTOFF)
         preference?.setOnPreferenceChangeListener { lastAdded, newValue ->
             setSummary(lastAdded, newValue)
             libraryViewModel.forceReload(HomeSections)
             true
         }
-        val languagePreference: Preference? = findPreference("language_name")
+        val languagePreference: Preference? = findPreference(LANGUAGE_NAME)
         languagePreference?.setOnPreferenceChangeListener { prefs, newValue ->
             setSummary(prefs, newValue)
             true

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

@@ -18,13 +18,13 @@ import android.os.Bundle
 import android.view.View
 import androidx.preference.TwoStatePreference
 import code.name.monkey.appthemehelper.common.prefs.supportv7.ATEListPreference
-import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.*
 
 class PersonalizeSettingsFragment : AbsSettingsFragment() {
 
     override fun invalidateSettings() {
-        val toggleFullScreen: TwoStatePreference = findPreference("toggle_full_screen")!!
-        toggleFullScreen.setOnPreferenceChangeListener { _, _ ->
+        val toggleFullScreen: TwoStatePreference? = findPreference(TOGGLE_FULL_SCREEN)
+        toggleFullScreen?.setOnPreferenceChangeListener { _, _ ->
             requireActivity().recreate()
             true
         }
@@ -36,12 +36,17 @@ class PersonalizeSettingsFragment : AbsSettingsFragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        val homeArtistStyle: ATEListPreference? = findPreference("home_artist_grid_style")
+        val homeArtistStyle: ATEListPreference? = findPreference(HOME_ARTIST_GRID_STYLE)
         homeArtistStyle?.setOnPreferenceChangeListener { preference, newValue ->
             setSummary(preference, newValue)
             true
         }
-        val tabTextMode: ATEListPreference? = findPreference("tab_text_mode")
+        val homeAlbumStyle: ATEListPreference? = findPreference(HOME_ALBUM_GRID_STYLE)
+        homeAlbumStyle?.setOnPreferenceChangeListener { preference, newValue ->
+            setSummary(preference, newValue)
+            true
+        }
+        val tabTextMode: ATEListPreference? = findPreference(TAB_TEXT_MODE)
         tabTextMode?.setOnPreferenceChangeListener { prefs, newValue ->
             setSummary(prefs, newValue)
             true

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

@@ -23,9 +23,7 @@ import code.name.monkey.appthemehelper.common.prefs.supportv7.ATEColorPreference
 import code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
 import code.name.monkey.appthemehelper.util.ColorUtil
 import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.App
-import code.name.monkey.retromusic.DESATURATED_COLOR
-import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.*
 import code.name.monkey.retromusic.appshortcuts.DynamicShortcutManager
 import code.name.monkey.retromusic.util.PreferenceUtil
 import com.afollestad.materialdialogs.color.ColorChooserDialog
@@ -36,7 +34,7 @@ import com.afollestad.materialdialogs.color.ColorChooserDialog
 
 class ThemeSettingsFragment : AbsSettingsFragment() {
     override fun invalidateSettings() {
-        val generalTheme: Preference? = findPreference("general_theme")
+        val generalTheme: Preference? = findPreference(GENERAL_THEME)
         generalTheme?.let {
             setSummary(it)
             it.setOnPreferenceChangeListener { _, newValue ->
@@ -53,11 +51,10 @@ class ThemeSettingsFragment : AbsSettingsFragment() {
             }
         }
 
-        val accentColorPref: ATEColorPreference = findPreference("accent_color")!!
+        val accentColorPref: ATEColorPreference? = findPreference(ACCENT_COLOR)
         val accentColor = ThemeStore.accentColor(requireContext())
-        accentColorPref.setColor(accentColor, ColorUtil.darkenColor(accentColor))
-
-        accentColorPref.setOnPreferenceClickListener {
+        accentColorPref?.setColor(accentColor, ColorUtil.darkenColor(accentColor))
+        accentColorPref?.setOnPreferenceClickListener {
             ColorChooserDialog.Builder(requireContext(), R.string.accent_color)
                 .accentMode(true)
                 .allowUserColorInput(true)
@@ -66,7 +63,7 @@ class ThemeSettingsFragment : AbsSettingsFragment() {
                 .show(requireActivity())
             return@setOnPreferenceClickListener true
         }
-        val blackTheme: ATESwitchPreference? = findPreference("black_theme")
+        val blackTheme: ATESwitchPreference? = findPreference(BLACK_THEME)
         blackTheme?.setOnPreferenceChangeListener { _, _ ->
             if (!App.isProVersion()) {
                 showProToastAndNavigate("Just Black theme")
@@ -94,12 +91,12 @@ class ThemeSettingsFragment : AbsSettingsFragment() {
         }
 
 
-        val colorAppShortcuts: TwoStatePreference = findPreference("should_color_app_shortcuts")!!
+        val colorAppShortcuts: TwoStatePreference? = findPreference(SHOULD_COLOR_APP_SHORTCUTS)
         if (!VersionUtils.hasNougatMR()) {
-            colorAppShortcuts.isVisible = false
+            colorAppShortcuts?.isVisible = false
         } else {
-            colorAppShortcuts.isChecked = PreferenceUtil.isColoredAppShortcuts
-            colorAppShortcuts.setOnPreferenceChangeListener { _, newValue ->
+            colorAppShortcuts?.isChecked = PreferenceUtil.isColoredAppShortcuts
+            colorAppShortcuts?.setOnPreferenceChangeListener { _, newValue ->
                 PreferenceUtil.isColoredAppShortcuts = newValue as Boolean
                 DynamicShortcutManager(requireContext()).updateDynamicShortcuts()
                 true