fix: controls settings being removed after selecting tab

BrayanDSO · lukstbit · commit bdc282bddf36 · 2025-07-08T05:08:26.000Z
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/ControlsSettingsFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/ControlsSettingsFragment.kt
@@ -76,11 +76,11 @@ class ControlsSettingsFragment :
         setDynamicTitle()
     }
 
-    @NeedsTest("General category is kept and the other elements are removed")
+    @NeedsTest("Only the tab elements are removed")
     override fun onTabUnselected(tab: TabLayout.Tab?) {
         val preferences = preferenceScreen.children.toList()
-        // 0 is the `General` category, which should be kept
-        for (pref in preferences.subList(1, preferences.size)) {
+        val tabsPrefIndex = preferences.indexOfFirst { it is ControlsTabPreference }
+        for (pref in preferences.subList(tabsPrefIndex + 1, preferences.size)) {
             preferenceScreen.removePreference(pref)
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -76,11 +76,11 @@ class ControlsSettingsFragment :`
`76`	`76`	`setDynamicTitle()`
`77`	`77`	`}`
`78`	`78`
`79`		`- @NeedsTest("General category is kept and the other elements are removed")`
	`79`	`+ @NeedsTest("Only the tab elements are removed")`
`80`	`80`	`override fun onTabUnselected(tab: TabLayout.Tab?) {`
`81`	`81`	`val preferences = preferenceScreen.children.toList()`
`82`		- // 0 is the `General` category, which should be kept
`83`		`- for (pref in preferences.subList(1, preferences.size)) {`
	`82`	`+ val tabsPrefIndex = preferences.indexOfFirst { it is ControlsTabPreference }`
	`83`	`+ for (pref in preferences.subList(tabsPrefIndex + 1, preferences.size)) {`
`84`	`84`	`preferenceScreen.removePreference(pref)`
`85`	`85`	`}`
`86`	`86`	`}`