From 6ec2e6ee9a6aa9d849d292b3d4d549d2f1bcd5a0 Mon Sep 17 00:00:00 2001 From: Prathamesh More Date: Tue, 14 Mar 2023 13:36:07 +0530 Subject: [PATCH] Code Cleanup --- .../java/code/name/monkey/retromusic/Constants.kt | 1 - .../retromusic/fragments/settings/AudioSettings.kt | 13 +++++++++---- .../fragments/settings/ThemeSettingsFragment.kt | 3 +++ .../name/monkey/retromusic/util/PreferenceUtil.kt | 5 ----- app/src/main/res/values-v26/bools.xml | 4 ---- app/src/main/res/values-v27/bools.xml | 4 ---- app/src/main/res/values-v31/bools.xml | 2 -- app/src/main/res/values/bools.xml | 4 ---- app/src/main/res/xml/pref_audio.xml | 9 --------- app/src/main/res/xml/pref_general.xml | 5 ++--- 10 files changed, 14 insertions(+), 36 deletions(-) delete mode 100644 app/src/main/res/values-v26/bools.xml delete mode 100644 app/src/main/res/values-v27/bools.xml diff --git a/app/src/main/java/code/name/monkey/retromusic/Constants.kt b/app/src/main/java/code/name/monkey/retromusic/Constants.kt index d17b3194e..c51689cab 100644 --- a/app/src/main/java/code/name/monkey/retromusic/Constants.kt +++ b/app/src/main/java/code/name/monkey/retromusic/Constants.kt @@ -119,7 +119,6 @@ const val ARTIST_GRID_SIZE_LAND = "artist_grid_size_land" const val PLAYLIST_GRID_SIZE = "playlist_grid_size" const val PLAYLIST_GRID_SIZE_LAND = "playlist_grid_size_land" const val COLORED_APP_SHORTCUTS = "colored_app_shortcuts" -const val AUDIO_DUCKING = "audio_ducking" const val LAST_ADDED_CUTOFF = "last_added_interval" const val LAST_SLEEP_TIMER_VALUE = "last_sleep_timer_value" const val NEXT_SLEEP_TIMER_ELAPSED_REALTIME = "next_sleep_timer_elapsed_real_time" diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/AudioSettings.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/AudioSettings.kt index 17915712a..d493085c0 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/AudioSettings.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/AudioSettings.kt @@ -49,11 +49,16 @@ class AudioSettings : AbsSettingsFragment() { if (VersionUtils.hasS()) { bluetoothPreference?.setOnPreferenceChangeListener { _, newValue -> if (newValue as Boolean) { - if (ActivityCompat.checkSelfPermission(requireContext(), - BLUETOOTH_CONNECT) != PERMISSION_GRANTED + if (ActivityCompat.checkSelfPermission( + requireContext(), + BLUETOOTH_CONNECT + ) != PERMISSION_GRANTED ) { - ActivityCompat.requestPermissions(requireActivity(), arrayOf( - BLUETOOTH_CONNECT), BLUETOOTH_PERMISSION_REQUEST) + ActivityCompat.requestPermissions( + requireActivity(), arrayOf( + BLUETOOTH_CONNECT + ), BLUETOOTH_PERMISSION_REQUEST + ) } } return@setOnPreferenceChangeListener true 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 f7fbc122b..a89fedf96 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 android.view.View import androidx.core.content.edit import androidx.preference.Preference import androidx.preference.TwoStatePreference @@ -139,5 +140,7 @@ class ThemeSettingsFragment : AbsSettingsFragment() { override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { addPreferencesFromResource(R.xml.pref_general) + val wallpaperAccent: ATESwitchPreference? = findPreference(WALLPAPER_ACCENT) + wallpaperAccent?.isVisible = VersionUtils.hasOreoMR1() && !VersionUtils.hasS() } } diff --git a/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.kt b/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.kt index 68c2be9ab..18991786a 100644 --- a/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.kt +++ b/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.kt @@ -266,11 +266,6 @@ object PreferenceUtil { ALBUM_ART_ON_LOCK_SCREEN, true ) - val isAudioDucking - get() = sharedPreferences.getBoolean( - AUDIO_DUCKING, true - ) - val isBluetoothSpeaker get() = sharedPreferences.getBoolean( BLUETOOTH_PLAYBACK, false diff --git a/app/src/main/res/values-v26/bools.xml b/app/src/main/res/values-v26/bools.xml deleted file mode 100644 index e557d81d8..000000000 --- a/app/src/main/res/values-v26/bools.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - false - \ No newline at end of file diff --git a/app/src/main/res/values-v27/bools.xml b/app/src/main/res/values-v27/bools.xml deleted file mode 100644 index a3eb593f3..000000000 --- a/app/src/main/res/values-v27/bools.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - true - \ No newline at end of file diff --git a/app/src/main/res/values-v31/bools.xml b/app/src/main/res/values-v31/bools.xml index 51349c34e..e9ef74c3c 100644 --- a/app/src/main/res/values-v31/bools.xml +++ b/app/src/main/res/values-v31/bools.xml @@ -2,6 +2,4 @@ true true - - false \ No newline at end of file diff --git a/app/src/main/res/values/bools.xml b/app/src/main/res/values/bools.xml index 654eeffa5..5e9f24c9f 100644 --- a/app/src/main/res/values/bools.xml +++ b/app/src/main/res/values/bools.xml @@ -5,9 +5,5 @@ true - false - false - - true false \ No newline at end of file diff --git a/app/src/main/res/xml/pref_audio.xml b/app/src/main/res/xml/pref_audio.xml index 749202ced..6bf54069c 100755 --- a/app/src/main/res/xml/pref_audio.xml +++ b/app/src/main/res/xml/pref_audio.xml @@ -2,15 +2,6 @@ - - + android:title="@string/pref_title_wallpaper_accent" />