diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/landing/LandingScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/landing/LandingScreen.kt index a9570b9615..c0ac3907dc 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/landing/LandingScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/landing/LandingScreen.kt @@ -247,7 +247,8 @@ private fun LandingScreenContent( cardStyle = CardStyle.Full, supportingTextContent = { EnvironmentSelector( - labelText = stringResource(id = R.string.logging_in_on), + labelText = stringResource(id = R.string.logging_in_on_with_colon), + dialogTitle = stringResource(id = R.string.logging_in_on), selectedOption = state.selectedEnvironmentType, onOptionSelected = onEnvironmentTypeSelect, modifier = Modifier diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/startregistration/StartRegistrationScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/startregistration/StartRegistrationScreen.kt index bbf912eade..544299c5b3 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/startregistration/StartRegistrationScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/startregistration/StartRegistrationScreen.kt @@ -232,7 +232,8 @@ private fun StartRegistrationContent( modifier = Modifier.fillMaxWidth(), ) { EnvironmentSelector( - labelText = stringResource(id = R.string.creating_on), + labelText = stringResource(id = R.string.create_account_on_with_colon), + dialogTitle = stringResource(id = R.string.create_account_on), selectedOption = selectedEnvironmentType, onOptionSelected = handler.onEnvironmentTypeSelect, modifier = Modifier.testTag("RegionSelectorDropdown"), diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/dropdown/EnvironmentSelector.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/dropdown/EnvironmentSelector.kt index 0f11720a38..2798b4ab96 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/dropdown/EnvironmentSelector.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/dropdown/EnvironmentSelector.kt @@ -35,6 +35,7 @@ import com.x8bit.bitwarden.ui.platform.util.displayLabel * and displays the currently selected region on the UI. * * @param labelText The text displayed near the selector button. + * @param dialogTitle The title displayed in the selection dialog. * @param selectedOption The currently selected environment option. * @param onOptionSelected A callback that gets invoked when an environment option is selected * and passes the selected option as an argument. @@ -43,6 +44,7 @@ import com.x8bit.bitwarden.ui.platform.util.displayLabel @Composable fun EnvironmentSelector( labelText: String, + dialogTitle: String, selectedOption: Environment.Type, onOptionSelected: (Environment.Type) -> Unit, modifier: Modifier = Modifier, @@ -64,12 +66,12 @@ fun EnvironmentSelector( Text( text = labelText, style = BitwardenTheme.typography.bodySmall, - color = BitwardenTheme.colorScheme.text.primary, - modifier = Modifier.padding(end = 12.dp), + color = BitwardenTheme.colorScheme.text.secondary, + modifier = Modifier.padding(end = 4.dp), ) Text( text = selectedOption.displayLabel(), - style = BitwardenTheme.typography.labelLarge, + style = BitwardenTheme.typography.labelMedium, color = BitwardenTheme.colorScheme.text.interaction, modifier = Modifier.padding(end = 8.dp), ) @@ -82,7 +84,7 @@ fun EnvironmentSelector( if (shouldShowDialog) { BitwardenSelectionDialog( - title = stringResource(id = R.string.logging_in_on), + title = dialogTitle, onDismissRequest = { shouldShowDialog = false }, ) { options.forEach { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7a498a4c6f..b3fb761195 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -842,6 +842,7 @@ Do you want to switch to this account? Log in with device must be set up in the settings of the Bitwarden app. Need another option? Log in with device Logging in on + Logging in on: Vault Appearance Account security @@ -936,7 +937,8 @@ Do you want to switch to this account? Self-hosted server URL Passkey operation failed because user could not be verified. User verification - Creating on: + Create account on + Create account on: Follow the instructions in the email sent to %1$s to continue creating your account. We sent an email to %1$s. By continuing, you agree to the Terms of Service and Privacy Policy