diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/appearance/AppearanceScreen.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/appearance/AppearanceScreen.kt index 88396527a3..9334b61e21 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/appearance/AppearanceScreen.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/appearance/AppearanceScreen.kt @@ -121,8 +121,7 @@ fun AppearanceScreen( Spacer(modifier = Modifier.height(height = 8.dp)) if (state.isDynamicColorsSupported) { BitwardenSwitch( - label = stringResource(id = R.string.dynamic_colors), - supportingText = stringResource(id = R.string.dynamic_colors_description), + label = stringResource(id = R.string.use_dynamic_colors), isChecked = state.isDynamicColorsEnabled, onCheckedChange = remember(viewModel) { { viewModel.trySendAction(AppearanceAction.DynamicColorsToggle(it)) } @@ -169,7 +168,7 @@ private fun AppearanceDialogs( when (dialogState) { AppearanceState.DialogState.EnableDynamicColors -> { BitwardenTwoButtonDialog( - title = stringResource(id = R.string.dynamic_colors), + title = stringResource(id = R.string.use_dynamic_colors_question), message = stringResource( id = R.string.dynamic_colors_may_not_adhere_to_accessibility_guidelines, ), diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index fb6f63ec15..3e7ab7fea8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -968,9 +968,9 @@ Do you want to switch to this account? View text Send Delete Send Missing Send re-sync your vault - Dynamic colors - Apply dynamic colors based on your wallpaper - Dynamic colors uses the system colors and may not meet all accessibility guidelines. + Use dynamic colors + Use dynamic colors? + This color scheme automatically applies system colors to Bitwarden based on your current wallpaper. These colors may not meet all accessibility guidelines. Passkey operation failed because browser (%1$s) is not recognized. Select \"Trust\" to add %1$s to the list of locally trusted applications. Passkey operation failed because the browser is not trusted. Trust diff --git a/app/src/test/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/appearance/AppearanceScreenTest.kt b/app/src/test/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/appearance/AppearanceScreenTest.kt index e6b9a32c94..1a031dbd22 100644 --- a/app/src/test/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/appearance/AppearanceScreenTest.kt +++ b/app/src/test/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/appearance/AppearanceScreenTest.kt @@ -207,21 +207,21 @@ class AppearanceScreenTest : BitwardenComposeTest() { } @Test - fun `dynamic colors should be displayed based on state`() { - composeTestRule.onNodeWithText("Dynamic colors") + fun `use dynamic colors should be displayed based on state`() { + composeTestRule.onNodeWithText("Use dynamic colors") .performScrollTo() .assertIsDisplayed() mutableStateFlow.update { it.copy(isDynamicColorsSupported = false) } - composeTestRule.onNodeWithText("Dynamic colors") + composeTestRule.onNodeWithText("Use dynamic colors") .assertIsNotDisplayed() } @Test fun `on DynamicColorsToggle should send DynamicColorsToggle`() { - composeTestRule.onNodeWithText("Dynamic colors") + composeTestRule.onNodeWithText("Use dynamic colors") .performScrollTo() .performClick() verify { viewModel.trySendAction(AppearanceAction.DynamicColorsToggle(true)) }