diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/home/HomeFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/home/HomeFragment.kt index 9c5b04117..944a0ce9d 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/home/HomeFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/home/HomeFragment.kt @@ -187,7 +187,7 @@ class HomeFragment : } GlideApp.with(requireActivity()) .load(RetroGlideExtension.getUserModel()) - .userProfileOptions(RetroGlideExtension.getUserModel()) + .userProfileOptions(RetroGlideExtension.getUserModel(), requireContext()) .into(binding.userImage) } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/other/UserInfoFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/other/UserInfoFragment.kt index 79ef841ed..ee4e76a20 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/other/UserInfoFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/other/UserInfoFragment.kt @@ -130,7 +130,7 @@ class UserInfoFragment : Fragment() { } GlideApp.with(this) .load(RetroGlideExtension.getUserModel()) - .userProfileOptions(RetroGlideExtension.getUserModel()) + .userProfileOptions(RetroGlideExtension.getUserModel(), requireContext()) .into(binding.userImage) } diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/RetroGlideExtension.kt b/app/src/main/java/code/name/monkey/retromusic/glide/RetroGlideExtension.kt index 127044e92..8602de58c 100644 --- a/app/src/main/java/code/name/monkey/retromusic/glide/RetroGlideExtension.kt +++ b/app/src/main/java/code/name/monkey/retromusic/glide/RetroGlideExtension.kt @@ -1,5 +1,6 @@ package code.name.monkey.retromusic.glide +import android.content.Context import android.graphics.drawable.Drawable import code.name.monkey.appthemehelper.ThemeStore.Companion.accentColor import code.name.monkey.appthemehelper.util.TintHelper @@ -150,10 +151,11 @@ object RetroGlideExtension { @GlideOption fun userProfileOptions( baseRequestOptions: BaseRequestOptions<*>, - file: File + file: File, + context: Context ): BaseRequestOptions<*> { return baseRequestOptions.diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY) - .error(getErrorUserProfile()) + .error(getErrorUserProfile(context)) .signature(createSignature(file)) } @@ -201,11 +203,11 @@ object RetroGlideExtension { return File(dir, USER_BANNER) } - private fun getErrorUserProfile(): Drawable { + private fun getErrorUserProfile(context: Context): Drawable { return TintHelper.createTintedDrawable( getContext(), R.drawable.ic_account, - accentColor(getContext()) + accentColor(context) ) } diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/WallpaperAccentManager.kt b/app/src/main/java/code/name/monkey/retromusic/helper/WallpaperAccentManager.kt index 62191bdd3..871904cef 100644 --- a/app/src/main/java/code/name/monkey/retromusic/helper/WallpaperAccentManager.kt +++ b/app/src/main/java/code/name/monkey/retromusic/helper/WallpaperAccentManager.kt @@ -43,9 +43,7 @@ class WallpaperAccentManager(val context: Context) { .getWallpaperColors(WallpaperManager.FLAG_SYSTEM) if (colors != null) { val primaryColor = colors.primaryColor.toArgb() - if (primaryColor != ThemeStore.wallpaperColor(context)) { - ThemeStore.editTheme(context).wallpaperColor(primaryColor).commit() - } + ThemeStore.editTheme(context).wallpaperColor(context, primaryColor).commit() } } } diff --git a/app/src/main/res/xml/pref_general.xml b/app/src/main/res/xml/pref_general.xml index a075b334a..9323a3775 100755 --- a/app/src/main/res/xml/pref_general.xml +++ b/app/src/main/res/xml/pref_general.xml @@ -48,8 +48,7 @@ android:key="wallpaper_accent" android:layout="@layout/list_item_view_switch" android:summary="@string/pref_summary_wallpaper_accent" - android:title="@string/pref_title_wallpaper_accent" - app:isPreferenceVisible="@bool/wallpaper_accent_visible" /> + android:title="@string/pref_title_wallpaper_accent" />