improvement(UI): Visually indicate selected item in a dropdown for Se…

…tting items
AChep · Nov 27, 2024 · 98bc441 · 98bc441
1 parent 62d0800
commit 98bc441
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 9 deletions.
diff --git a/...otlin/com/artemchep/keyguard/feature/home/settings/component/SettingClipboardAutoClear.kt b/...otlin/com/artemchep/keyguard/feature/home/settings/component/SettingClipboardAutoClear.kt
@@ -51,9 +51,11 @@ fun settingClipboardAutoClearProvider(
     val text = getAutoClearDurationTitle(timeout, context)
     val dropdown = variants
         .map { duration ->
-            val title = getAutoClearDurationTitle(duration, context)
+            val actionSelected = timeout == duration
+            val actionTitle = getAutoClearDurationTitle(duration, context)
             FlatItemAction(
-                title = TextHolder.Value(title),
+                title = TextHolder.Value(actionTitle),
+                selected = actionSelected,
                 onClick = {
                     putClipboardAutoClear(duration)
                         .launchIn(windowCoroutineScope)

diff --git a/...lin/com/artemchep/keyguard/feature/home/settings/component/SettingClipboardAutoRefresh.kt b/...lin/com/artemchep/keyguard/feature/home/settings/component/SettingClipboardAutoRefresh.kt
@@ -59,9 +59,11 @@ fun settingClipboardAutoRefreshProvider(
     val text = getAutoRefreshDurationTitle(timeout, context)
     val dropdown = variants
         .map { duration ->
-            val title = getAutoRefreshDurationTitle(duration, context)
+            val actionSelected = timeout == duration
+            val actionTitle = getAutoRefreshDurationTitle(duration, context)
             FlatItemAction(
-                title = TextHolder.Value(title),
+                title = TextHolder.Value(actionTitle),
+                selected = actionSelected,
                 onClick = {
                     putClipboardAutoRefresh(duration)
                         .launchIn(windowCoroutineScope)

diff --git a/...nMain/kotlin/com/artemchep/keyguard/feature/home/settings/component/SettingColorAccent.kt b/...nMain/kotlin/com/artemchep/keyguard/feature/home/settings/component/SettingColorAccent.kt
@@ -57,9 +57,11 @@ fun settingColorAccentProvider(
     val text = getAppColorsTitle(colors, context)
     val dropdown = variants
         .map { colorsVariant ->
+            val actionSelected = colorsVariant == colors
             val actionTitle = getAppColorsTitle(colorsVariant, context)
             FlatItemAction(
                 title = TextHolder.Value(actionTitle),
+                selected = actionSelected,
                 onClick = {
                     putColors(colorsVariant)
                         .launchIn(windowCoroutineScope)

diff --git a/...nMain/kotlin/com/artemchep/keyguard/feature/home/settings/component/SettingColorScheme.kt b/...nMain/kotlin/com/artemchep/keyguard/feature/home/settings/component/SettingColorScheme.kt
@@ -48,9 +48,11 @@ fun settingColorSchemeProvider(
     val text = getAppThemeTitle(theme, context)
     val dropdown = variants
         .map { themeVariant ->
+            val actionSelected = theme == themeVariant
             val actionTitle = getAppThemeTitle(themeVariant, context)
             FlatItemAction(
                 title = TextHolder.Value(actionTitle),
+                selected = actionSelected,
                 onClick = {
                     putTheme(themeVariant)
                         .launchIn(windowCoroutineScope)

diff --git a/...c/commonMain/kotlin/com/artemchep/keyguard/feature/home/settings/component/SettingFont.kt b/...c/commonMain/kotlin/com/artemchep/keyguard/feature/home/settings/component/SettingFont.kt
@@ -48,11 +48,13 @@ fun settingFontProvider(
     val text = getAppFontTitle(font, context)
     val dropdown = variants
         .map { fontVariant ->
+            val actionSelected = fontVariant == font
             val actionTitle = getAppFontTitle(fontVariant, context)
             val actionText = getAppFontText(fontVariant, context)
             FlatItemAction(
                 title = TextHolder.Value(actionTitle),
                 text = actionText?.let(TextHolder::Value),
+                selected = actionSelected,
                 onClick = {
                     putFont(fontVariant)
                         .launchIn(windowCoroutineScope)

diff --git a/...Main/kotlin/com/artemchep/keyguard/feature/home/settings/component/SettingNavAnimation.kt b/...Main/kotlin/com/artemchep/keyguard/feature/home/settings/component/SettingNavAnimation.kt
@@ -47,8 +47,11 @@ fun settingNavAnimationProvider(
     val text = textResource(navAnimation.title, context)
     val dropdown = variants
         .map { navAnimationVariant ->
+            val actionSelected = navAnimationVariant == navAnimation
+            val actionTitle = navAnimationVariant.title.wrap()
             FlatItemAction(
-                title = navAnimationVariant.title.wrap(),
+                title = actionTitle,
+                selected = actionSelected,
                 onClick = {
                     putNavAnimation(navAnimationVariant)
                         .launchIn(windowCoroutineScope)

diff --git a/...in/com/artemchep/keyguard/feature/home/settings/component/SettingRequireMasterPassword.kt b/...in/com/artemchep/keyguard/feature/home/settings/component/SettingRequireMasterPassword.kt
@@ -99,9 +99,11 @@ private suspend fun ah(
     val text = getRequirePasswordDurationTitle(timeout, context)
     val dropdown = variants
         .map { duration ->
-            val title = getRequirePasswordDurationTitle(duration, context)
+            val actionSelected = duration == timeout
+            val actionTitle = getRequirePasswordDurationTitle(duration, context)
             FlatItemAction(
-                title = TextHolder.Value(title),
+                title = TextHolder.Value(actionTitle),
+                selected = actionSelected,
                 onClick = {
                     putBiometricTimeout(duration)
                         .launchIn(windowCoroutineScope)

diff --git a/...Main/kotlin/com/artemchep/keyguard/feature/home/settings/component/SettingSelectLocale.kt b/...Main/kotlin/com/artemchep/keyguard/feature/home/settings/component/SettingSelectLocale.kt
@@ -70,9 +70,11 @@ fun settingSelectLocaleProvider(
             ),
         )
         .map { item ->
+            val actionSelected = locale == item.locale
             FlatItemAction(
                 // leading = if (item.locale != null) null else icon(Icons.Outlined.AutoAwesome),
                 title = TextHolder.Value(item.title),
+                selected = actionSelected,
                 onClick = {
                     putLocale(item.locale)
                         .launchIn(windowCoroutineScope)

diff --git a/...in/com/artemchep/keyguard/feature/home/settings/component/SettingVaultLockAfterTimeout.kt b/...in/com/artemchep/keyguard/feature/home/settings/component/SettingVaultLockAfterTimeout.kt
@@ -49,9 +49,11 @@ fun settingVaultLockAfterTimeoutProvider(
     val text = getLockAfterDurationTitle(timeout, context)
     val dropdown = variants
         .map { duration ->
-            val title = getLockAfterDurationTitle(duration, context)
+            val actionSelected = duration == timeout
+            val actionTitle = getLockAfterDurationTitle(duration, context)
             FlatItemAction(
-                title = TextHolder.Value(title),
+                title = TextHolder.Value(actionTitle),
+                selected = actionSelected,
                 onClick = {
                     putVaultLockAfterTimeout(duration)
                         .launchIn(windowCoroutineScope)