From 189960eb28e805e217312633453ac5533b60670b Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 30 Jun 2023 10:37:36 +0200
Subject: [PATCH] Update some setting screens.

---
 .../features/logout/api/LogoutPreferenceScreen.kt  | 14 +++++---------
 .../impl/developer/DeveloperSettingsView.kt        |  5 +----
 .../libraries/featureflag/ui/FeatureListView.kt    |  5 ++---
 3 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/features/logout/api/src/main/kotlin/io/element/android/features/logout/api/LogoutPreferenceScreen.kt b/features/logout/api/src/main/kotlin/io/element/android/features/logout/api/LogoutPreferenceScreen.kt
index 343bef4498..0ad6eab4eb 100644
--- a/features/logout/api/src/main/kotlin/io/element/android/features/logout/api/LogoutPreferenceScreen.kt
+++ b/features/logout/api/src/main/kotlin/io/element/android/features/logout/api/LogoutPreferenceScreen.kt
@@ -27,11 +27,9 @@ import androidx.compose.ui.tooling.preview.Preview
 import io.element.android.libraries.architecture.Async
 import io.element.android.libraries.designsystem.components.ProgressDialog
 import io.element.android.libraries.designsystem.components.dialogs.ConfirmationDialog
-import io.element.android.libraries.designsystem.components.preferences.PreferenceCategory
 import io.element.android.libraries.designsystem.components.preferences.PreferenceText
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
 import io.element.android.libraries.designsystem.preview.ElementPreviewLight
-import io.element.android.libraries.ui.strings.CommonStrings
 
 @Composable
 fun LogoutPreferenceView(
@@ -81,13 +79,11 @@ fun LogoutPreferenceView(
 fun LogoutPreferenceContent(
     onClick: () -> Unit = {},
 ) {
-    PreferenceCategory(title = stringResource(id = CommonStrings.settings_title_general)) {
-        PreferenceText(
-            title = stringResource(id = R.string.screen_signout_preference_item),
-            icon = Icons.Default.Logout,
-            onClick = onClick
-        )
-    }
+    PreferenceText(
+        title = stringResource(id = R.string.screen_signout_preference_item),
+        icon = Icons.Default.Logout,
+        onClick = onClick
+    )
 }
 
 @Preview
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsView.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsView.kt
index 6403c70bf7..ff5c1b1bfd 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsView.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsView.kt
@@ -16,8 +16,6 @@
 
 package io.element.android.features.preferences.impl.developer
 
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Delete
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
@@ -55,10 +53,9 @@ fun DeveloperSettingsView(
             )
         }
         val cache = state.cacheSize
-        PreferenceCategory(title = "Cache") {
+        PreferenceCategory(title = "Cache", showDivider = false) {
             PreferenceText(
                 title = "Clear cache",
-                icon = Icons.Default.Delete,
                 currentValue = cache.dataOrNull(),
                 loadingCurrentValue = state.cacheSize.isLoading() || state.clearCacheAction.isLoading(),
                 onClick = {
diff --git a/libraries/featureflag/ui/src/main/kotlin/io/element/android/libraries/featureflag/ui/FeatureListView.kt b/libraries/featureflag/ui/src/main/kotlin/io/element/android/libraries/featureflag/ui/FeatureListView.kt
index 2f17482875..87d0125278 100644
--- a/libraries/featureflag/ui/src/main/kotlin/io/element/android/libraries/featureflag/ui/FeatureListView.kt
+++ b/libraries/featureflag/ui/src/main/kotlin/io/element/android/libraries/featureflag/ui/FeatureListView.kt
@@ -20,7 +20,7 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
-import io.element.android.libraries.designsystem.components.preferences.PreferenceSwitch
+import io.element.android.libraries.designsystem.components.preferences.PreferenceCheckbox
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
 import io.element.android.libraries.designsystem.preview.ElementPreviewLight
 import io.element.android.libraries.featureflag.ui.model.FeatureUiModel
@@ -52,8 +52,7 @@ fun FeaturePreferenceView(
     onCheckedChange: (Boolean) -> Unit,
     modifier: Modifier = Modifier
 ) {
-
-    PreferenceSwitch(
+    PreferenceCheckbox(
         title = feature.title,
         isChecked = feature.isEnabled,
         modifier = modifier,