bitwarden/android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2025-12-10 00:06:22 -06:00
Code Issues Packages Projects Releases 169 Wiki Activity

[BWA-179] Added clarification of functionality on Authenticator's ExportScreen (#6190)

Browse Source
This commit is contained in:
aj-rosado 2025-12-02 10:01:00 +00:00 committed by GitHub
parent ca7a65fc95
commit 3f303d3f39
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/feature/settings/export/ExportScreen.kt
View File

@ -10,6 +10,7 @@ import androidx.compose.foundation.layout.navigationBarsPadding
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Text
import androidx.compose.material3.TopAppBarDefaults
import androidx.compose.material3.rememberTopAppBarState
import androidx.compose.runtime.Composable
@ -23,6 +24,7 @@ import androidx.compose.ui.platform.LocalResources
import androidx.compose.ui.platform.testTag
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle
@ -45,6 +47,7 @@ import com.bitwarden.ui.platform.composition.LocalIntentManager
import com.bitwarden.ui.platform.manager.IntentManager
import com.bitwarden.ui.platform.resource.BitwardenDrawable
import com.bitwarden.ui.platform.resource.BitwardenString
import com.bitwarden.ui.platform.theme.BitwardenTheme
import kotlinx.collections.immutable.toImmutableList
/**
@ -175,7 +178,34 @@ private fun ExportScreenContent(
.verticalScroll(rememberScrollState()),
) {
val resources = LocalResources.current
Spacer(modifier = Modifier.height(height = 24.dp))
Text(
text = stringResource(id = BitwardenString.included_in_this_export),
style = BitwardenTheme.typography.titleMedium,
color = BitwardenTheme.colorScheme.text.primary,
textAlign = TextAlign.Center,
modifier = Modifier
.standardHorizontalMargin()
.fillMaxWidth(),
)
Spacer(modifier = Modifier.height(height = 12.dp))
Text(
text = stringResource(
id = BitwardenString.only_codes_stored_locally_on_this_device_will_be_exported,
),
style = BitwardenTheme.typography.bodyMedium,
color = BitwardenTheme.colorScheme.text.primary,
textAlign = TextAlign.Center,
modifier = Modifier
.standardHorizontalMargin()
.fillMaxWidth(),
)
Spacer(modifier = Modifier.height(height = 24.dp))
BitwardenMultiSelectButton(
label = stringResource(id = BitwardenString.file_format),
options = ExportVaultFormat.entries.map { it.displayLabel() }.toImmutableList(),

4
ui/src/main/res/values/strings.xml
View File

@ -385,7 +385,7 @@ Scanning will happen automatically.</string>
<string name="send_verification_code_to_email">Send a verification code to your email</string>
<string name="code_sent">Code sent!</string>
<string name="confirm_your_identity">Confirm your identity to continue.</string>
<string name="export_vault_warning">This export contains your vault data in an unencrypted format. You should not store or send the exported file over unsecure channels (such as email). Delete it immediately after you are done using it.</string>
<string name="export_vault_warning">For your security, don’t share or send this file over unsecured channels (like email), and delete it when you’re done.</string>
<string name="export_vault_file_pw_protect_info">This file export will be password protected and require the file password to decrypt.</string>
<string name="export_vault_confirmation_title">Confirm vault export</string>
<string name="warning">Warning</string>
@ -1042,6 +1042,8 @@ Do you want to switch to this account?</string>
<string name="export">Export</string>
<string name="export_confirmation_title">Confirm export</string>
<string name="export_success">Data exported successfully</string>
<string name="included_in_this_export">Included in this export</string>
<string name="only_codes_stored_locally_on_this_device_will_be_exported">Only codes stored locally on this device will be exported. Synced codes aren\'t included</string>
<string name="security">Security</string>
<string name="too_many_failed_biometric_attempts">Too many failed biometrics attempts.</string>
<string name="version">Version</string>