diff --git a/app/src/main/java/com/droiddeck/launcher/App.kt b/app/src/main/java/com/droiddeck/launcher/App.kt index cb66f1a925..1a45ab8512 100644 --- a/app/src/main/java/com/droiddeck/launcher/App.kt +++ b/app/src/main/java/com/droiddeck/launcher/App.kt @@ -53,6 +53,7 @@ class App : Application() { com.droiddeck.launcher.session.QuestExperimental.initialize(this) com.droiddeck.launcher.session.SessionPrefs.applyNtsyncDefault(this) com.droiddeck.launcher.session.SessionPrefs.settleGpuDriverMode(this) + com.droiddeck.launcher.session.SessionPrefs.settleStoresTabOrder(this, com.droiddeck.launcher.stores.Store.entries.map { it.id }) com.droiddeck.launcher.update.AppUpdates.init(this) com.droiddeck.launcher.update.UpdateWatch.sync(this, com.droiddeck.launcher.update.AppUpdates.follow(this, null)) com.droiddeck.launcher.core.DownloadSource.init(this) diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt index 491608e9e1..a56bdb9b70 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -315,6 +315,20 @@ object SessionPrefs { fun storesTabOrder(context: Context): List = idList(prefs(context).getString("storesTabOrder", null)) + private val LEGACY_STORES_TAB_ORDER = listOf("gog", "epic", "amazon", "xbox", "itch", "gamejolt", "battlenet", "ubisoft", "ea", "rockstar") + + /** + * Forgets an order the user never arranged, so the Stores tabs and Library pills follow whatever the default is now. + * Earlier versions saved the default of their day, which is why a saved order alone does not mean the user chose it. + */ + fun settleStoresTabOrder(context: Context, defaults: List) { + if (storesTabOrderCustomized(context)) return + val saved = storesTabOrder(context) + if (saved.isEmpty()) return + if (saved == LEGACY_STORES_TAB_ORDER || saved == defaults) prefs(context).edit().remove("storesTabOrder").apply() + else setStoresTabOrderCustomized(context, true) + } + fun setStoresTabOrder(context: Context, order: List) { prefs(context).edit().putString("storesTabOrder", order.joinToString(",")).apply() } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt index 3ba8a1fb6d..e1602f8663 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt @@ -155,18 +155,7 @@ internal fun StoresPage(s: FrontEndState, a: FrontEndActions, modifier: Modifier val padH = if (narrow) 14.dp else 22.dp val tabs = remember { androidx.compose.runtime.mutableStateListOf().apply { - val savedOrder = SessionPrefs.storesTabOrder(ctx) - if (!SessionPrefs.storesTabOrderCustomized(ctx)) { - val legacyOrder = listOf( - "gog", "epic", "amazon", "xbox", "itch", - "gamejolt", "battlenet", "ubisoft", "ea", "rockstar" - ) - if (savedOrder.isNotEmpty() && savedOrder != legacyOrder) { - SessionPrefs.setStoresTabOrderCustomized(ctx, true) - } else { - SessionPrefs.setStoresTabOrder(ctx, Store.entries.map { it.id }) - } - } + SessionPrefs.settleStoresTabOrder(ctx, Store.entries.map { it.id }) addAll(arrangeStoreTabs(SessionPrefs.storesTabOrder(ctx), SessionPrefs.storesTabHidden(ctx))) } } diff --git a/app/src/test/java/com/droiddeck/launcher/session/StoresTabOrderTest.kt b/app/src/test/java/com/droiddeck/launcher/session/StoresTabOrderTest.kt new file mode 100644 index 0000000000..23e340d3b4 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/StoresTabOrderTest.kt @@ -0,0 +1,45 @@ +package com.droiddeck.launcher.session + +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.arrangeStoreTabs +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [33]) +class StoresTabOrderTest { + private val app get() = RuntimeEnvironment.getApplication() + private val defaults = Store.entries.map { it.id } + private fun shown() = arrangeStoreTabs(SessionPrefs.storesTabOrder(app), emptySet()).map { it.store.id } + + @Test + fun anOldDefaultOrderMovesToTheCurrentOne() { + SessionPrefs.setStoresTabOrder(app, listOf("gog", "epic", "amazon", "xbox", "itch", "gamejolt", "battlenet", "ubisoft", "ea", "rockstar")) + SessionPrefs.settleStoresTabOrder(app, defaults) + assertEquals(defaults, shown()) + assertFalse(SessionPrefs.storesTabOrderCustomized(app)) + } + + @Test + fun aSavedCurrentDefaultIsNotMistakenForTheUsersOwn() { + SessionPrefs.setStoresTabOrder(app, defaults) + repeat(2) { SessionPrefs.settleStoresTabOrder(app, defaults) } + assertFalse(SessionPrefs.storesTabOrderCustomized(app)) + assertTrue(SessionPrefs.storesTabOrder(app).isEmpty()) + } + + @Test + fun anArrangedOrderIsKept() { + val mine = defaults.reversed() + SessionPrefs.setStoresTabOrder(app, mine) + SessionPrefs.settleStoresTabOrder(app, defaults) + assertTrue(SessionPrefs.storesTabOrderCustomized(app)) + assertEquals(mine, shown()) + } +}