From ecd74fce793c80baaf271118267203bb6ebfd3a1 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 18 Nov 2026 01:33:11 -0500 Subject: [PATCH] Save the store order only once the user arranges it (#2812) * fix(stores): save the store order only once the user arranges it * test(stores): exercise the tab save the hide toggle uses --- .../com/droiddeck/launcher/session/SessionPrefs.kt | 7 +++++++ .../main/java/com/droiddeck/launcher/ui/StoresPage.kt | 4 +--- .../droiddeck/launcher/session/StoresTabOrderTest.kt | 11 +++++++++++ 3 files changed, 19 insertions(+), 3 deletions(-) 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 a56bdb9b70..1464ac37be 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,13 @@ object SessionPrefs { fun storesTabOrder(context: Context): List = idList(prefs(context).getString("storesTabOrder", null)) + /** An order nobody arranged stays unsaved, so it keeps following the default. */ + fun saveStoresTabs(context: Context, order: List, hidden: Set, arranged: Boolean) { + if (arranged) setStoresTabOrderCustomized(context, true) + if (storesTabOrderCustomized(context)) setStoresTabOrder(context, order) + setStoresTabHidden(context, hidden) + } + private val LEGACY_STORES_TAB_ORDER = listOf("gog", "epic", "amazon", "xbox", "itch", "gamejolt", "battlenet", "ubisoft", "ea", "rockstar") /** 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 e1602f8663..440541dda4 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt @@ -163,9 +163,7 @@ internal fun StoresPage(s: FrontEndState, a: FrontEndActions, modifier: Modifier var arranging by remember { mutableStateOf(false) } val shownStores = tabs.filter { it.shown }.map { it.store } fun commitTabs(markCustomized: Boolean = false) { - SessionPrefs.setStoresTabOrder(ctx, tabs.map { it.store.id }) - SessionPrefs.setStoresTabHidden(ctx, tabs.filterNot { it.shown }.map { it.store.id }.toSet()) - if (markCustomized) SessionPrefs.setStoresTabOrderCustomized(ctx, true) + SessionPrefs.saveStoresTabs(ctx, tabs.map { it.store.id }, tabs.filterNot { it.shown }.map { it.store.id }.toSet(), markCustomized) } fun shiftTab(store: Store, delta: Int) { val from = tabs.indexOfFirst { it.store == store } diff --git a/app/src/test/java/com/droiddeck/launcher/session/StoresTabOrderTest.kt b/app/src/test/java/com/droiddeck/launcher/session/StoresTabOrderTest.kt index 23e340d3b4..fb1fb71a5d 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/StoresTabOrderTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/StoresTabOrderTest.kt @@ -42,4 +42,15 @@ class StoresTabOrderTest { assertTrue(SessionPrefs.storesTabOrderCustomized(app)) assertEquals(mine, shown()) } + + @Test + fun hidingAStoreLeavesTheOrderFollowingTheDefault() { + SessionPrefs.saveStoresTabs(app, defaults, setOf("itch"), arranged = false) + assertTrue(SessionPrefs.storesTabOrder(app).isEmpty()) + val later = defaults.reversed() + SessionPrefs.settleStoresTabOrder(app, later) + assertFalse(SessionPrefs.storesTabOrderCustomized(app)) + assertTrue(SessionPrefs.storesTabOrder(app).isEmpty()) + assertEquals(setOf("itch"), SessionPrefs.storesTabHidden(app)) + } }