-
Notifications
You must be signed in to change notification settings - Fork 354
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Showing
7 changed files
with
344 additions
and
220 deletions.
There are no files selected for viewing
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
265 changes: 265 additions & 0 deletions
265
android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/RedeemVoucherDialog.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,265 @@ | ||
package net.mullvad.mullvadvpn.compose.dialog | ||
|
||
import android.content.res.Configuration | ||
import androidx.compose.foundation.Image | ||
import androidx.compose.foundation.layout.Column | ||
import androidx.compose.foundation.layout.Row | ||
import androidx.compose.foundation.layout.Spacer | ||
import androidx.compose.foundation.layout.fillMaxWidth | ||
import androidx.compose.foundation.layout.height | ||
import androidx.compose.foundation.layout.padding | ||
import androidx.compose.foundation.layout.width | ||
import androidx.compose.material3.AlertDialog | ||
import androidx.compose.material3.ButtonDefaults | ||
import androidx.compose.material3.CircularProgressIndicator | ||
import androidx.compose.material3.MaterialTheme | ||
import androidx.compose.material3.Text | ||
import androidx.compose.runtime.Composable | ||
import androidx.compose.ui.Alignment | ||
import androidx.compose.ui.Modifier | ||
import androidx.compose.ui.graphics.compositeOver | ||
import androidx.compose.ui.res.painterResource | ||
import androidx.compose.ui.res.pluralStringResource | ||
import androidx.compose.ui.res.stringResource | ||
import androidx.compose.ui.text.input.KeyboardType | ||
import androidx.compose.ui.tooling.preview.Devices | ||
import androidx.compose.ui.tooling.preview.Preview | ||
import net.mullvad.mullvadvpn.R | ||
import net.mullvad.mullvadvpn.compose.button.ActionButton | ||
import net.mullvad.mullvadvpn.compose.state.VoucherDialogState | ||
import net.mullvad.mullvadvpn.compose.state.VoucherDialogUiState | ||
import net.mullvad.mullvadvpn.compose.textfield.GroupedTextField | ||
import net.mullvad.mullvadvpn.compose.util.vouchersVisualTransformation | ||
import net.mullvad.mullvadvpn.constant.VOUCHER_LENGTH | ||
import net.mullvad.mullvadvpn.lib.theme.AlphaDisabled | ||
import net.mullvad.mullvadvpn.lib.theme.AlphaInactive | ||
import net.mullvad.mullvadvpn.lib.theme.AppTheme | ||
import net.mullvad.mullvadvpn.lib.theme.Dimens | ||
import org.joda.time.DateTimeConstants | ||
|
||
@Preview(device = Devices.TV_720p) | ||
@Composable | ||
private fun PreviewRedeemVoucherDialog() { | ||
AppTheme { | ||
RedeemVoucherDialog( | ||
uiState = VoucherDialogUiState.INITIAL, | ||
onVoucherInputChange = {}, | ||
onRedeem = {}, | ||
onDismiss = {} | ||
) | ||
} | ||
} | ||
|
||
@Preview(uiMode = Configuration.UI_MODE_NIGHT_YES, device = Devices.PIXEL_3) | ||
@Composable | ||
private fun PreviewRedeemVoucherDialogVerifying() { | ||
AppTheme { | ||
RedeemVoucherDialog( | ||
uiState = VoucherDialogUiState("", VoucherDialogState.Verifying), | ||
onVoucherInputChange = {}, | ||
onRedeem = {}, | ||
onDismiss = {} | ||
) | ||
} | ||
} | ||
|
||
@Preview(uiMode = Configuration.UI_MODE_NIGHT_YES, device = Devices.PIXEL_3) | ||
@Composable | ||
private fun PreviewRedeemVoucherDialogError() { | ||
AppTheme { | ||
RedeemVoucherDialog( | ||
uiState = VoucherDialogUiState("", VoucherDialogState.Error("An Error message")), | ||
onVoucherInputChange = {}, | ||
onRedeem = {}, | ||
onDismiss = {} | ||
) | ||
} | ||
} | ||
|
||
@Preview(uiMode = Configuration.UI_MODE_NIGHT_YES, device = Devices.PIXEL_3) | ||
@Composable | ||
private fun PreviewRedeemVoucherDialogSuccess() { | ||
AppTheme { | ||
RedeemVoucherDialog( | ||
uiState = VoucherDialogUiState("", VoucherDialogState.Success(0)), | ||
onVoucherInputChange = {}, | ||
onRedeem = {}, | ||
onDismiss = {} | ||
) | ||
} | ||
} | ||
|
||
@Composable | ||
fun RedeemVoucherDialog( | ||
uiState: VoucherDialogUiState, | ||
onVoucherInputChange: (String) -> Unit = {}, | ||
onRedeem: (voucherCode: String) -> Unit, | ||
onDismiss: () -> Unit | ||
) { | ||
AlertDialog( | ||
title = { | ||
if (uiState.voucherViewModelState !is VoucherDialogState.Success) | ||
Text( | ||
text = stringResource(id = R.string.enter_voucher_code), | ||
style = MaterialTheme.typography.titleMedium | ||
) | ||
}, | ||
confirmButton = { | ||
Column { | ||
if (uiState.voucherViewModelState !is VoucherDialogState.Success) { | ||
ActionButton( | ||
text = stringResource(id = R.string.redeem), | ||
onClick = { onRedeem(uiState.voucherInput) }, | ||
modifier = Modifier.padding(bottom = Dimens.mediumPadding), | ||
colors = | ||
ButtonDefaults.buttonColors( | ||
containerColor = MaterialTheme.colorScheme.surface, | ||
contentColor = MaterialTheme.colorScheme.onSurface, | ||
disabledContentColor = | ||
MaterialTheme.colorScheme.onSurface | ||
.copy(alpha = AlphaInactive) | ||
.compositeOver(MaterialTheme.colorScheme.surface), | ||
disabledContainerColor = | ||
MaterialTheme.colorScheme.surface | ||
.copy(alpha = AlphaDisabled) | ||
.compositeOver(MaterialTheme.colorScheme.surface) | ||
), | ||
isEnabled = uiState.voucherInput.length == VOUCHER_LENGTH | ||
) | ||
} | ||
ActionButton( | ||
colors = | ||
ButtonDefaults.buttonColors( | ||
containerColor = MaterialTheme.colorScheme.primary, | ||
contentColor = MaterialTheme.colorScheme.onPrimary, | ||
), | ||
text = | ||
stringResource( | ||
id = | ||
if (uiState.voucherViewModelState is VoucherDialogState.Success) | ||
R.string.changes_dialog_dismiss_button | ||
else R.string.cancel | ||
), | ||
onClick = onDismiss | ||
) | ||
} | ||
}, | ||
text = { | ||
Column( | ||
modifier = Modifier.fillMaxWidth(), | ||
horizontalAlignment = Alignment.CenterHorizontally | ||
) { | ||
if (uiState.voucherViewModelState is VoucherDialogState.Success) { | ||
val days: Int = | ||
(uiState.voucherViewModelState.addedTime / | ||
DateTimeConstants.SECONDS_PER_DAY) | ||
.toInt() | ||
val message = | ||
if (days > 60) { | ||
stringResource(R.string.months_added_to_your_account, days / 30) | ||
} else if (days == 0) { | ||
stringResource(R.string.less_than_one_day_added_to_your_account) | ||
} else { | ||
pluralStringResource( | ||
id = R.plurals.days_added_to_your_account, | ||
count = days, | ||
days | ||
) | ||
} | ||
RedeemSuccessBody(message = message) | ||
} else { | ||
EnterVoucherBody( | ||
uiState = uiState, | ||
onVoucherInputChange = onVoucherInputChange, | ||
onRedeem = onRedeem | ||
) | ||
} | ||
} | ||
}, | ||
containerColor = MaterialTheme.colorScheme.background, | ||
titleContentColor = MaterialTheme.colorScheme.onBackground, | ||
onDismissRequest = onDismiss | ||
) | ||
} | ||
|
||
@Composable | ||
private fun RedeemSuccessBody(message: String) { | ||
Image( | ||
painter = painterResource(R.drawable.icon_success), | ||
contentDescription = null, // No meaningful user info or action. | ||
modifier = Modifier.width(Dimens.buttonHeight).height(Dimens.buttonHeight) | ||
) | ||
|
||
Text( | ||
text = stringResource(id = R.string.voucher_success_title), | ||
modifier = | ||
Modifier.padding(start = Dimens.smallPadding, top = Dimens.screenVerticalMargin) | ||
.fillMaxWidth(), | ||
color = MaterialTheme.colorScheme.onPrimary, | ||
style = MaterialTheme.typography.titleMedium | ||
) | ||
|
||
Text( | ||
text = message, | ||
modifier = | ||
Modifier.padding(start = Dimens.smallPadding, top = Dimens.cellTopPadding) | ||
.fillMaxWidth(), | ||
style = MaterialTheme.typography.labelMedium | ||
) | ||
} | ||
|
||
@Composable | ||
private fun EnterVoucherBody( | ||
uiState: VoucherDialogUiState, | ||
onVoucherInputChange: (String) -> Unit = {}, | ||
onRedeem: (voucherCode: String) -> Unit | ||
) { | ||
GroupedTextField( | ||
value = uiState.voucherInput, | ||
onSubmit = { input -> | ||
if (input.isNotEmpty()) { | ||
onRedeem(input) | ||
} | ||
}, | ||
onValueChanged = { input -> onVoucherInputChange(input.uppercase()) }, | ||
isValidValue = uiState.voucherInput.isNotEmpty(), | ||
keyboardType = KeyboardType.Text, | ||
placeholderText = stringResource(id = R.string.voucher_hint), | ||
placeHolderColor = | ||
MaterialTheme.colorScheme.onPrimary | ||
.copy(alpha = AlphaDisabled) | ||
.compositeOver(MaterialTheme.colorScheme.primary), | ||
visualTransformation = vouchersVisualTransformation(), | ||
maxCharLength = VOUCHER_LENGTH, | ||
onFocusChange = {}, | ||
isDigitsOnlyAllowed = false, | ||
isEnabled = true, | ||
validateRegex = "^[A-Za-z0-9]*$".toRegex() | ||
) | ||
Spacer(modifier = Modifier.height(Dimens.smallPadding)) | ||
Row( | ||
verticalAlignment = Alignment.CenterVertically, | ||
modifier = Modifier.height(Dimens.listIconSize).fillMaxWidth() | ||
) { | ||
if (uiState.voucherViewModelState is VoucherDialogState.Verifying) { | ||
CircularProgressIndicator( | ||
modifier = | ||
Modifier.height(Dimens.loadingSpinnerSizeMedium) | ||
.width(Dimens.loadingSpinnerSizeMedium), | ||
color = MaterialTheme.colorScheme.onSecondary | ||
) | ||
Text( | ||
text = stringResource(id = R.string.verifying_voucher), | ||
modifier = Modifier.padding(start = Dimens.smallPadding), | ||
color = MaterialTheme.colorScheme.onPrimary, | ||
style = MaterialTheme.typography.bodySmall | ||
) | ||
} else if (uiState.voucherViewModelState is VoucherDialogState.Error) { | ||
Text( | ||
text = uiState.voucherViewModelState.errorMessage, | ||
color = MaterialTheme.colorScheme.error, | ||
style = MaterialTheme.typography.bodySmall | ||
) | ||
} | ||
} | ||
} |
32 changes: 32 additions & 0 deletions
32
...id/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/RedeemVoucherDialogScreen.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,32 @@ | ||
package net.mullvad.mullvadvpn.compose.screen | ||
|
||
import android.content.res.Configuration | ||
import androidx.compose.runtime.Composable | ||
import androidx.compose.ui.tooling.preview.Devices | ||
import androidx.compose.ui.tooling.preview.Preview | ||
import net.mullvad.mullvadvpn.compose.dialog.RedeemVoucherDialog | ||
import net.mullvad.mullvadvpn.compose.state.VoucherDialogUiState | ||
import net.mullvad.mullvadvpn.lib.theme.AppTheme | ||
|
||
@Preview(uiMode = Configuration.UI_MODE_NIGHT_YES, device = Devices.PIXEL_3) | ||
@Composable | ||
private fun PreviewRedeemVoucherDialogScreen() { | ||
AppTheme { | ||
RedeemVoucherDialogScreen( | ||
uiState = VoucherDialogUiState.INITIAL, | ||
onVoucherInputChange = {}, | ||
onRedeem = {}, | ||
onDismiss = {} | ||
) | ||
} | ||
} | ||
|
||
@Composable | ||
internal fun RedeemVoucherDialogScreen( | ||
uiState: VoucherDialogUiState, | ||
onVoucherInputChange: (String) -> Unit = {}, | ||
onRedeem: (voucherCode: String) -> Unit, | ||
onDismiss: () -> Unit | ||
) { | ||
RedeemVoucherDialog(uiState, onVoucherInputChange, onRedeem, onDismiss) | ||
} |
23 changes: 23 additions & 0 deletions
23
...id/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/util/VoucherVisualTransformation.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,23 @@ | ||
package net.mullvad.mullvadvpn.compose.util | ||
|
||
import androidx.compose.ui.text.AnnotatedString | ||
import androidx.compose.ui.text.input.OffsetMapping | ||
import androidx.compose.ui.text.input.TransformedText | ||
import androidx.compose.ui.text.input.VisualTransformation | ||
|
||
const val VOUCHER_SEPARATOR = "-" | ||
const val VOUCHER_CHUNK_SIZE = 4 | ||
|
||
fun vouchersVisualTransformation() = VisualTransformation { text -> | ||
val out = text.chunked(VOUCHER_CHUNK_SIZE).joinToString(VOUCHER_SEPARATOR) | ||
TransformedText( | ||
AnnotatedString(out), | ||
object : OffsetMapping { | ||
override fun originalToTransformed(offset: Int): Int = | ||
offset + (offset - 1) / ACCOUNT_TOKEN_CHUNK_SIZE | ||
|
||
override fun transformedToOriginal(offset: Int): Int = | ||
offset - offset / ACCOUNT_TOKEN_CHUNK_SIZE | ||
} | ||
) | ||
} |
3 changes: 3 additions & 0 deletions
3
android/app/src/main/kotlin/net/mullvad/mullvadvpn/constant/CommonConstant.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,3 @@ | ||
package net.mullvad.mullvadvpn.constant | ||
|
||
const val VOUCHER_LENGTH = 16 |
Oops, something went wrong.