Skip to content

Replaced "Create" by "Add" when creating accounts #892

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 8, 2024
Merged

Replaced "Create" by "Add" when creating accounts #892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/src/main/kotlin/at/bitfire/davdroid/ui/AccountsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,8 +194,8 @@ fun AccountsScreen(
Column(horizontalAlignment = Alignment.CenterHorizontally) {
if (showAddAccount == AccountsModel.FABStyle.WithText)
ExtendedFloatingActionButton(
text = { Text(stringResource(R.string.login_create_account)) },
icon = { Icon(Icons.Filled.Add, stringResource(R.string.login_create_account)) },
text = { Text(stringResource(R.string.login_add_account)) },
icon = { Icon(Icons.Filled.Add, stringResource(R.string.login_add_account)) },
containerColor = MaterialTheme.colorScheme.primary,
contentColor = MaterialTheme.colorScheme.onPrimary,
onClick = onAddAccount
Expand All @@ -206,7 +206,7 @@ fun AccountsScreen(
containerColor = MaterialTheme.colorScheme.secondary,
contentColor = MaterialTheme.colorScheme.onSecondary
) {
Icon(Icons.Filled.Add, stringResource(R.string.login_create_account))
Icon(Icons.Filled.Add, stringResource(R.string.login_add_account))
}

if (showSyncAll)
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/kotlin/at/bitfire/davdroid/ui/setup/AccountDetailsPage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ fun AccountDetailsPage(
val context = LocalContext.current
LaunchedEffect(uiState.couldNotCreateAccount) {
if (uiState.couldNotCreateAccount) {
snackbarHostState.showSnackbar(context.getString(R.string.login_account_not_created))
snackbarHostState.showSnackbar(context.getString(R.string.login_account_not_added))
model.resetCouldNotCreateAccount()
}
}
Expand Down Expand Up @@ -93,7 +93,7 @@ fun AccountDetailsPageContent(
creatingAccount: Boolean
) {
Assistant(
nextLabel = stringResource(R.string.login_create_account),
nextLabel = stringResource(R.string.login_add_account),
onNext = onCreateAccount,
nextEnabled = !creatingAccount && accountName.isNotBlank() && !accountNameAlreadyExists
) {
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,14 +263,14 @@
<string name="login_base_url">Base URL</string>
<string name="login_base_url_info"><![CDATA[The base URL will be checked directly, but <a href="%s">services are also discovered</a> using DNS records and well-known URLs.]]></string>
<string name="login_select_certificate">Select certificate</string>
<string name="login_create_account">Create account</string>
<string name="login_add_account">Add account</string>
<string name="login_account_name">Account name</string>
<string name="login_account_avoid_apostrophe">Usage of apostrophes (\') seems to cause problems on some devices.</string>
<string name="login_account_name_info">Use your email address as account name because Android will use the account name as ORGANIZER field for events you create. You can\'t have two accounts with the same name.</string>
<string name="login_account_contact_group_method">Contact group method:</string>
<string name="login_account_name_required">Account name required</string>
<string name="login_account_name_already_taken">Account name already taken</string>
<string name="login_account_not_created">Account could not be created</string>
<string name="login_account_not_added">Account could not be added</string>
<string name="login_type_advanced">Advanced login</string>
<string name="login_no_client_certificate_optional">No client certificate*</string>
<string name="login_client_certificate_selected">Client certificate: %s</string>
Expand Down
Loading