github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-05-10 05:49:44 -05:00
Code Issues 1.1k Packages Projects Releases 122 Wiki Activity

PM-17958: Update appearance text (#4686)

Browse Source
This commit is contained in:
David Perez
2025-02-04 09:52:25 -06:00
committed by GitHub
parent b342f21cbb
commit 5f48d7bebd
3 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/appearance/AppearanceScreen.kt
View File

@@ -139,6 +139,7 @@ private fun LanguageSelectionRow(
)
languageChangedDialogOption = selectedLanguage
},
supportingText = stringResource(id = R.string.language_description),
cardStyle = CardStyle.Full,
modifier = modifier,
)

5
app/src/main/res/values/strings.xml
View File

@@ -341,7 +341,7 @@ Scanning will happen automatically.</string>
<string name="address">Address</string>
<string name="expiration">Expiration</string>
<string name="show_website_icons">Show website icons</string>
<string name="show_website_icons_description">Show a recognizable image next to each login.</string>
<string name="show_website_icons_description">Show a recognizable image next to each login</string>
<string name="icons_url">Icons server URL</string>
<string name="autofill_with_bitwarden">Autofill with Bitwarden</string>
<string name="vault_is_locked">Vault is locked</string>
@@ -472,7 +472,7 @@ Scanning will happen automatically.</string>
<string name="default_uri_match_detection">Default URI match detection</string>
<string name="default_uri_match_detection_description">Choose the default way that URI match detection is handled for logins when performing actions such as autofill.</string>
<string name="theme">Theme</string>
<string name="theme_description">Change the application\'s color theme.</string>
<string name="theme_description">Change the application\'s color theme</string>
<string name="theme_default">Default (System)</string>
<string name="default_dark_theme">Default dark theme</string>
<string name="copy_notes">Copy note</string>
@@ -793,6 +793,7 @@ Do you want to switch to this account?</string>
<string name="no_pending_requests">No pending requests</string>
<string name="enable_camer_permission_to_use_the_scanner">Enable camera permission to use the scanner</string>
<string name="language">Language</string>
<string name="language_description">Change the application\'s language</string>
<string name="language_change_x_description">The language has been changed to %1$s. Please restart the app to see the change</string>
<string name="language_change_requires_app_restart">Language change requires app restart</string>
<string name="default_system">Default (System)</string>

18
app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/appearance/AppearanceScreenTest.kt
View File

@@ -54,7 +54,9 @@ class AppearanceScreenTest : BaseComposeTest() {
@Test
fun `on language row click should display language selection dialog`() {
composeTestRule
.onNodeWithContentDescription(label = "Default (System). Language")
.onNodeWithContentDescription(
label = "Default (System). Language. Change the application's language",
)
.performScrollTo()
.performClick()
composeTestRule
@@ -67,7 +69,9 @@ class AppearanceScreenTest : BaseComposeTest() {
fun `on language selection dialog item click should send LanguageChange and show dialog`() {
// Clicking the Language row shows the language selection dialog
composeTestRule
.onNodeWithContentDescription(label = "Default (System). Language")
.onNodeWithContentDescription(
label = "Default (System). Language. Change the application's language",
)
.performScrollTo()
.performClick()
// Selecting a language dismisses this dialog and displays the confirmation
@@ -103,7 +107,9 @@ class AppearanceScreenTest : BaseComposeTest() {
@Test
fun `on language selection dialog cancel click should dismiss dialog`() {
composeTestRule
.onNodeWithContentDescription(label = "Default (System). Language")
.onNodeWithContentDescription(
label = "Default (System). Language. Change the application's language",
)
.performScrollTo()
.performClick()
composeTestRule
@@ -118,7 +124,7 @@ class AppearanceScreenTest : BaseComposeTest() {
composeTestRule.onRoot().printToLog("Brian")
composeTestRule
.onNodeWithContentDescription(
label = "Default (System). Theme. Change the application's color theme.",
label = "Default (System). Theme. Change the application's color theme",
)
.performScrollTo()
.performClick()
@@ -132,7 +138,7 @@ class AppearanceScreenTest : BaseComposeTest() {
fun `on theme selection dialog item click should send ThemeChange`() {
composeTestRule
.onNodeWithContentDescription(
label = "Default (System). Theme. Change the application's color theme.",
label = "Default (System). Theme. Change the application's color theme",
)
.performScrollTo()
.performClick()
@@ -155,7 +161,7 @@ class AppearanceScreenTest : BaseComposeTest() {
fun `on theme selection dialog cancel click should dismiss dialog`() {
composeTestRule
.onNodeWithContentDescription(
label = "Default (System). Theme. Change the application's color theme.",
label = "Default (System). Theme. Change the application's color theme",
)
.performScrollTo()
.performClick()