Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-22 18:00:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Hide paragraph if not during manual restore.

Browse Source
This commit is contained in:
Alex Hart
2025-06-26 09:43:57 -03:00
committed by Greyson Parrelli
parent 68d3103e4c
commit 9725d98c4a
3 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/EnterBackupKeyFragment.kt
View File

@@ -90,6 +90,7 @@ class EnterBackupKeyFragment : ComposeFragment() {
}
EnterBackupKeyScreen(
isDisplayedDuringManualRestore = true,
backupKey = viewModel.backupKey,
inProgress = sharedState.inProgress,
isBackupKeyValid = state.backupKeyValid,

39
app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/restore/EnterBackupKeyScreen.kt
View File

@@ -66,6 +66,7 @@ import org.whispersystems.signalservice.api.AccountEntropyPool
@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun EnterBackupKeyScreen(
isDisplayedDuringManualRestore: Boolean,
backupKey: String,
inProgress: Boolean,
isBackupKeyValid: Boolean,
@@ -191,7 +192,8 @@ fun EnterBackupKeyScreen(
}
onLearnMore()
},
onSkip = onSkip
onSkip = onSkip,
showSecondParagraph = isDisplayedDuringManualRestore
)
}
}
@@ -218,7 +220,8 @@ private fun EnterBackupKeyScreenPreview() {
isBackupKeyValid = true,
inProgress = false,
chunkLength = 4,
aepValidationError = null
aepValidationError = null,
isDisplayedDuringManualRestore = true
) {}
}
}
@@ -232,13 +235,15 @@ private fun EnterBackupKeyScreenErrorPreview() {
isBackupKeyValid = true,
inProgress = false,
chunkLength = 4,
aepValidationError = AccountEntropyPoolVerification.AEPValidationError.Invalid
aepValidationError = AccountEntropyPoolVerification.AEPValidationError.Invalid,
isDisplayedDuringManualRestore = true
) {}
}
}
@Composable
private fun NoBackupKeyBottomSheet(
showSecondParagraph: Boolean,
onLearnMore: () -> Unit = {},
onSkip: () -> Unit = {}
) {
@@ -277,13 +282,15 @@ private fun NoBackupKeyBottomSheet(
color = MaterialTheme.colorScheme.onSurfaceVariant
)
Spacer(modifier = Modifier.height(24.dp))
if (showSecondParagraph) {
Spacer(modifier = Modifier.height(24.dp))
Text(
text = stringResource(R.string.EnterBackupKey_no_key_paragraph_2),
style = MaterialTheme.typography.bodyMedium.copy(textAlign = TextAlign.Center),
color = MaterialTheme.colorScheme.onSurfaceVariant
)
Text(
text = stringResource(R.string.EnterBackupKey_no_key_paragraph_2),
style = MaterialTheme.typography.bodyMedium.copy(textAlign = TextAlign.Center),
color = MaterialTheme.colorScheme.onSurfaceVariant
)
}
Spacer(modifier = Modifier.height(36.dp))
@@ -316,6 +323,18 @@ private fun NoBackupKeyBottomSheet(
@Composable
private fun NoBackupKeyBottomSheetPreview() {
Previews.BottomSheetPreview {
NoBackupKeyBottomSheet()
NoBackupKeyBottomSheet(
showSecondParagraph = true
)
}
}
@SignalPreview
@Composable
private fun NoBackupKeyBottomSheetNoSecondParagraphPreview() {
Previews.BottomSheetPreview {
NoBackupKeyBottomSheet(
showSecondParagraph = false
)
}
}

1
app/src/main/java/org/thoughtcrime/securesms/restore/enterbackupkey/PostRegistrationEnterBackupKeyFragment.kt
View File

@@ -64,6 +64,7 @@ class PostRegistrationEnterBackupKeyFragment : ComposeFragment() {
val state by viewModel.state.collectAsStateWithLifecycle()
EnterBackupKeyScreen(
isDisplayedDuringManualRestore = false,
backupKey = viewModel.backupKey,
isBackupKeyValid = state.backupKeyValid,
inProgress = state.inProgress,