From e614c19a4e9113e961139c522bdd7962d77b8a92 Mon Sep 17 00:00:00 2001 From: SuperDragonXD <70206496+SuperDragonXD@users.noreply.github.com> Date: Sat, 20 Dec 2025 21:25:53 +0800 Subject: [PATCH] fix: Revert smartspace text color changes This commit reverts 1912177c588407e268cf113d4335ea23b654a5e0 and 0363d8eacba44e4da84b100beeab62b26f928e22 due to issues regarding the contrast checker and text color, causing accessibility issues. A future option to manually change the text color to something else should be considered instead. Fixes #6073 Fixes #6080 Fixes #6152 --- .../app/lawnchair/smartspace/CardPagerAdapter.kt | 11 +---------- .../src/app/lawnchair/util/WallpaperUtils.kt | 16 ---------------- 2 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 lawnchair/src/app/lawnchair/util/WallpaperUtils.kt diff --git a/lawnchair/src/app/lawnchair/smartspace/CardPagerAdapter.kt b/lawnchair/src/app/lawnchair/smartspace/CardPagerAdapter.kt index 8a9f482e9d..4129f31d4d 100644 --- a/lawnchair/src/app/lawnchair/smartspace/CardPagerAdapter.kt +++ b/lawnchair/src/app/lawnchair/smartspace/CardPagerAdapter.kt @@ -1,24 +1,17 @@ package app.lawnchair.smartspace import android.content.Context -import android.graphics.Color import android.util.SparseArray import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.viewpager.widget.PagerAdapter -import app.lawnchair.preferences2.PreferenceManager2.Companion.getInstance import app.lawnchair.smartspace.model.SmartspaceTarget -import app.lawnchair.theme.color.ColorMode -import app.lawnchair.util.isWallpaperDark import com.android.launcher3.R import com.android.launcher3.util.Themes -import com.patrykmichalik.opto.core.firstBlocking class CardPagerAdapter(context: Context) : PagerAdapter() { - private val preferenceManager2 = getInstance(context) - val colorMode: ColorMode = preferenceManager2.workspaceTextColor.firstBlocking() private val currentTextColor = Themes.getAttrColor(context, R.attr.workspaceTextColor) private val targets = mutableListOf() private var smartspaceTargets = targets @@ -78,9 +71,7 @@ class CardPagerAdapter(context: Context) : PagerAdapter() { val target = smartspaceTargets[viewHolder.position] val card = viewHolder.card card.setSmartspaceTarget(target, smartspaceTargets.size > 1) - val isDark = isWallpaperDark(card.context) - val dynamicColors = if (isDark) Color.WHITE else Color.BLACK - card.setPrimaryTextColor(if (colorMode == ColorMode.AUTO) dynamicColors else currentTextColor) + card.setPrimaryTextColor(currentTextColor) } override fun getCount() = smartspaceTargets.size diff --git a/lawnchair/src/app/lawnchair/util/WallpaperUtils.kt b/lawnchair/src/app/lawnchair/util/WallpaperUtils.kt deleted file mode 100644 index faf44d14b3..0000000000 --- a/lawnchair/src/app/lawnchair/util/WallpaperUtils.kt +++ /dev/null @@ -1,16 +0,0 @@ -package app.lawnchair.util - -import android.content.Context -import android.graphics.Color -import app.lawnchair.wallpaper.WallpaperColorsCompat -import app.lawnchair.wallpaper.WallpaperManagerCompat - -fun isWallpaperDark(context: Context): Boolean { - val wallpaperManager = WallpaperManagerCompat.INSTANCE.get(context) - val colors: WallpaperColorsCompat? = wallpaperManager.wallpaperColors - return colors?.primaryColor?.let { argb -> - val darkness = - 1 - (0.299 * Color.red(argb) + 0.587 * Color.green(argb) + 0.114 * Color.blue(argb)) / 255 - darkness >= 0.5 - } ?: false -}