Merge pull request #5387 from p1gp1g/fix

bmarty · web-flow · commit 459bbecd4a81 · 2025-09-24T14:29:32.000+02:00
Put developer settings at the end of the view
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootView.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootView.kt
@@ -214,9 +214,6 @@ private fun ColumnScope.GeneralSection(
         leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Settings())),
         onClick = onOpenAdvancedSettings,
     )
-    if (state.showDeveloperSettings) {
-        DeveloperPreferencesView(onOpenDeveloperSettings)
-    }
     ListItem(
         headlineContent = { Text(stringResource(id = CommonStrings.action_signout)) },
         leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.SignOut())),
@@ -231,6 +228,10 @@ private fun ColumnScope.GeneralSection(
             onClick = onDeactivateClick,
         )
     }
+    // Put developer settings at the end, so nothing bad happens if the user clicks 8 times to enable the entry
+    if (state.showDeveloperSettings) {
+        DeveloperPreferencesView(onOpenDeveloperSettings)
+    }
 }
 
 @Composable
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewDark_0_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewDark_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a3329563aa6c438335aaadb18cc2767d78eb16c34b616c5e9b14f0d8b66fb032
-size 38106
+oid sha256:b5c95596f8a3e78692c7fa13b95a3491d320e4a89273c61cc22595817bf4e846
+size 38104
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewDark_1_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewDark_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a7b3d3f464858c9a298461aad3d3a329ac894fbd6206cbc73ec0de16d20e69e3
-size 37946
+oid sha256:7cfb090fcb56f52c935f72ec52659f574aa088a663a991c7cd49688d42001388
+size 37944
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewLight_0_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewLight_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f0ba38204b90b53b0b03efabc5dd69200089327c22250e9416d8ee2fd2b94537
-size 38915
+oid sha256:b092653f3c1192c3c2e0f0eb8803d20a0879af6bdcde2d51f6f6d4894ccc7c52
+size 38914
diff --git a/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewLight_1_en.png b/tests/uitests/src/test/snapshots/images/features.preferences.impl.root_PreferencesRootViewLight_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cb9b09711d4538aa350d9c072b31becb223cd2b842d606f405b208e3cc13b77c
+oid sha256:78411c84878a5f97b2208b7d688094148fbf88660b1b8fbc0e5fa7b2aebbbf5b
 size 38968

Original file line number	Diff line number	Diff line change
`@@ -214,9 +214,6 @@ private fun ColumnScope.GeneralSection(`
`214`	`214`	`leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Settings())),`
`215`	`215`	`onClick = onOpenAdvancedSettings,`
`216`	`216`	`)`
`217`		`- if (state.showDeveloperSettings) {`
`218`		`- DeveloperPreferencesView(onOpenDeveloperSettings)`
`219`		`- }`
`220`	`217`	`ListItem(`
`221`	`218`	`headlineContent = { Text(stringResource(id = CommonStrings.action_signout)) },`
`222`	`219`	`leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.SignOut())),`
`@@ -231,6 +228,10 @@ private fun ColumnScope.GeneralSection(`
`231`	`228`	`onClick = onDeactivateClick,`
`232`	`229`	`)`
`233`	`230`	`}`
	`231`	`+ // Put developer settings at the end, so nothing bad happens if the user clicks 8 times to enable the entry`
	`232`	`+ if (state.showDeveloperSettings) {`
	`233`	`+ DeveloperPreferencesView(onOpenDeveloperSettings)`
	`234`	`+ }`
`234`	`235`	`}`
`235`	`236`
`236`	`237`	`@Composable`