Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
2dc00d9
added new watchface
BernhardRo Nov 8, 2026
c75ec93
AI ported ES integration from bastiaanv merge
BernhardRo Nov 7, 2026
9ddce53
added UI controls and support for real transmitter
BernhardRo Nov 7, 2026
a1eda86
updated readme
BernhardRo Nov 10, 2026
5d85b50
updated gradle
BernhardRo Nov 10, 2026
0a1a65f
updated readme: adding screenshots
BernhardRo Nov 11, 2026
2a136ce
changing linked readme in app to master branch
BernhardRo Nov 11, 2026
d6fcbfe
Send Eversense 365 readings immediately to DMS
Nov 13, 2026
6222948
Send Eversense 365 readings immediately to DMS
Nov 13, 2026
fbc5e7f
Send Eversense 365 readings immediately to DMS
Nov 13, 2026
5ea70cf
Send Eversense 365 readings immediately to DMS
Nov 13, 2026
09c4c1f
added support for Eversense365 (outside US version) in companion mode
BernhardRo Nov 7, 2026
8802961
Send Eversense 365 readings immediately to DMS
Nov 14, 2026
418a42c
Send Eversense 365 readings immediately to DMS
Nov 14, 2026
9bbdb65
Send Eversense 365 readings immediately to DMS
Nov 15, 2026
540b57c
Send Eversense 365 readings immediately to DMS
Nov 15, 2026
a54d940
Send Eversense 365 readings immediately to DMS
Nov 15, 2026
f183aa7
Send Eversense 365 readings immediately to DMS
Nov 15, 2026
f9b52ac
Send Eversense 365 readings immediately to DMS
Nov 15, 2026
9a33a16
Send Eversense 365 readings immediately to DMS
Nov 15, 2026
235a73f
some UI updates to the watchfaces
BernhardRo Nov 15, 2026
5cd8496
added ES transmitter battery status to the status view
BernhardRo Nov 15, 2026
292bf11
Send Eversense 365 readings immediately to DMS
Nov 15, 2026
de555c1
updated gradle
BernhardRo Nov 15, 2026
83d2bf2
added compare link
BernhardRo Nov 16, 2026
14fdf03
Fixed calibration upload, but miss 20 min gb
Nov 16, 2026
4e0b2ae
Merge pull request #209 from Greatf01/master
BernhardRo Nov 17, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,5 @@ ios/app/Version.xcconfig
# Office owner/lock files (~$foo.xlsx). They are transient, machine-local and must never
# reach history - one was staged for commit alongside _docs/import.xlsx.
~$*
*.pyc
/.codex-attachments
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
* Want to contribute? Please read [CONTRIBUTING.md](CONTRIBUTING.md) first — note that AI-generated pull requests are not welcome.
* Everyone who’s been looping with AAPS needs to fill out the form after 3 days of looping https://docs.google.com/forms/d/14KcMjlINPMJHVt28MDRupa4sz4DDIooI4SrW0P3HSN8/viewform?c=0&w=1

## Compare with base
https://github.com/BernhardRo/AndroidAPS/compare/master...nightscout:AndroidAPS:master

[![Support Server](https://img.shields.io/discord/629952586895851530.svg?label=Discord&logo=Discord&colorB=7289da&style=for-the-badge)](https://discord.gg/4fQUWHZ4Mw)

[![CircleCI](https://circleci.com/gh/nightscout/AndroidAPS/tree/master.svg?style=svg)](https://circleci.com/gh/nightscout/AndroidAPS/tree/master)
Expand Down
7 changes: 5 additions & 2 deletions app/src/test/kotlin/app/aaps/di/metro/SourceGraphTest.kt
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
package app.aaps.di.metro

import app.aaps.plugins.source.activities.EversenseCalibrationActivity
import app.aaps.plugins.source.activities.EversensePlacementActivity
import app.aaps.plugins.source.activities.EversenseStatusActivity
import app.aaps.plugins.source.AidexPlugin
import app.aaps.plugins.source.DexcomPlugin
import app.aaps.plugins.source.GlimpPlugin
Expand Down Expand Up @@ -47,7 +50,7 @@ class SourceGraphTest {
}

@Test
fun `the notification reader service is the only member injection here`() {
assertThat(graph().memberInjectors.keys).containsExactly(NotificationCollectorService::class)
fun `source member injectors include the service and Eversense screens`() {
assertThat(graph().memberInjectors.keys).containsExactly(NotificationCollectorService::class, EversenseCalibrationActivity::class, EversensePlacementActivity::class, EversenseStatusActivity::class)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ class RawPreferenceStoreScanTest {
"implementation/src/commonMain/kotlin/app/aaps/implementation/sharedPreferences/PreferencesImpl.kt" to "Preferences itself, which is what everything else is supposed to use",
"shared/tests/src/androidMain/kotlin/app/aaps/shared/tests/SharedPreferencesMock.kt" to "the test double for the store; it lives in a main source set so tests in other modules can use it",

"plugins/source/src/androidMain/kotlin/app/aaps/plugins/source/eversense/EversenseStateStore.kt" to
"imports the whole legacy Eversense device store once; new state is a registered, non-exported preference",

// --- Moves the whole store, not a setting ---
// These are the import, the export and the cloud copies of them. They are SUPPOSED to see every
// key, including ones they have never heard of, so going through `Preferences` would defeat
Expand Down Expand Up @@ -145,6 +148,8 @@ class RawPreferenceStoreScanTest {
val skip = listOf("/build/", "/src/test", "/src/androidTest", "/src/androidHostTest", "/src/commonTest", "/src/iosTest", "/wear/")
val root = repoRoot()
val files = root.walkTopDown()
// Apply the same exclusions before entering directories, so build output is not walked.
.onEnter { dir -> skip.none { (dir.invariantSeparatorsPath + "/").contains(it) } }
.filter { it.isFile && it.extension == "kt" }
.map { it to it.invariantSeparatorsPath }
.filterNot { (_, path) -> skip.any { path.contains(it) } }
Expand Down
18 changes: 18 additions & 0 deletions app/src/testFull/resources/prefs-schema.txt
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,24 @@ eopatch_patch_buzzer_reminders|EopatchBooleanKey|true
eopatch_patch_config|EopatchStringNonKey|true
eopatch_patch_state|EopatchStringNonKey|true
eopatch_temp_basal|EopatchStringNonKey|true
eversense_alert_high|EversenseStringKey|true
eversense_alert_low|EversenseStringKey|true
eversense_calibration_launch|EversenseIntentKey|false
eversense_cloud_queue_json|EversenseRuntimeKey|false
eversense_cloud_upload_enabled|EversenseBooleanKey|true
eversense_credentials_password|EversenseStringKey|true
eversense_credentials_username|EversenseStringKey|true
eversense_device_state_json|EversenseRuntimeKey|false
eversense_diagnostic_logging|EversenseBooleanKey|false
eversense_documentation|EversenseIntentKey|false
eversense_european_region|EversenseBooleanKey|true
eversense_last_calibration_submitted_at|LongNonKey|false
eversense_notif_cloud_upload_toast|EversenseBooleanKey|true
eversense_placement_launch|EversenseIntentKey|false
eversense_sign_out|EversenseIntentKey|false
eversense_status|EversenseIntentKey|false
eversense_target_high|EversenseStringKey|true
eversense_target_low|EversenseStringKey|true
export_all_cloud_enabled|BooleanNonKey|true
export_csv_cloud_enabled|BooleanNonKey|true
export_csv_local_enabled|BooleanNonKey|true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ import app.aaps.plugins.main.MainStrings
import app.aaps.plugins.sync.nsclientV3.clientcontrol.compose.AuthorizedClientsScreen
import app.aaps.plugins.sync.nsclientV3.clientcontrol.compose.PairWithMasterScreen
import app.aaps.plugins.sync.nsclientV3.clientcontrol.compose.ScanMasterQrScreen
import app.aaps.ui.compose.eversenseCalibrationDialog.EversenseCalibrationDialogScreen
import app.aaps.ui.compose.calibrationDialog.CalibrationDialogScreen
import app.aaps.ui.compose.carbsDialog.CarbsDialogScreen
import app.aaps.ui.compose.careDialog.CareDialogScreen
Expand Down Expand Up @@ -355,6 +356,10 @@ fun NavGraphBuilder.appNavGraph(
)
}

composable(route = AppRoute.EversenseCalibrationDialog.route) {
EversenseCalibrationDialogScreen(onNavigateBack = { navController.safePopBackStack() })
}

composable(route = AppRoute.CalibrationDialog.route) {
CalibrationDialogScreen(
onNavigateBack = { navController.safePopBackStack() }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ sealed class AppRoute(val route: String) {
fun createRoute(preselect: Int) = "fill_dialog/$preselect"
}

data object EversenseCalibrationDialog : AppRoute("eversense_calibration_dialog")
data object CalibrationDialog : AppRoute("calibration_dialog")
data object CarbsDialog : AppRoute("carbs_dialog")
data object InsulinDialog : AppRoute("insulin_dialog")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ class ElementNavigator(
ElementType.CGM_XDRIP -> onOpenCgmApp("com.eveningoutpost.dexdrip")
ElementType.CGM_DEX -> dexcomBoyda.dexcomPackages().forEach { onOpenCgmApp(it) }

ElementType.EVERSENSE_CALIBRATION -> navController.navigate(AppRoute.EversenseCalibrationDialog.route)
ElementType.CALIBRATION -> navController.navigate(AppRoute.CalibrationDialog.route)

// Careportal
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ enum class SourceSensor(val text: String, val aliases: Set<String> = emptySet())
GLUTEC("Glutec", setOf("MQ")),
GLUPRO("GluPro"),
EVERSENSE("Eversense"),
EVERSENSE_E3("Eversense E3"),
EVERSENSE_365("Eversense 365"),
// One sensor sold under two brands. AAPS already treats them as one: the broadcasts from both
// apps go to the same worker, which has always stored this entry, and the plugin calls itself
// "Syai/Ottai App". `Ottai` is only ever read, and is what Juggluco sends.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ private val ADVANCED_FILTERING_SENSORS = setOf(
SourceSensor.LIBRE_3,
SourceSensor.SYAI_TAG,
SourceSensor.RANDOM,
SourceSensor.EVERSENSE_E3,
SourceSensor.EVERSENSE_365,
)

private val FLAT_BG_CHECK_SENSORS = setOf(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,14 @@ class SourceSensorExtensionsTest {
assertFalse(SourceSensor.MM_SIMPLERA.advancedFilteringSupported())
}

@Test
fun `identified eversense sensors support advanced filtering without flat bg checks`() {
assertTrue(SourceSensor.EVERSENSE_E3.advancedFilteringSupported())
assertTrue(SourceSensor.EVERSENSE_365.advancedFilteringSupported())
assertFalse(SourceSensor.EVERSENSE_E3.needsFlatBgCheck())
assertFalse(SourceSensor.EVERSENSE_365.needsFlatBgCheck())
}

@Test
fun `eversense does not support advanced filtering`() {
assertFalse(SourceSensor.EVERSENSE.advancedFilteringSupported())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ enum class ElementType(
// On a client a calibration goes to the master as BatchAction.Calibration, which hands it to its CGM plugin.
CALIBRATION(category = ElementCategory.CGM, searchable = true, role = ClientRole.Caregiver),

// Sends calibration to the local Eversense transmitter.
EVERSENSE_CALIBRATION(category = ElementCategory.CGM, searchable = true, role = ClientRole.Caregiver),

// Profile & Targets — minimum level is BOLUS; screen mode (PLAY/EDIT) determined by granted auth level.
// Mutating editors whose writes ride Client-Control → CLIENT_PAIRED (hidden on an unpaired client).
// PROFILE_MANAGEMENT is the exception and stays visible: profiles are state an unpaired client still
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,14 @@ enum class NotificationId(
// A real pump is selected, but AAPS has no Bluetooth (Nearby devices) permission, so no command can reach the
// pump and the queue fails them (#5440). It removes itself once the permission is back. IMPORTANT, not URGENT:
// a bolus that fails because of it raises its own alarm. Appended at the END for the same reason as above.
BLUETOOTH_PERMISSION_MISSING(IMPORTANT, PUMP);
BLUETOOTH_PERMISSION_MISSING(IMPORTANT, PUMP),

// Appended to keep the stored ordinals of existing notifications stable.
EVERSENSE_RELEASE(NORMAL, CGM),
EVERSENSE_PLACEMENT(NORMAL, CGM),
EVERSENSE_CREDENTIALS(NORMAL, CGM),
EVERSENSE_FIRMWARE(INFO, CGM),
EVERSENSE_ALARM(NORMAL, CGM);

companion object {

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package app.aaps.core.interfaces.source

/**
* Abstraction over Eversense's BLE calibration flow, exposed to modules (e.g. `ui`) that must not
* take a direct dependency on the `plugins:eversense`/`plugins:source` modules — same pattern as
* [XDripSource]/[DexcomBoyda].
*/
interface EversenseCalibrationSource {

/** True when Eversense is the currently active/enabled BG source. */
fun isEnabled(): Boolean

/** True when currently connected to the transmitter over BLE. */
fun isConnected(): Boolean

/**
* Sends a fingerstick calibration value (mg/dL) to the transmitter, connecting first (with a
* timeout) if not already connected. Returns true on success.
*/
suspend fun calibrate(bgMgDl: Int): Boolean
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class ElementTypeRoleTest {
)

private val caregiver = setOf(
ElementType.CALIBRATION,
ElementType.CALIBRATION, ElementType.EVERSENSE_CALIBRATION,
ElementType.TEMP_TARGET_MANAGEMENT, ElementType.INSULIN_MANAGEMENT, ElementType.QUICK_WIZARD_MANAGEMENT, ElementType.FOOD_MANAGEMENT,
ElementType.BG_CHECK, ElementType.NOTE, ElementType.EXERCISE, ElementType.QUESTION, ElementType.ANNOUNCEMENT,
ElementType.SENSOR_INSERT, ElementType.BATTERY_CHANGE, ElementType.CANNULA_CHANGE, ElementType.FILL, ElementType.SITE_ROTATION,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ enum class LongNonKey(
override val exportable: Boolean = true
) : LongNonPreferenceKey {

EversenseLastCalibrationSubmittedAt("eversense_last_calibration_submitted_at", 0L, exportable = false),

LocalProfileLastChange("local_profile_last_change", 0L),

BtWatchdogLastBark("bt_watchdog_last", 0L),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ interface StringPreferenceKey : PreferenceKey, StringNonPreferenceKey {
val isPassword: Boolean
val isPin: Boolean

/** Whether the password dialog asks for the value a second time. */
val requiresPasswordConfirmation: Boolean
get() = true

/**
* Whether the value should be hashed before storing.
* When true, [hashPassword] is applied before persisting.
Expand Down Expand Up @@ -80,4 +84,4 @@ fun StringPreferenceKey.withEntriesProvider(
provider: () -> Map<String, TextRef>,
emptyEntriesMessage: TextRef? = null
): StringKeyWithEntriesProvider =
StringKeyWithEntriesProvider(this, provider, emptyEntriesMessage)
StringKeyWithEntriesProvider(this, provider, emptyEntriesMessage)
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@ package app.aaps.core.ui.compose.dialogs
import android.content.Context
import androidx.compose.material3.MaterialTheme
import androidx.compose.ui.test.hasSetTextAction
import androidx.compose.ui.test.assertCountEquals
import androidx.compose.ui.test.junit4.v2.createComposeRule
import androidx.compose.ui.test.onNodeWithText
import androidx.compose.ui.test.performClick
import androidx.compose.ui.test.performTextInput
import androidx.compose.ui.test.performImeAction
import app.aaps.core.ui.R
import com.google.common.truth.Truth.assertThat
import org.junit.Before
Expand Down Expand Up @@ -36,14 +38,15 @@ class SetPasswordDialogTest {
cancelLabel = context.getString(R.string.cancel)
}

private fun show(onConfirm: (String, String) -> Unit = { _, _ -> }, onCancel: () -> Unit = {}) {
private fun show(onConfirm: (String, String) -> Unit = { _, _ -> }, onCancel: () -> Unit = {}, requireConfirmation: Boolean = true) {
compose.setContent {
MaterialTheme {
SetPasswordDialog(
title = "Set New Password",
pinInput = false,
onConfirm = onConfirm,
onCancel = onCancel
onCancel = onCancel,
requireConfirmation = requireConfirmation
)
}
}
Expand All @@ -64,6 +67,19 @@ class SetPasswordDialogTest {
assertThat(second).isEqualTo("beta")
}

@Test
fun singleEntry_submitsFromKeyboardWithoutConfirmationField() {
var submitted: Pair<String, String>? = null
show(onConfirm = { a, b -> submitted = a to b }, requireConfirmation = false)

val fields = compose.onAllNodes(hasSetTextAction())
fields.assertCountEquals(1)
fields[0].performTextInput("dms-password")
fields[0].performImeAction()

assertThat(submitted).isEqualTo("dms-password" to "dms-password")
}

@Test
fun cancel_firesOnCancel() {
var cancels = 0
Expand Down
4 changes: 4 additions & 0 deletions core/ui/src/androidMain/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1276,4 +1276,8 @@
<string name="units_years">y</string>
<string name="prefs_range_title">Range for visualization</string>
<string name="secrets_not_protected">No system key store was found on this computer. The keys that protect your settings and the pairing with the master are kept in files next to the data, so anyone who gets a copy of your files gets them too. On Linux, install and start a keyring (for example GNOME Keyring or KWallet), then start AAPS again.</string>
<string name="eversense_calibration_label">Eversense Calibration</string>

<string name="treatment_eversense_calibration_desc">Send a fingerstick value directly to the Eversense transmitter</string>

</resources>
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,13 @@ import app.aaps.core.ui.compose.stringResource

/**
* Dialog for setting a new password or PIN.
* Requires entering the password twice for confirmation.
* Asks for confirmation unless the preference opts out.
*
* @param title Dialog title
* @param pinInput If true, shows numeric keyboard for PIN input
* @param onConfirm Called with (password1, password2) when OK is clicked
* @param onCancel Called when Cancel is clicked or dialog is dismissed
* @param requireConfirmation Whether to show a second field. When false, both callback values match.
*
* @see SetPasswordDialogPreview
*/
Expand All @@ -46,10 +47,12 @@ fun SetPasswordDialog(
title: String,
pinInput: Boolean,
onConfirm: (String, String) -> Unit,
onCancel: () -> Unit
onCancel: () -> Unit,
requireConfirmation: Boolean = true
) {
var password1 by remember { mutableStateOf("") }
var password2 by remember { mutableStateOf("") }
val confirm = { onConfirm(password1, if (requireConfirmation) password2 else password1) }
val focusRequester = remember { FocusRequester() }

LaunchedEffect(Unit) {
Expand Down Expand Up @@ -85,15 +88,16 @@ fun SetPasswordDialog(
visualTransformation = PasswordVisualTransformation(),
keyboardOptions = KeyboardOptions(
keyboardType = if (pinInput) KeyboardType.NumberPassword else KeyboardType.Password,
imeAction = ImeAction.Next
imeAction = if (requireConfirmation) ImeAction.Next else ImeAction.Done
),
keyboardActions = KeyboardActions(onDone = { if (!requireConfirmation) confirm() }),
singleLine = true,
modifier = Modifier
.fillMaxWidth()
.focusRequester(focusRequester)
)

OutlinedTextField(
if (requireConfirmation) OutlinedTextField(
value = password2,
onValueChange = { password2 = it },
label = {
Expand All @@ -105,15 +109,15 @@ fun SetPasswordDialog(
imeAction = ImeAction.Done
),
keyboardActions = KeyboardActions(
onDone = { onConfirm(password1, password2) }
onDone = { confirm() }
),
singleLine = true,
modifier = Modifier.fillMaxWidth()
)
}
},
confirmButton = {
TextButton(onClick = { onConfirm(password1, password2) }) {
TextButton(onClick = confirm) {
Text(stringResource(CoreUiStrings.ok))
}
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ fun ElementType.color(): Color = when (this) {
ElementType.CGM_XDRIP -> AapsTheme.elementColors.cgmXdrip
ElementType.CGM_DEX -> AapsTheme.elementColors.cgmDex
ElementType.CALIBRATION -> AapsTheme.elementColors.calibration
ElementType.EVERSENSE_CALIBRATION -> AapsTheme.elementColors.calibration
ElementType.INSULIN_MANAGEMENT -> AapsTheme.elementColors.insulin

ElementType.PROFILE_MANAGEMENT -> AapsTheme.elementColors.profileSwitch
Expand Down Expand Up @@ -139,6 +140,7 @@ fun ElementType.icon(): ImageVector = when (this) {
ElementType.CGM_XDRIP -> IcXDrip
ElementType.CGM_DEX -> IcByoda
ElementType.CALIBRATION -> IcCalibration
ElementType.EVERSENSE_CALIBRATION -> IcCalibration
ElementType.INSULIN_MANAGEMENT -> IcPluginInsulin

ElementType.PROFILE_MANAGEMENT -> IcProfile
Expand Down Expand Up @@ -210,6 +212,7 @@ fun ElementType.label(): TextRef? = when (this) {
ElementType.CGM_XDRIP -> CoreUiStrings.cgm
ElementType.CGM_DEX -> CoreUiStrings.cgm
ElementType.CALIBRATION -> CoreUiStrings.calibration
ElementType.EVERSENSE_CALIBRATION -> CoreUiStrings.eversense_calibration_label
ElementType.INSULIN_MANAGEMENT -> CoreUiStrings.insulin_management
ElementType.PROFILE_MANAGEMENT -> CoreUiStrings.profile_management
ElementType.TEMP_TARGET_MANAGEMENT -> CoreUiStrings.temp_target_management
Expand Down Expand Up @@ -272,6 +275,7 @@ fun ElementType.description(): TextRef? = when (this) {
ElementType.CGM_DEX -> CoreUiStrings.treatment_cgm_desc

ElementType.CALIBRATION -> CoreUiStrings.treatment_calibration_desc
ElementType.EVERSENSE_CALIBRATION -> CoreUiStrings.treatment_eversense_calibration_desc
ElementType.BG_CHECK -> CoreUiStrings.treatment_bg_check_desc
ElementType.EXERCISE -> CoreUiStrings.treatment_exercise_desc
ElementType.ANNOUNCEMENT -> CoreUiStrings.treatment_announcement_desc
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ fun AdaptivePasswordPreferenceItem(
SetPasswordDialog(
title = stringResource(effectiveTitle),
pinInput = isPin,
requireConfirmation = stringKey.requiresPasswordConfirmation,
onConfirm = { password1, password2 ->
when {
password1 != password2 -> {
Expand Down
Loading
Loading