From 7fa1bf4c55987bc8bd327ba17a841b98489278bb Mon Sep 17 00:00:00 2001 From: Artem Chepurnoy Date: Mon, 15 Jan 2024 10:44:01 +0200 Subject: [PATCH] More consistent ChevronIcon usage on the context actions --- .../feature/generator/emailrelay/EmailRelayListRoute.kt | 4 ++++ .../keyguard/feature/generator/wordlist/WordlistRoute.kt | 4 ++++ .../feature/home/vault/screen/VaultListStateProducer.kt | 6 ++++++ .../feature/home/vault/util/changePasswordAction.kt | 4 ++++ .../justdeleteme/directory/JustDeleteMeServiceListRoute.kt | 4 ++++ .../feature/passkeys/directory/PasskeysServiceListRoute.kt | 4 ++++ .../keyguard/feature/tfa/directory/TwoFaServiceListRoute.kt | 4 ++++ 7 files changed, 30 insertions(+) diff --git a/common/src/commonMain/kotlin/com/artemchep/keyguard/feature/generator/emailrelay/EmailRelayListRoute.kt b/common/src/commonMain/kotlin/com/artemchep/keyguard/feature/generator/emailrelay/EmailRelayListRoute.kt index daa43f08..ecdd87b8 100644 --- a/common/src/commonMain/kotlin/com/artemchep/keyguard/feature/generator/emailrelay/EmailRelayListRoute.kt +++ b/common/src/commonMain/kotlin/com/artemchep/keyguard/feature/generator/emailrelay/EmailRelayListRoute.kt @@ -8,6 +8,7 @@ import com.artemchep.keyguard.feature.navigation.Route import com.artemchep.keyguard.feature.navigation.state.TranslatorScope import com.artemchep.keyguard.res.Res import com.artemchep.keyguard.ui.FlatItemAction +import com.artemchep.keyguard.ui.icons.ChevronIcon import com.artemchep.keyguard.ui.icons.iconSmall object EmailRelayListRoute : Route { @@ -25,6 +26,9 @@ object EmailRelayListRoute : Route { ) = FlatItemAction( leading = iconSmall(Icons.Outlined.ForwardToInbox), title = translator.translate(Res.strings.emailrelay_list_header_title), + trailing = { + ChevronIcon() + }, onClick = { val route = EmailRelayListRoute val intent = NavigationIntent.NavigateToRoute(route) diff --git a/common/src/commonMain/kotlin/com/artemchep/keyguard/feature/generator/wordlist/WordlistRoute.kt b/common/src/commonMain/kotlin/com/artemchep/keyguard/feature/generator/wordlist/WordlistRoute.kt index 225ed19e..d349f2c8 100644 --- a/common/src/commonMain/kotlin/com/artemchep/keyguard/feature/generator/wordlist/WordlistRoute.kt +++ b/common/src/commonMain/kotlin/com/artemchep/keyguard/feature/generator/wordlist/WordlistRoute.kt @@ -7,6 +7,7 @@ import com.artemchep.keyguard.feature.navigation.Route import com.artemchep.keyguard.feature.navigation.state.TranslatorScope import com.artemchep.keyguard.res.Res import com.artemchep.keyguard.ui.FlatItemAction +import com.artemchep.keyguard.ui.icons.ChevronIcon import com.artemchep.keyguard.ui.icons.KeyguardWordlist import com.artemchep.keyguard.ui.icons.iconSmall @@ -25,6 +26,9 @@ object WordlistRoute : Route { ) = FlatItemAction( leading = iconSmall(Icons.Outlined.KeyguardWordlist), title = translator.translate(Res.strings.wordlist_list_header_title), + trailing = { + ChevronIcon() + }, onClick = { val route = WordlistRoute val intent = NavigationIntent.NavigateToRoute(route) diff --git a/common/src/commonMain/kotlin/com/artemchep/keyguard/feature/home/vault/screen/VaultListStateProducer.kt b/common/src/commonMain/kotlin/com/artemchep/keyguard/feature/home/vault/screen/VaultListStateProducer.kt index d4e2d894..f7dd1c66 100644 --- a/common/src/commonMain/kotlin/com/artemchep/keyguard/feature/home/vault/screen/VaultListStateProducer.kt +++ b/common/src/commonMain/kotlin/com/artemchep/keyguard/feature/home/vault/screen/VaultListStateProducer.kt @@ -384,6 +384,9 @@ fun vaultListScreenState( Icon(Icons.Outlined.Delete, null) }, title = translate(Res.strings.trash), + trailing = { + ChevronIcon() + }, onClick = { val newArgs = args.copy( appBar = VaultRoute.Args.AppBar( @@ -406,6 +409,9 @@ fun vaultListScreenState( Icon(Icons.Outlined.Download, null) }, title = translate(Res.strings.downloads), + trailing = { + ChevronIcon() + }, onClick = { val route = AttachmentsRoute() val intent = NavigationIntent.NavigateToRoute(route) diff --git a/common/src/commonMain/kotlin/com/artemchep/keyguard/feature/home/vault/util/changePasswordAction.kt b/common/src/commonMain/kotlin/com/artemchep/keyguard/feature/home/vault/util/changePasswordAction.kt index 33099b6c..e4987d79 100644 --- a/common/src/commonMain/kotlin/com/artemchep/keyguard/feature/home/vault/util/changePasswordAction.kt +++ b/common/src/commonMain/kotlin/com/artemchep/keyguard/feature/home/vault/util/changePasswordAction.kt @@ -53,6 +53,7 @@ import com.artemchep.keyguard.feature.navigation.state.RememberStateFlowScope import com.artemchep.keyguard.res.Res import com.artemchep.keyguard.ui.FlatItemAction import com.artemchep.keyguard.ui.SimpleNote +import com.artemchep.keyguard.ui.icons.ChevronIcon import com.artemchep.keyguard.ui.icons.icon import com.artemchep.keyguard.ui.theme.badgeContainer @@ -513,6 +514,9 @@ fun RememberStateFlowScope.cipherViewPasswordHistoryAction( } }, title = title, + trailing = { + ChevronIcon() + }, onClick = { val intent = NavigationIntent.NavigateToRoute( VaultViewPasswordHistoryRoute( diff --git a/common/src/commonMain/kotlin/com/artemchep/keyguard/feature/justdeleteme/directory/JustDeleteMeServiceListRoute.kt b/common/src/commonMain/kotlin/com/artemchep/keyguard/feature/justdeleteme/directory/JustDeleteMeServiceListRoute.kt index 4a47cbae..6ffb6726 100644 --- a/common/src/commonMain/kotlin/com/artemchep/keyguard/feature/justdeleteme/directory/JustDeleteMeServiceListRoute.kt +++ b/common/src/commonMain/kotlin/com/artemchep/keyguard/feature/justdeleteme/directory/JustDeleteMeServiceListRoute.kt @@ -9,6 +9,7 @@ import com.artemchep.keyguard.feature.navigation.Route import com.artemchep.keyguard.feature.navigation.state.TranslatorScope import com.artemchep.keyguard.res.Res import com.artemchep.keyguard.ui.FlatItemAction +import com.artemchep.keyguard.ui.icons.ChevronIcon import com.artemchep.keyguard.ui.icons.iconSmall object JustDeleteMeServiceListRoute : Route { @@ -26,6 +27,9 @@ object JustDeleteMeServiceListRoute : Route { ) = FlatItemAction( leading = iconSmall(Icons.Outlined.AccountBox, Icons.Outlined.Delete), title = translator.translate(Res.strings.uri_action_how_to_delete_account_title), + trailing = { + ChevronIcon() + }, onClick = { val route = JustDeleteMeServiceListRoute val intent = NavigationIntent.NavigateToRoute(route) diff --git a/common/src/commonMain/kotlin/com/artemchep/keyguard/feature/passkeys/directory/PasskeysServiceListRoute.kt b/common/src/commonMain/kotlin/com/artemchep/keyguard/feature/passkeys/directory/PasskeysServiceListRoute.kt index 9bfb06a7..825af8ff 100644 --- a/common/src/commonMain/kotlin/com/artemchep/keyguard/feature/passkeys/directory/PasskeysServiceListRoute.kt +++ b/common/src/commonMain/kotlin/com/artemchep/keyguard/feature/passkeys/directory/PasskeysServiceListRoute.kt @@ -9,6 +9,7 @@ import com.artemchep.keyguard.feature.navigation.Route import com.artemchep.keyguard.feature.navigation.state.TranslatorScope import com.artemchep.keyguard.res.Res import com.artemchep.keyguard.ui.FlatItemAction +import com.artemchep.keyguard.ui.icons.ChevronIcon import com.artemchep.keyguard.ui.icons.iconSmall object PasskeysServiceListRoute : Route { @@ -27,6 +28,9 @@ object PasskeysServiceListRoute : Route { leading = iconSmall(Icons.Outlined.Folder, Icons.Outlined.Key), title = translator.translate(Res.strings.passkeys_directory_title), text = translator.translate(Res.strings.passkeys_directory_text), + trailing = { + ChevronIcon() + }, onClick = { val route = PasskeysServiceListRoute val intent = NavigationIntent.NavigateToRoute(route) diff --git a/common/src/commonMain/kotlin/com/artemchep/keyguard/feature/tfa/directory/TwoFaServiceListRoute.kt b/common/src/commonMain/kotlin/com/artemchep/keyguard/feature/tfa/directory/TwoFaServiceListRoute.kt index 86ea30dd..2ca37d9b 100644 --- a/common/src/commonMain/kotlin/com/artemchep/keyguard/feature/tfa/directory/TwoFaServiceListRoute.kt +++ b/common/src/commonMain/kotlin/com/artemchep/keyguard/feature/tfa/directory/TwoFaServiceListRoute.kt @@ -8,6 +8,7 @@ import com.artemchep.keyguard.feature.navigation.Route import com.artemchep.keyguard.feature.navigation.state.TranslatorScope import com.artemchep.keyguard.res.Res import com.artemchep.keyguard.ui.FlatItemAction +import com.artemchep.keyguard.ui.icons.ChevronIcon import com.artemchep.keyguard.ui.icons.KeyguardTwoFa import com.artemchep.keyguard.ui.icons.iconSmall @@ -27,6 +28,9 @@ object TwoFaServiceListRoute : Route { leading = iconSmall(Icons.Outlined.Folder, Icons.Outlined.KeyguardTwoFa), title = translator.translate(Res.strings.tfa_directory_title), text = translator.translate(Res.strings.tfa_directory_text), + trailing = { + ChevronIcon() + }, onClick = { val route = TwoFaServiceListRoute val intent = NavigationIntent.NavigateToRoute(route)