-
Notifications
You must be signed in to change notification settings - Fork 339
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add daita confirmation dialog and address feedback
- Loading branch information
1 parent
abe1286
commit b5e5006
Showing
13 changed files
with
160 additions
and
56 deletions.
There are no files selected for viewing
104 changes: 104 additions & 0 deletions
104
android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/DaitaConfirmationDialog.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| package net.mullvad.mullvadvpn.compose.dialog | ||
|
|
||
| import androidx.compose.foundation.layout.Arrangement | ||
| import androidx.compose.foundation.layout.Column | ||
| import androidx.compose.foundation.layout.Spacer | ||
| import androidx.compose.foundation.layout.fillMaxWidth | ||
| import androidx.compose.foundation.layout.height | ||
| import androidx.compose.foundation.rememberScrollState | ||
| import androidx.compose.foundation.verticalScroll | ||
| import androidx.compose.material3.AlertDialog | ||
| import androidx.compose.material3.Icon | ||
| import androidx.compose.material3.MaterialTheme | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.runtime.getValue | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.res.painterResource | ||
| import androidx.compose.ui.res.stringResource | ||
| import androidx.compose.ui.tooling.preview.Preview | ||
| import androidx.lifecycle.compose.dropUnlessResumed | ||
| import com.ramcosta.composedestinations.annotation.Destination | ||
| import com.ramcosta.composedestinations.annotation.RootGraph | ||
| import com.ramcosta.composedestinations.result.EmptyResultBackNavigator | ||
| import com.ramcosta.composedestinations.result.ResultBackNavigator | ||
| import com.ramcosta.composedestinations.spec.DestinationStyle | ||
| import net.mullvad.mullvadvpn.R | ||
| import net.mullvad.mullvadvpn.compose.button.PrimaryButton | ||
| import net.mullvad.mullvadvpn.compose.component.drawVerticalScrollbar | ||
| import net.mullvad.mullvadvpn.lib.theme.AppTheme | ||
| import net.mullvad.mullvadvpn.lib.theme.Dimens | ||
| import net.mullvad.mullvadvpn.lib.theme.color.AlphaScrollbar | ||
|
|
||
| @Preview | ||
| @Composable | ||
| private fun PreviewDaitaConfirmationDialog() { | ||
| AppTheme { DaitaConfirmationDialog(EmptyResultBackNavigator()) } | ||
| } | ||
|
|
||
| @Destination<RootGraph>(style = DestinationStyle.Dialog::class) | ||
| @Composable | ||
| fun DaitaConfirmationDialog(navigator: ResultBackNavigator<Boolean>) { | ||
| AlertDialog( | ||
| onDismissRequest = dropUnlessResumed { navigator.navigateBack(false) }, | ||
| icon = { | ||
| Icon( | ||
| modifier = Modifier.fillMaxWidth().height(Dimens.dialogIconHeight), | ||
| painter = painterResource(id = R.drawable.icon_alert), | ||
| contentDescription = "", | ||
| tint = MaterialTheme.colorScheme.onSurface | ||
| ) | ||
| }, | ||
| text = { | ||
| val scrollState = rememberScrollState() | ||
| Column( | ||
| Modifier.drawVerticalScrollbar( | ||
| scrollState, | ||
| MaterialTheme.colorScheme.onPrimary.copy(alpha = AlphaScrollbar) | ||
| ) | ||
| .verticalScroll(scrollState), | ||
| horizontalAlignment = Alignment.CenterHorizontally, | ||
| ) { | ||
| Text( | ||
| text = stringResource(id = R.string.daita_relay_subset_warning), | ||
| color = MaterialTheme.colorScheme.onSurface, | ||
| style = MaterialTheme.typography.bodySmall, | ||
| modifier = Modifier.fillMaxWidth(), | ||
| ) | ||
|
|
||
| Spacer(modifier = Modifier.height(Dimens.verticalSpace)) | ||
|
|
||
| Text( | ||
| text = | ||
| stringResource( | ||
| id = R.string.daita_warning, | ||
| stringResource( | ||
| id = R.string.daita, | ||
| ), | ||
| ), | ||
| color = MaterialTheme.colorScheme.onSurface, | ||
| style = MaterialTheme.typography.bodySmall, | ||
| modifier = Modifier.fillMaxWidth(), | ||
| ) | ||
| } | ||
| }, | ||
| confirmButton = { | ||
| Column(verticalArrangement = Arrangement.spacedBy(Dimens.buttonSpacing)) { | ||
| PrimaryButton( | ||
| modifier = Modifier.fillMaxWidth(), | ||
| text = stringResource(R.string.enable_anyway), | ||
| onClick = { navigator.navigateBack(true) }, | ||
| ) | ||
|
|
||
| PrimaryButton( | ||
| modifier = Modifier.fillMaxWidth(), | ||
| text = stringResource(R.string.back), | ||
| onClick = dropUnlessResumed { navigator.navigateBack(false) }, | ||
| ) | ||
| } | ||
| }, | ||
| containerColor = MaterialTheme.colorScheme.surface, | ||
| titleContentColor = MaterialTheme.colorScheme.onSurface, | ||
| ) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.