Skip to content

Commit ce7d859

Browse files
ambrose40SanderKondratjevNortal
authored andcommitted
Rename res string name. (#269)
* MOPPAND-1637 Rename res string name. * MOPPAND-1637 Rename setting button test tag. * MOPPAND-1637 Remove unnecessary duplicating accessibility text res.
1 parent e55311d commit ce7d859

File tree

5 files changed

+9
-17
lines changed

5 files changed

+9
-17
lines changed

app/src/main/kotlin/ee/ria/DigiDoc/fragment/screen/AdvancedSettingsScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ fun AdvancedSettingsScreen(
130130
TopBar(
131131
modifier = modifier,
132132
sharedMenuViewModel = sharedMenuViewModel,
133-
title = R.string.main_settings_menu_signing,
133+
title = R.string.main_settings_menu_advanced,
134134
onLeftButtonClick = {
135135
navController.navigateUp()
136136
},

app/src/main/kotlin/ee/ria/DigiDoc/ui/component/menu/MenuButton.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ fun MenuButton(
4747
buttonClick: () -> Unit = {},
4848
testTag: String = "",
4949
) {
50-
val contentDescription = stringResource(id = buttonStringResContentDescription)
50+
val contentDescription = stringResource(id = buttonStringResContentDescription).lowercase()
5151
Button(
5252
onClick = buttonClick,
5353
modifier =

app/src/main/kotlin/ee/ria/DigiDoc/ui/component/menu/SettingsMenuBottomSheet.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ fun SettingsMenuBottomSheet(
3232
isBottomSheetVisible: MutableState<Boolean> = mutableStateOf(false),
3333
@StringRes firstButtonStringRes: Int = R.string.main_settings_menu_language,
3434
@StringRes secondButtonStringRes: Int = R.string.main_settings_menu_appearance,
35-
@StringRes thirdButtonStringRes: Int = R.string.main_settings_menu_signing,
36-
@StringRes firstButtonStringResContentDescription: Int = R.string.main_settings_menu_language_accessibility,
37-
@StringRes secondButtonStringResContentDescription: Int = R.string.main_settings_menu_appearance_accessibility,
38-
@StringRes thirdButtonStringResContentDescription: Int = R.string.main_settings_menu_signing_accessibility,
35+
@StringRes thirdButtonStringRes: Int = R.string.main_settings_menu_advanced,
36+
@StringRes firstButtonStringResContentDescription: Int = R.string.main_settings_menu_language,
37+
@StringRes secondButtonStringResContentDescription: Int = R.string.main_settings_menu_appearance,
38+
@StringRes thirdButtonStringResContentDescription: Int = R.string.main_settings_menu_advanced,
3939
@DrawableRes firstButtonIcon: Int = R.drawable.ic_m3_chat_bubble_48dp_wght400,
4040
@DrawableRes secondButtonIcon: Int = R.drawable.ic_m3_invert_colors_48dp_wght400,
4141
@DrawableRes thirdButtonIcon: Int = R.drawable.ic_m3_tune_48dp_wght400,
@@ -48,7 +48,7 @@ fun SettingsMenuBottomSheet(
4848
testTag: String = "menuSettingsBottomSheet",
4949
firstButtonTestTag: String = "menuSettingsLanguageButton",
5050
secondButtonTestTag: String = "menuSettingsAppearanceButton",
51-
thirdButtonTestTag: String = "menuSettingsSigningButton",
51+
thirdButtonTestTag: String = "menuSettingsAdvancedButton",
5252
) {
5353
if (isBottomSheetVisible.value) {
5454
val firstButtonClick =

app/src/main/res/values-et/strings.xml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111

112112
<string name="main_settings_menu_language">Keelevalik</string>
113113
<string name="main_settings_menu_appearance">Välimus</string>
114-
<string name="main_settings_menu_signing">Täpsemad seaded</string>
114+
<string name="main_settings_menu_advanced">Täpsemad seaded</string>
115115

116116
<!-- Signing -->
117117
<string name="signing_title_new_container">Allkirjastamine</string>
@@ -445,10 +445,6 @@
445445
<string name="main_menu_save_container_accessibility">Salvesta ümbrik</string>
446446
<string name="main_menu_encrypt_container_accessibility">Krüpteeri ümbrik</string>
447447

448-
<string name="main_settings_menu_language_accessibility">Keelevalik</string>
449-
<string name="main_settings_menu_appearance_accessibility">Välimus</string>
450-
<string name="main_settings_menu_signing_accessibility">Täpsemad seaded</string>
451-
452448
<string name="choose_server_option">Vali server</string>
453449
<string name="option">Valik</string>
454450
<string name="option_selected">Valik %1$s valitud</string>

app/src/main/res/values/strings.xml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111

112112
<string name="main_settings_menu_language">Language selection</string>
113113
<string name="main_settings_menu_appearance">Appearance</string>
114-
<string name="main_settings_menu_signing">Advanced settings</string>
114+
<string name="main_settings_menu_advanced">Advanced settings</string>
115115

116116
<!-- Signing -->
117117
<string name="signing_title_new_container">Signing</string>
@@ -445,10 +445,6 @@
445445
<string name="main_menu_save_container_accessibility">Save container</string>
446446
<string name="main_menu_encrypt_container_accessibility">Encrypt container</string>
447447

448-
<string name="main_settings_menu_language_accessibility">Language selection</string>
449-
<string name="main_settings_menu_appearance_accessibility">Appearance</string>
450-
<string name="main_settings_menu_signing_accessibility">Advanced settings</string>
451-
452448
<string name="choose_server_option">Choose server</string>
453449
<string name="option">Option</string>
454450
<string name="option_selected">Option %1$s selected</string>

0 commit comments

Comments
 (0)