From 60cc4e958893e14418b0bee17599697566a4734b Mon Sep 17 00:00:00 2001 From: Suphon Thanakornpakapong Date: Tue, 12 Oct 2021 01:18:13 +0700 Subject: [PATCH] Fix grid size migration --- .../app/lawnchair/DeviceProfileOverrides.kt | 8 +++---- .../preferences/BasePreferenceManager.kt | 9 ++++++++ .../preferences/PreferenceManager.kt | 23 +------------------ .../launcher3/InvariantDeviceProfile.java | 2 +- 4 files changed, 14 insertions(+), 28 deletions(-) diff --git a/lawnchair/src/app/lawnchair/DeviceProfileOverrides.kt b/lawnchair/src/app/lawnchair/DeviceProfileOverrides.kt index 13c0dfebd8..d00d85ebbd 100644 --- a/lawnchair/src/app/lawnchair/DeviceProfileOverrides.kt +++ b/lawnchair/src/app/lawnchair/DeviceProfileOverrides.kt @@ -9,10 +9,6 @@ class DeviceProfileOverrides(context: Context) { private val prefs = PreferenceManager.getInstance(context) fun apply(idp: InvariantDeviceProfile, defaultGrid: InvariantDeviceProfile.GridOption) { - // set db file to use - val dbNameSuffix = if (prefs.currentDbSlot.get() == "a") "" else "_b" - idp.dbFile = idp.dbFile + dbNameSuffix - // apply grid size idp.numShownHotseatIcons = prefs.hotseatColumns.get(defaultGrid) idp.numRows = prefs.workspaceRows.get(defaultGrid) @@ -26,10 +22,12 @@ class DeviceProfileOverrides(context: Context) { idp.iconTextSize *= (if (prefs.showHomeLabels.get()) prefs.textSizeFactor.get() else 0.0F) idp.allAppsIconSize *= prefs.allAppsIconSizeFactor.get() idp.allAppsIconTextSize *= (if (prefs.allAppsIconLabels.get()) prefs.allAppsTextSizeFactor.get() else 0F) + + idp.dbFile = "launcher_${idp.numRows}_${idp.numColumns}_${idp.numShownHotseatIcons}.db" } companion object { - @JvmStatic + @JvmField val INSTANCE = MainThreadInitializedObject(::DeviceProfileOverrides) } } diff --git a/lawnchair/src/app/lawnchair/preferences/BasePreferenceManager.kt b/lawnchair/src/app/lawnchair/preferences/BasePreferenceManager.kt index 79d3970507..42fa4187bc 100644 --- a/lawnchair/src/app/lawnchair/preferences/BasePreferenceManager.kt +++ b/lawnchair/src/app/lawnchair/preferences/BasePreferenceManager.kt @@ -19,6 +19,7 @@ package app.lawnchair.preferences import android.content.Context import android.content.SharedPreferences import android.util.Log +import androidx.core.content.edit import app.lawnchair.font.FontCache import com.android.launcher3.InvariantDeviceProfile import com.android.launcher3.Utilities @@ -32,6 +33,14 @@ abstract class BasePreferenceManager(private val context: Context) : SharedPrefe val prefsMap = mutableMapOf>() private val coroutineScope = CoroutineScope(Dispatchers.IO) + init { + if (!sp.contains("version")) { + sp.edit { + putInt("version", 1) + } + } + } + override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String) { prefsMap[key]?.onSharedPreferenceChange() } diff --git a/lawnchair/src/app/lawnchair/preferences/PreferenceManager.kt b/lawnchair/src/app/lawnchair/preferences/PreferenceManager.kt index 72594c43e2..b5fdcee3c8 100644 --- a/lawnchair/src/app/lawnchair/preferences/PreferenceManager.kt +++ b/lawnchair/src/app/lawnchair/preferences/PreferenceManager.kt @@ -29,19 +29,7 @@ import com.android.launcher3.util.MainThreadInitializedObject class PreferenceManager private constructor(private val context: Context) : BasePreferenceManager(context) { private val idp get() = InvariantDeviceProfile.INSTANCE.get(context) private val reloadIcons = { idp.onPreferencesChanged(context) } - private val reloadGrid: () -> Unit = { - idp.onPreferencesChanged(context) - /* TODO: fix this - val defaultGrid = idp.closestProfile - val numColumns = workspaceColumns.get(defaultGrid) - val numRows = workspaceRows.get(defaultGrid) - val numHotseatIcons = hotseatColumns.get(defaultGrid) - if (GridSizeMigrationTaskV2.needsToMigrate(context, numColumns, numRows, numHotseatIcons)) { - toggleCurrentDbSlot() - } - idp.onPreferencesChanged(context) - */ - } + private val reloadGrid: () -> Unit = { idp.onPreferencesChanged(context) } private val scheduleRestart = { LawnchairLauncher.instance?.scheduleRestart() @@ -104,15 +92,6 @@ class PreferenceManager private constructor(private val context: Context) : Base sp.registerOnSharedPreferenceChangeListener(this) } - val currentDbSlot = StringPref("pref_currentDbSlot", "a") - private fun toggleCurrentDbSlot() { - if (currentDbSlot.get() == "a") { - currentDbSlot.set("b") - } else { - currentDbSlot.set("a") - } - } - companion object { val INSTANCE = MainThreadInitializedObject(::PreferenceManager) diff --git a/src/com/android/launcher3/InvariantDeviceProfile.java b/src/com/android/launcher3/InvariantDeviceProfile.java index 11e6f6d28d..51b2ef9c12 100644 --- a/src/com/android/launcher3/InvariantDeviceProfile.java +++ b/src/com/android/launcher3/InvariantDeviceProfile.java @@ -331,7 +331,7 @@ public class InvariantDeviceProfile { // If the partner customization apk contains any grid overrides, apply them // Supported overrides: numRows, numColumns, iconSize applyPartnerDeviceProfileOverrides(context, metrics); - DeviceProfileOverrides.getINSTANCE().get(context).apply(this, closestProfile); + DeviceProfileOverrides.INSTANCE.get(context).apply(this, closestProfile); iconBitmapSize = ResourceUtils.pxFromDp(Math.max(iconSize, allAppsIconSize), metrics); fillResIconDpi = getLauncherIconDensity(iconBitmapSize);