From 6bc2b100abab0ab9089ca6beb8224a0f7682ffe5 Mon Sep 17 00:00:00 2001 From: saber safavi Date: Tue, 3 Oct 2023 12:40:09 +0200 Subject: [PATCH 1/6] Add string resources --- .../src/main/res/values-da/strings.xml | 1 + .../src/main/res/values-de/strings.xml | 1 + .../src/main/res/values-es/strings.xml | 1 + .../src/main/res/values-fi/strings.xml | 1 + .../src/main/res/values-fr/strings.xml | 1 + .../src/main/res/values-it/strings.xml | 1 + .../src/main/res/values-ja/strings.xml | 1 + .../src/main/res/values-ko/strings.xml | 1 + .../src/main/res/values-my/strings.xml | 1 + .../src/main/res/values-nb/strings.xml | 1 + .../src/main/res/values-nl/strings.xml | 1 + .../src/main/res/values-pl/strings.xml | 1 + .../src/main/res/values-pt/strings.xml | 1 + .../src/main/res/values-ru/strings.xml | 1 + .../src/main/res/values-sv/strings.xml | 1 + .../src/main/res/values-th/strings.xml | 1 + .../src/main/res/values-tr/strings.xml | 1 + .../src/main/res/values-zh-rCN/strings.xml | 1 + .../src/main/res/values-zh-rTW/strings.xml | 1 + .../resource/src/main/res/values/plurals.xml | 8 ++++++++ .../resource/src/main/res/values/strings.xml | 4 ++++ gui/locales/messages.pot | 19 +++++++++++++++++++ 22 files changed, 50 insertions(+) diff --git a/android/lib/resource/src/main/res/values-da/strings.xml b/android/lib/resource/src/main/res/values-da/strings.xml index 83d38568fae8..bb2608111200 100644 --- a/android/lib/resource/src/main/res/values-da/strings.xml +++ b/android/lib/resource/src/main/res/values-da/strings.xml @@ -192,6 +192,7 @@ Se app-logfiler Fejl ved virtuel adapter Kuponkode er allerede brugt. + Indløsning af kuponen lykkedes. VPN-tilladelse blev nægtet, da tunnelen blev oprettet. Prøv at oprette forbindelse igen. Altid-til VPN er måske aktiveret for en anden app VPN-tilladelsesfejl diff --git a/android/lib/resource/src/main/res/values-de/strings.xml b/android/lib/resource/src/main/res/values-de/strings.xml index cac9b2897a8d..357e4209e35c 100644 --- a/android/lib/resource/src/main/res/values-de/strings.xml +++ b/android/lib/resource/src/main/res/values-de/strings.xml @@ -192,6 +192,7 @@ App-Protokolle anzeigen Virtueller Adapterfehler Der Gutscheincode wurde bereits verwendet. + Der Gutschein wurde erfolgreich eingelöst. VPN-Berechtigungen wurden beim Erstellen des Tunnels abgelehnt. Always-on VPN könnte für eine andere App aktiviert sein VPN-Berechtigungsfehler diff --git a/android/lib/resource/src/main/res/values-es/strings.xml b/android/lib/resource/src/main/res/values-es/strings.xml index 9fa273193b4a..1ca4ad0fa58e 100644 --- a/android/lib/resource/src/main/res/values-es/strings.xml +++ b/android/lib/resource/src/main/res/values-es/strings.xml @@ -192,6 +192,7 @@ Ver registros de la aplicación Error del adaptador virtual El código del cupón ya se ha usado. + El cupón se canjeó correctamente. Se denegó el permiso para usar una conexión VPN al crear el túnel. Intente volver a establecer la conexión. La VPN siempre activa podría estar habilitada en otra aplicación Error en la autorización de la VPN diff --git a/android/lib/resource/src/main/res/values-fi/strings.xml b/android/lib/resource/src/main/res/values-fi/strings.xml index 90226d37cc02..eb02e6375693 100644 --- a/android/lib/resource/src/main/res/values-fi/strings.xml +++ b/android/lib/resource/src/main/res/values-fi/strings.xml @@ -192,6 +192,7 @@ Tarkastele sovelluslokeja Virtuaalisovittimen virhe Kuponkikoodi on jo käytetty. + Kupongin lunastus onnistui. VPN-lupa evättiin tunnelia luotaessa. Yritä muodostaa yhteys uudelleen. Aina päällä oleva VPN on mahdollisesti otettu käyttöön toiselle sovellukselle VPN-lupavirhe diff --git a/android/lib/resource/src/main/res/values-fr/strings.xml b/android/lib/resource/src/main/res/values-fr/strings.xml index 6ddea69f93eb..da970c6d89b1 100644 --- a/android/lib/resource/src/main/res/values-fr/strings.xml +++ b/android/lib/resource/src/main/res/values-fr/strings.xml @@ -192,6 +192,7 @@ Afficher les journaux de l\'application Erreur d\'adaptateur virtuel Le code du bon a déjà été utilisé. + Le bon a bien été échangé. La permission VPN a été refusée lors de la création du tunnel. Veuillez essayer de vous reconnecter. « Toujours exiger un VPN » est peut-être activé pour une autre application Erreur de permission VPN diff --git a/android/lib/resource/src/main/res/values-it/strings.xml b/android/lib/resource/src/main/res/values-it/strings.xml index 4a5c8854fa1f..c988e760cf8e 100644 --- a/android/lib/resource/src/main/res/values-it/strings.xml +++ b/android/lib/resource/src/main/res/values-it/strings.xml @@ -192,6 +192,7 @@ Visualizza registri app Errore scheda virtuale Il codice voucher è già stato utilizzato. + Il voucher è stato riscattato correttamente. L\'autorizzazione VPN è stata negata durante la creazione del tunnel. Prova a connetterti di nuovo. La VPN sempre attiva potrebbe essere abilitata per un\'altra app Errore di autorizzazione VPN diff --git a/android/lib/resource/src/main/res/values-ja/strings.xml b/android/lib/resource/src/main/res/values-ja/strings.xml index b00d94dd7d58..8c9ef84739d1 100644 --- a/android/lib/resource/src/main/res/values-ja/strings.xml +++ b/android/lib/resource/src/main/res/values-ja/strings.xml @@ -192,6 +192,7 @@ アプリのログを表示 仮想アダプタのエラー バウチャーコードはすでに使用されています。 + バウチャーを正常に使用しました。 トンネルを作成中にVPNへのアクセスが拒否されました。もう一度接続してみてください。 Always-on VPNが別のアプリで有効になっている可能性があります VPN許可エラー diff --git a/android/lib/resource/src/main/res/values-ko/strings.xml b/android/lib/resource/src/main/res/values-ko/strings.xml index c72dabb4f0e5..209023a64e8d 100644 --- a/android/lib/resource/src/main/res/values-ko/strings.xml +++ b/android/lib/resource/src/main/res/values-ko/strings.xml @@ -192,6 +192,7 @@ 앱 로그 보기 가상 어댑터 오류 이미 사용된 바우처 코드입니다. + 바우처가 성공적으로 사용되었습니다. 터널을 만드는 동안 VPN 사용 권한이 거부되었습니다. 다시 연결해 보세요. 상시 접속 VPN이 다른 앱에 활성화되었을 수 있습니다. VPN 권한 오류 diff --git a/android/lib/resource/src/main/res/values-my/strings.xml b/android/lib/resource/src/main/res/values-my/strings.xml index 7ce418ab094c..0aef2a2c2e2f 100644 --- a/android/lib/resource/src/main/res/values-my/strings.xml +++ b/android/lib/resource/src/main/res/values-my/strings.xml @@ -192,6 +192,7 @@ အက်ပ်မှတ်တမ်းများ ကြည့်ရန် စက်တွင်း အဒက်တာ ချို့ယွင်းချက် ဘောက်ချာကုဒ် သုံးထားပြီးသား ဖြစ်ပါသည်။ + ဘောက်ချာကို အောင်မြင်စွာ လဲယူခဲ့ပါသည်။ Tunnel ဖန်တီးနေစဉ် VPN ခွင့်ပြုချက်ကို ပယ်ချခဲ့ပါသည်။ ထပ်မံချိတ်ဆက်ပေးပါ။ အမြဲဖွင့် VPN ကို နောက်ထပ်အက်ပ်အတွက် ဖွင့်ထားနိုင်ပါသည် VPN ခွင့်ပြုချက် ချို့ယွင်းချက် diff --git a/android/lib/resource/src/main/res/values-nb/strings.xml b/android/lib/resource/src/main/res/values-nb/strings.xml index c852f8916f9f..2b0e370bb3ae 100644 --- a/android/lib/resource/src/main/res/values-nb/strings.xml +++ b/android/lib/resource/src/main/res/values-nb/strings.xml @@ -192,6 +192,7 @@ Se applogger Virtuell adapterfeil Kupongkoden er allerede brukt. + Kupongkoden er løst inn. VPN-tillatelse ble avvist under opprettelsen av tunnelen. Prøv å koble til igjen. VPN som alltid er på, kan være aktivert for en annen app Feil med VPN-tillatelse diff --git a/android/lib/resource/src/main/res/values-nl/strings.xml b/android/lib/resource/src/main/res/values-nl/strings.xml index 3d518bae5e93..cdbaa554c3ff 100644 --- a/android/lib/resource/src/main/res/values-nl/strings.xml +++ b/android/lib/resource/src/main/res/values-nl/strings.xml @@ -192,6 +192,7 @@ Applogboeken weergeven Fout virtuele adapter Vouchercode is al gebruikt. + Voucher is ingewisseld. VPN-toestemming is geweigerd tijdens maken van de tunnel. Probeer opnieuw verbinding te maken. Altijd-aan VPN is mogelijk ingeschakeld voor een andere app VPN-machtigingsfout diff --git a/android/lib/resource/src/main/res/values-pl/strings.xml b/android/lib/resource/src/main/res/values-pl/strings.xml index eb8a91d7e1c9..2e2e6ee267fd 100644 --- a/android/lib/resource/src/main/res/values-pl/strings.xml +++ b/android/lib/resource/src/main/res/values-pl/strings.xml @@ -192,6 +192,7 @@ Wyświetl dzienniki aplikacji Błąd wirtualnej karty sieciowej Kod z tego kuponu został już użyty. + Kupon został zrealizowany. Uprawnienie VPN zostało odrzucone podczas tworzenia tunelu. Spróbuj połączyć się ponownie. Opcja „Zawsze włączony VPN” może być włączona dla innej aplikacji Błąd uprawnienia VPN diff --git a/android/lib/resource/src/main/res/values-pt/strings.xml b/android/lib/resource/src/main/res/values-pt/strings.xml index a3ac32968163..2fee06cab650 100644 --- a/android/lib/resource/src/main/res/values-pt/strings.xml +++ b/android/lib/resource/src/main/res/values-pt/strings.xml @@ -192,6 +192,7 @@ Ver os registos da app Erro de adaptador virtual O código do voucher já foi utilizado. + O voucher foi reclamado com sucesso. A transmissão foi negada durante a criação do túnel. Tente fazer novamente a ligação. A VPN sempre ligada pode estar ativada para outra app Erro de permissão da VPN diff --git a/android/lib/resource/src/main/res/values-ru/strings.xml b/android/lib/resource/src/main/res/values-ru/strings.xml index e6b8c35e675f..0fb01c88ad11 100644 --- a/android/lib/resource/src/main/res/values-ru/strings.xml +++ b/android/lib/resource/src/main/res/values-ru/strings.xml @@ -192,6 +192,7 @@ Открыть журналы Ошибка виртуального адаптера Этот код ваучера уже использовался. + Ваучер погашен. При создании туннеля в доступе к VPN было отказано. Попробуйте подключиться снова. Опцию «VPN всегда вкл.» может быть включена для другого приложения Ошибка разрешения для VPN diff --git a/android/lib/resource/src/main/res/values-sv/strings.xml b/android/lib/resource/src/main/res/values-sv/strings.xml index 7606a30e6b8d..c65809dc5d20 100644 --- a/android/lib/resource/src/main/res/values-sv/strings.xml +++ b/android/lib/resource/src/main/res/values-sv/strings.xml @@ -192,6 +192,7 @@ Visa appens loggar Fel med virtuell adapter Kupongkoden har redan använts. + Kupongen har lösts in. VPN-behörighet nekades när tunneln skapades. Försök att ansluta igen. VPN som alltid är på kan ha aktiverats för annan app Behörighetsfel med VPN diff --git a/android/lib/resource/src/main/res/values-th/strings.xml b/android/lib/resource/src/main/res/values-th/strings.xml index 86484e413786..3f01840e0a52 100644 --- a/android/lib/resource/src/main/res/values-th/strings.xml +++ b/android/lib/resource/src/main/res/values-th/strings.xml @@ -192,6 +192,7 @@ ดูบันทึกของแอป ข้อผิดพลาดของอะแดปเตอร์เสมือน รหัสบัตรกำนัลถูกใช้ไปแล้ว + แลกบัตรกำนัลสำเร็จแล้ว การให้สิทธิ์ VPN ถูกปฏิเสธ ในขณะที่สร้างอุโมงค์ โปรดลองเชื่อมต่อใหม่อีกครั้ง Always-on VPN อาจได้รับการเปิดใช้งานสำหรับแอปอื่น เกิดข้อผิดพลาดในการอนุญาต VPN diff --git a/android/lib/resource/src/main/res/values-tr/strings.xml b/android/lib/resource/src/main/res/values-tr/strings.xml index b91a7e0bc038..08ff5f47e68e 100644 --- a/android/lib/resource/src/main/res/values-tr/strings.xml +++ b/android/lib/resource/src/main/res/values-tr/strings.xml @@ -192,6 +192,7 @@ Uygulama kayıtlarını görüntüle Sanal adaptör hatası Kupon kodu zaten kullanılmış. + Kupon başarıyla kullanıldı. Tünel oluşturulurken VPN izni reddedildi. Lütfen tekrar bağlanmayı deneyin. Her zaman açık VPN başka bir uygulama için etkinleştirilebilir VPN izin hatası diff --git a/android/lib/resource/src/main/res/values-zh-rCN/strings.xml b/android/lib/resource/src/main/res/values-zh-rCN/strings.xml index 5082b2e00454..174262c638eb 100644 --- a/android/lib/resource/src/main/res/values-zh-rCN/strings.xml +++ b/android/lib/resource/src/main/res/values-zh-rCN/strings.xml @@ -192,6 +192,7 @@ 查看应用日志 虚拟适配器错误 该优惠券码已被使用。 + 优惠券已成功兑换。 创建隧道时，VPN 权限被拒绝。请尝试重新连接。 可能为另一个应用启用了“始终启用 VPN” VPN 权限错误 diff --git a/android/lib/resource/src/main/res/values-zh-rTW/strings.xml b/android/lib/resource/src/main/res/values-zh-rTW/strings.xml index e1daa0c67ecc..70b0d42c55a0 100644 --- a/android/lib/resource/src/main/res/values-zh-rTW/strings.xml +++ b/android/lib/resource/src/main/res/values-zh-rTW/strings.xml @@ -192,6 +192,7 @@ 檢視應用程式日誌 虛擬配接器錯誤 此憑證兌換碼已有人用過。 + 憑證已成功兌換。 建立通道時，VPN 權限被拒絕。請嘗試重新連線。 可能已為另一個應用程式啟用了「始終啟用 VPN」 VPN 權限錯誤 diff --git a/android/lib/resource/src/main/res/values/plurals.xml b/android/lib/resource/src/main/res/values/plurals.xml index b9aa90441e64..455d42c1f2fa 100644 --- a/android/lib/resource/src/main/res/values/plurals.xml +++ b/android/lib/resource/src/main/res/values/plurals.xml @@ -40,4 +40,12 @@ Account credit expires in an hour Account credit expires in %d hours + + %d day + %d days + + + %d month + %d months + diff --git a/android/lib/resource/src/main/res/values/strings.xml b/android/lib/resource/src/main/res/values/strings.xml index 988b343c19a2..bc9630e9749e 100644 --- a/android/lib/resource/src/main/res/values/strings.xml +++ b/android/lib/resource/src/main/res/values/strings.xml @@ -220,4 +220,8 @@ Remove custom port Valid ranges: %s Enter port + Voucher was successfully redeemed. + Verifying voucher… + %s was added to your account. + less than one day diff --git a/gui/locales/messages.pot b/gui/locales/messages.pot index 61f4d4be5aa9..d28aac8520cf 100644 --- a/gui/locales/messages.pot +++ b/gui/locales/messages.pot @@ -1653,6 +1653,9 @@ msgctxt "wireguard-settings-view" msgid "Which TCP port the UDP-over-TCP obfuscation protocol should connect to on the VPN server." msgstr "" +msgid "%s was added to your account." +msgstr "" + msgid "Account credit expires in a few minutes" msgstr "" @@ -1818,6 +1821,9 @@ msgstr "" msgid "Valid ranges: %s" msgstr "" +msgid "Verifying voucher…" +msgstr "" + msgid "Virtual adapter error" msgstr "" @@ -1845,6 +1851,19 @@ msgstr "" msgid "less than a minute ago" msgstr "" +msgid "less than one day" +msgstr "" + +msgid "%d day" +msgid_plural "%d days" +msgstr[0] "" +msgstr[1] "" + +msgid "%d month" +msgid_plural "%d months" +msgstr[0] "" +msgstr[1] "" + msgid "Account credit expires in a day" msgid_plural "Account credit expires in %d days" msgstr[0] "" From 7b117b624f25299b02762bb962ce6e0304f7c095 Mon Sep 17 00:00:00 2001 From: saber safavi Date: Tue, 3 Oct 2023 12:45:14 +0200 Subject: [PATCH 2/6] Add Voucher entry text field --- .../compose/textfield/CustomTextField.kt | 6 ++- .../compose/textfield/GroupedTextField.kt | 47 +++++++++++++++++++ 2 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/GroupedTextField.kt diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/CustomTextField.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/CustomTextField.kt index 13d91df68b97..e5350f984488 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/CustomTextField.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/CustomTextField.kt @@ -32,6 +32,7 @@ import androidx.compose.ui.res.dimensionResource import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.text.input.KeyboardType +import androidx.compose.ui.text.input.VisualTransformation import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp @@ -58,7 +59,8 @@ fun CustomTextField( isValidValue: Boolean, isDigitsOnlyAllowed: Boolean, defaultTextColor: Color = Color.White, - textAlign: TextAlign = TextAlign.Start + textAlign: TextAlign = TextAlign.Start, + visualTransformation: VisualTransformation = VisualTransformation.None ) { val fontSize = dimensionResource(id = R.dimen.text_medium_plus).value.sp val shape = RoundedCornerShape(4.dp) @@ -122,6 +124,7 @@ fun CustomTextField( Text( text = placeholderText, color = placeholderTextColor, + style = TextStyle(fontSize = fontSize, textAlign = textAlign), fontSize = fontSize, textAlign = textAlign, modifier = Modifier.fillMaxWidth() @@ -131,6 +134,7 @@ fun CustomTextField( } }, cursorBrush = SolidColor(MullvadBlue), + visualTransformation = visualTransformation, modifier = modifier .background(backgroundColor) diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/GroupedTextField.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/GroupedTextField.kt new file mode 100644 index 000000000000..d9fcecc597f3 --- /dev/null +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/GroupedTextField.kt @@ -0,0 +1,47 @@ +package net.mullvad.mullvadvpn.compose.textfield + +import androidx.compose.material3.MaterialTheme +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.text.input.KeyboardType +import androidx.compose.ui.text.input.VisualTransformation +import androidx.compose.ui.text.style.TextAlign + +@Composable +fun GroupedTextField( + value: String, + keyboardType: KeyboardType, + modifier: Modifier = Modifier, + onValueChanged: (String) -> Unit, + onFocusChange: (Boolean) -> Unit, + onSubmit: (String) -> Unit, + isEnabled: Boolean = true, + visualTransformation: VisualTransformation, + placeholderText: String = "", + placeHolderColor: Color = MaterialTheme.colorScheme.primary, + maxCharLength: Int = Int.MAX_VALUE, + isValidValue: Boolean, + isDigitsOnlyAllowed: Boolean, + validateRegex: Regex, + defaultTextColor: Color = MaterialTheme.colorScheme.onPrimary, + textAlign: TextAlign = TextAlign.Start +) { + CustomTextField( + value = value, + keyboardType = keyboardType, + onValueChanged = { if (validateRegex.matches(it)) onValueChanged(it) }, + onFocusChange = onFocusChange, + onSubmit = onSubmit, + isValidValue = isValidValue, + isDigitsOnlyAllowed = isDigitsOnlyAllowed, + modifier = modifier, + isEnabled = isEnabled, + visualTransformation = visualTransformation, + placeholderText = placeholderText, + placeHolderColor = placeHolderColor, + maxCharLength = maxCharLength, + defaultTextColor = defaultTextColor, + textAlign = textAlign + ) +} From 03cb890fec0b6d17e05529de832ce075431c2f9f Mon Sep 17 00:00:00 2001 From: saber safavi Date: Tue, 3 Oct 2023 12:54:46 +0200 Subject: [PATCH 3/6] Add MVVM parts --- .../compose/state/VoucherDialogUiState.kt | 21 +++++ .../net/mullvad/mullvadvpn/di/UiModule.kt | 8 +- .../viewmodel/VoucherDialogViewModel.kt | 92 +++++++++++++++++++ 3 files changed, 118 insertions(+), 3 deletions(-) create mode 100644 android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/state/VoucherDialogUiState.kt create mode 100644 android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/VoucherDialogViewModel.kt diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/state/VoucherDialogUiState.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/state/VoucherDialogUiState.kt new file mode 100644 index 000000000000..e719bda52993 --- /dev/null +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/state/VoucherDialogUiState.kt @@ -0,0 +1,21 @@ +package net.mullvad.mullvadvpn.compose.state + +data class VoucherDialogUiState( + val voucherInput: String = "", + val voucherViewModelState: VoucherDialogState = VoucherDialogState.Default +) { + companion object { + val INITIAL = VoucherDialogUiState() + } +} + +sealed interface VoucherDialogState { + + data object Default : VoucherDialogState + + data object Verifying : VoucherDialogState + + data class Success(val addedTime: Long) : VoucherDialogState + + data class Error(val errorMessage: String) : VoucherDialogState +} diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/di/UiModule.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/di/UiModule.kt index 18e98964e8d3..63fcf17ad249 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/di/UiModule.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/di/UiModule.kt @@ -32,6 +32,7 @@ import net.mullvad.mullvadvpn.viewmodel.SelectLocationViewModel import net.mullvad.mullvadvpn.viewmodel.SettingsViewModel import net.mullvad.mullvadvpn.viewmodel.SplitTunnelingViewModel import net.mullvad.mullvadvpn.viewmodel.ViewLogsViewModel +import net.mullvad.mullvadvpn.viewmodel.VoucherDialogViewModel import net.mullvad.mullvadvpn.viewmodel.VpnSettingsViewModel import net.mullvad.mullvadvpn.viewmodel.WelcomeViewModel import org.apache.commons.validator.routines.InetAddressValidator @@ -86,14 +87,15 @@ val uiModule = module { viewModel { DeviceListViewModel(get(), get()) } viewModel { DeviceRevokedViewModel(get(), get()) } viewModel { LoginViewModel(get(), get()) } + viewModel { OutOfTimeViewModel(get(), get()) } viewModel { PrivacyDisclaimerViewModel(get()) } + viewModel { ReportProblemViewModel(get()) } viewModel { SelectLocationViewModel(get()) } viewModel { SettingsViewModel(get(), get()) } + viewModel { ViewLogsViewModel(get()) } + viewModel { VoucherDialogViewModel(get(), get()) } viewModel { VpnSettingsViewModel(get(), get(), get(), get()) } viewModel { WelcomeViewModel(get(), get(), get()) } - viewModel { ReportProblemViewModel(get()) } - viewModel { ViewLogsViewModel(get()) } - viewModel { OutOfTimeViewModel(get(), get()) } } const val SELF_PACKAGE_NAME = "SELF_PACKAGE_NAME" diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/VoucherDialogViewModel.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/VoucherDialogViewModel.kt new file mode 100644 index 000000000000..07c56ff954c4 --- /dev/null +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/VoucherDialogViewModel.kt @@ -0,0 +1,92 @@ +package net.mullvad.mullvadvpn.viewmodel + +import android.content.res.Resources +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.SharedFlow +import kotlinx.coroutines.flow.SharingStarted +import kotlinx.coroutines.flow.combine +import kotlinx.coroutines.flow.emptyFlow +import kotlinx.coroutines.flow.flatMapLatest +import kotlinx.coroutines.flow.flowOf +import kotlinx.coroutines.flow.shareIn +import kotlinx.coroutines.flow.stateIn +import kotlinx.coroutines.flow.update +import kotlinx.coroutines.launch +import net.mullvad.mullvadvpn.R +import net.mullvad.mullvadvpn.compose.state.LoginUiState +import net.mullvad.mullvadvpn.compose.state.VoucherDialogState +import net.mullvad.mullvadvpn.compose.state.VoucherDialogUiState +import net.mullvad.mullvadvpn.model.VoucherSubmissionError +import net.mullvad.mullvadvpn.model.VoucherSubmissionResult +import net.mullvad.mullvadvpn.ui.serviceconnection.ServiceConnectionContainer +import net.mullvad.mullvadvpn.ui.serviceconnection.ServiceConnectionManager +import net.mullvad.mullvadvpn.ui.serviceconnection.ServiceConnectionState +import net.mullvad.mullvadvpn.ui.serviceconnection.VoucherRedeemer + +class VoucherDialogViewModel( + serviceConnectionManager: ServiceConnectionManager, + private val resources: Resources +) : ViewModel() { + + private val vmState = MutableStateFlow(VoucherDialogState.Default) + private val voucherInput = MutableStateFlow(LoginUiState.INITIAL.accountNumberInput) + + private lateinit var voucherRedeemer: VoucherRedeemer + private val _shared: SharedFlow = + serviceConnectionManager.connectionState + .flatMapLatest { state -> + if (state is ServiceConnectionState.ConnectedReady) { + flowOf(state.container) + } else { + emptyFlow() + } + } + .shareIn(viewModelScope, SharingStarted.WhileSubscribed()) + + var uiState = + _shared + .flatMapLatest { serviceConnection -> + voucherRedeemer = serviceConnection.voucherRedeemer + combine(vmState, voucherInput) { state, input -> + VoucherDialogUiState(voucherInput = input, voucherViewModelState = state) + } + } + .stateIn(viewModelScope, SharingStarted.WhileSubscribed(), VoucherDialogUiState.INITIAL) + + fun onRedeem(voucherCode: String) { + vmState.update { VoucherDialogState.Verifying } + viewModelScope.launch { + when (val result = voucherRedeemer.submit(voucherCode)) { + is VoucherSubmissionResult.Ok -> handleAddedTime(result.submission.timeAdded) + is VoucherSubmissionResult.Error -> setError(result.error) + else -> { + vmState.update { VoucherDialogState.Default } + } + } + } + } + + fun onVoucherInputChange(voucherString: String) { + voucherInput.value = voucherString + } + + private fun handleAddedTime(timeAdded: Long) { + viewModelScope.launch { vmState.update { VoucherDialogState.Success(timeAdded) } } + } + + private fun setError(error: VoucherSubmissionError) { + viewModelScope.launch { + val message = + resources.getString( + when (error) { + VoucherSubmissionError.InvalidVoucher -> R.string.invalid_voucher + VoucherSubmissionError.VoucherAlreadyUsed -> R.string.voucher_already_used + else -> R.string.error_occurred + } + ) + vmState.update { VoucherDialogState.Error(message) } + } + } +} From fd3d62d603911c3521791a70f7b36bd20498d295 Mon Sep 17 00:00:00 2001 From: saber safavi Date: Mon, 9 Oct 2023 09:19:17 +0200 Subject: [PATCH 4/6] Implement voucher dialog in compose --- .../compose/dialog/RedeemVoucherDialog.kt | 286 ++++++++++++++++++ .../screen/RedeemVoucherDialogScreen.kt | 32 ++ .../util/VoucherVisualTransformation.kt | 38 +++ .../mullvadvpn/constant/CommonConstant.kt | 3 + .../fragment/RedeemVoucherDialogFragment.kt | 182 ++--------- .../src/main/res/layout/redeem_voucher.xml | 58 ---- .../lib/theme/dimensions/Dimensions.kt | 1 + 7 files changed, 380 insertions(+), 220 deletions(-) create mode 100644 android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/RedeemVoucherDialog.kt create mode 100644 android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/RedeemVoucherDialogScreen.kt create mode 100644 android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/util/VoucherVisualTransformation.kt create mode 100644 android/app/src/main/kotlin/net/mullvad/mullvadvpn/constant/CommonConstant.kt delete mode 100644 android/app/src/main/res/layout/redeem_voucher.xml diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/RedeemVoucherDialog.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/RedeemVoucherDialog.kt new file mode 100644 index 000000000000..4d6f3f1261fe --- /dev/null +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/RedeemVoucherDialog.kt @@ -0,0 +1,286 @@ +package net.mullvad.mullvadvpn.compose.dialog + +import android.content.res.Configuration +import androidx.compose.foundation.Image +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Box +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.foundation.layout.wrapContentSize +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.focus.FocusRequester +import androidx.compose.ui.focus.focusRequester +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.AlphaDescription +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(3600)), + 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 = + stringResource( + R.string.added_to_your_account, + when (days) { + 0 -> { + stringResource(R.string.less_than_one_day) + } + in 1..59 -> { + pluralStringResource(id = R.plurals.days, count = days, days) + } + else -> { + pluralStringResource( + id = R.plurals.months, + count = days / 30, + days / 30 + ) + } + } + ) + 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, + modifier = Modifier.fillMaxWidth().height(Dimens.buttonHeight) + ) + Text( + text = stringResource(id = R.string.voucher_success_title), + modifier = + Modifier.padding( + start = Dimens.smallPadding, + top = Dimens.successIconVerticalPadding, + ) + .fillMaxWidth(), + color = MaterialTheme.colorScheme.onPrimary, + style = MaterialTheme.typography.titleMedium + ) + + Text( + text = message, + modifier = + Modifier.padding(start = Dimens.smallPadding, top = Dimens.cellTopPadding) + .fillMaxWidth(), + color = MaterialTheme.colorScheme.onPrimary.copy(alpha = AlphaDescription), + style = MaterialTheme.typography.labelMedium + ) +} + +@Composable +private fun EnterVoucherBody( + uiState: VoucherDialogUiState, + onVoucherInputChange: (String) -> Unit = {}, + onRedeem: (voucherCode: String) -> Unit +) { + val textFieldFocusRequester = FocusRequester() + Box(Modifier.wrapContentSize().clickable { textFieldFocusRequester.requestFocus() }) { + GroupedTextField( + value = uiState.voucherInput, + onSubmit = { input -> + if (uiState.voucherInput.length == VOUCHER_LENGTH) { + onRedeem(input) + } + }, + onValueChanged = { input -> onVoucherInputChange(input.uppercase()) }, + isValidValue = uiState.voucherInput.isNotEmpty(), + keyboardType = KeyboardType.Password, + 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, + modifier = Modifier.focusRequester(textFieldFocusRequester), + 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 + ) + } + } +} diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/RedeemVoucherDialogScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/RedeemVoucherDialogScreen.kt new file mode 100644 index 000000000000..1344db5b2091 --- /dev/null +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/RedeemVoucherDialogScreen.kt @@ -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) +} diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/util/VoucherVisualTransformation.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/util/VoucherVisualTransformation.kt new file mode 100644 index 000000000000..c4d5eec0a1d9 --- /dev/null +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/util/VoucherVisualTransformation.kt @@ -0,0 +1,38 @@ +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 +import java.lang.Integer.min + +const val VOUCHER_SEPARATOR = "-" +const val VOUCHER_CHUNK_SIZE = 4 +const val MAX_VOUCHER_LENGTH = 16 + +fun vouchersVisualTransformation() = VisualTransformation { text -> + var out = text.chunked(VOUCHER_CHUNK_SIZE).joinToString(VOUCHER_SEPARATOR) + if ( + text.length % VOUCHER_CHUNK_SIZE == 0 && + text.isNotEmpty() && + text.length < MAX_VOUCHER_LENGTH + ) { + out += VOUCHER_SEPARATOR + } + TransformedText( + AnnotatedString(out), + object : OffsetMapping { + override fun originalToTransformed(offset: Int): Int { + val res = offset + offset / ACCOUNT_TOKEN_CHUNK_SIZE + // Limit max input to 19 characters (16 voucher - 3 dividers) + return min( + res, + MAX_VOUCHER_LENGTH + MAX_VOUCHER_LENGTH / ACCOUNT_TOKEN_CHUNK_SIZE - 1 + ) + } + + override fun transformedToOriginal(offset: Int): Int = + offset - offset / (ACCOUNT_TOKEN_CHUNK_SIZE + 1) + } + ) +} diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/constant/CommonConstant.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/constant/CommonConstant.kt new file mode 100644 index 000000000000..a01aa08d8b16 --- /dev/null +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/constant/CommonConstant.kt @@ -0,0 +1,3 @@ +package net.mullvad.mullvadvpn.constant + +const val VOUCHER_LENGTH = 16 diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/RedeemVoucherDialogFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/RedeemVoucherDialogFragment.kt index 46472ea6cc1e..61f24e45fcf3 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/RedeemVoucherDialogFragment.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/RedeemVoucherDialogFragment.kt @@ -1,187 +1,45 @@ package net.mullvad.mullvadvpn.ui.fragment import android.app.Dialog -import android.content.Context -import android.graphics.drawable.ColorDrawable import android.os.Bundle -import android.text.Editable -import android.text.TextWatcher import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.view.ViewGroup.LayoutParams -import android.widget.EditText -import android.widget.TextView +import androidx.compose.runtime.collectAsState +import androidx.compose.ui.platform.ComposeView import androidx.fragment.app.DialogFragment import net.mullvad.mullvadvpn.R -import net.mullvad.mullvadvpn.lib.common.util.JobTracker -import net.mullvad.mullvadvpn.model.VoucherSubmissionError -import net.mullvad.mullvadvpn.model.VoucherSubmissionResult -import net.mullvad.mullvadvpn.repository.AccountRepository -import net.mullvad.mullvadvpn.ui.MainActivity -import net.mullvad.mullvadvpn.ui.serviceconnection.ServiceConnectionManager -import net.mullvad.mullvadvpn.ui.serviceconnection.VoucherRedeemer -import net.mullvad.mullvadvpn.ui.widget.Button -import net.mullvad.mullvadvpn.util.SegmentedInputFormatter -import org.joda.time.DateTime -import org.koin.android.ext.android.inject - -const val FULL_VOUCHER_CODE_LENGTH = "XXXX-XXXX-XXXX-XXXX".length +import net.mullvad.mullvadvpn.compose.screen.RedeemVoucherDialogScreen +import net.mullvad.mullvadvpn.lib.theme.AppTheme +import net.mullvad.mullvadvpn.viewmodel.VoucherDialogViewModel +import org.koin.androidx.viewmodel.ext.android.viewModel class RedeemVoucherDialogFragment : DialogFragment() { - // Injected dependencies - private val accountRepository: AccountRepository by inject() - private val serviceConnectionManager: ServiceConnectionManager by inject() - - private val jobTracker = JobTracker() - - private lateinit var parentActivity: MainActivity - private lateinit var errorMessage: TextView - private lateinit var voucherInput: EditText - - private var accountExpiry: DateTime? = null - private var redeemButton: Button? = null - private var voucherRedeemer: VoucherRedeemer? = null - - private var voucherInputIsValid = false - set(value) { - field = value - updateRedeemButton() - } - - override fun onAttach(context: Context) { - super.onAttach(context) - - parentActivity = context as MainActivity - - serviceConnectionManager.serviceNotifier.subscribe(this) { connection -> - voucherRedeemer = connection?.voucherRedeemer - } - - jobTracker.newUiJob("updateExpiry") { - accountRepository.accountExpiryState.collect { accountExpiry = it.date() } - } - - updateRedeemButton() - } + private val vm by viewModel() + private lateinit var voucherDialog: Dialog override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View { - val view = inflater.inflate(R.layout.redeem_voucher, container, false) - - voucherInput = - view.findViewById(R.id.voucher_code).apply { - addTextChangedListener(ValidVoucherCodeChecker()) + return inflater.inflate(R.layout.fragment_compose, container, false).apply { + findViewById(R.id.compose_view).setContent { + AppTheme { + RedeemVoucherDialogScreen( + uiState = vm.uiState.collectAsState().value, + onVoucherInputChange = { vm.onVoucherInputChange(it) }, + onRedeem = { vm.onRedeem(it) }, + onDismiss = { onDismiss(voucherDialog) } + ) + } } - - SegmentedInputFormatter(voucherInput, '-').apply { - allCaps = true - - isValidInputCharacter = { character -> - ('A' <= character && character <= 'Z') || ('0' <= character && character <= '9') - } - } - - redeemButton = - view.findViewById