From ccf3b7f6a52144b74df231c23caf1b547ec3a2cf Mon Sep 17 00:00:00 2001 From: Prathamesh More Date: Tue, 14 Mar 2023 13:06:19 +0530 Subject: [PATCH] fix: Remove Blurred album art on lockscreen feature for Android 11 and above Hide Blur album art preference on Android 11+ devices as the lockscreen album art feature was removed by Google. And even if the feature is present in some Custom ROMs there is also an option to set blur so this preference is unnecessary on Android 11 and above. --- .../fragments/settings/PersonalizeSettingsFragment.kt | 8 ++++++++ .../code/name/monkey/retromusic/util/PreferenceUtil.kt | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/PersonalizeSettingsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/PersonalizeSettingsFragment.kt index 24218f6fb..f02727d20 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/PersonalizeSettingsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/PersonalizeSettingsFragment.kt @@ -17,7 +17,10 @@ package code.name.monkey.retromusic.fragments.settings import android.os.Bundle import android.view.View import code.name.monkey.appthemehelper.common.prefs.supportv7.ATEListPreference +import code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference +import code.name.monkey.appthemehelper.util.VersionUtils import code.name.monkey.retromusic.APPBAR_MODE +import code.name.monkey.retromusic.BLURRED_ALBUM_ART import code.name.monkey.retromusic.HOME_ALBUM_GRID_STYLE import code.name.monkey.retromusic.HOME_ARTIST_GRID_STYLE import code.name.monkey.retromusic.R @@ -27,12 +30,17 @@ class PersonalizeSettingsFragment : AbsSettingsFragment() { override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { addPreferencesFromResource(R.xml.pref_ui) + // Hide Blur album art preference on Android 11+ devices as the lockscreen album art feature was removed by Google + // And if the feature is present in some Custom ROM's there is also an option to set blur so this preference is unnecessary on Android 11 and above + val blurredAlbumArt: ATESwitchPreference? = findPreference(BLURRED_ALBUM_ART) + blurredAlbumArt?.isVisible = !VersionUtils.hasR() } override fun invalidateSettings() {} override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) + val homeArtistStyle: ATEListPreference? = findPreference(HOME_ARTIST_GRID_STYLE) homeArtistStyle?.setOnPreferenceChangeListener { preference, newValue -> setSummary(preference, newValue) 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 493949be7..68c2be9ab 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 @@ -279,7 +279,7 @@ object PreferenceUtil { val isBlurredAlbumArt get() = sharedPreferences.getBoolean( BLURRED_ALBUM_ART, false - ) + ) && !VersionUtils.hasR() val blurAmount get() = sharedPreferences.getInt(NEW_BLUR_AMOUNT, 25)