refactor: extract BiometricsView component

Author: ovitrif

app/src/main/java/to/bitkit/ui/components/AuthCheckView.kt

@@ -2,59 +2,60 @@ package to.bitkit.ui.components
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.material3.Icon
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 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.compose.ui.unit.dp
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import to.bitkit.R
+import to.bitkit.ui.appViewModel
 import to.bitkit.ui.theme.AppThemeSurface
-import to.bitkit.ui.utils.BiometricPrompt
 import to.bitkit.ui.utils.rememberBiometricAuthSupported
 
 @Composable
 fun AuthCheckView(
     onSuccess: (() -> Unit)? = null,
     isBiometrySupported: Boolean = rememberBiometricAuthSupported(),
 ) {
+    val app = appViewModel ?: return
+    val isBiometricsEnabled by app.isBiometricEnabled.collectAsStateWithLifecycle()
+
+    AuthCheckViewContent(
+        onSuccess = onSuccess,
+        isBiometricsEnabled = isBiometricsEnabled,
+        isBiometrySupported = isBiometrySupported,
+    )
+}
+
+@Composable
+private fun AuthCheckViewContent(
+    onSuccess: (() -> Unit)? = null,
+    isBiometricsEnabled: Boolean,
+    isBiometrySupported: Boolean,
+) {
+    var showBio by rememberSaveable { mutableStateOf(isBiometricsEnabled) }
+
     Box(
         contentAlignment = Alignment.Center,
         modifier = Modifier.fillMaxSize()
     ) {
         Column(
             horizontalAlignment = Alignment.CenterHorizontally,
         ) {
-            var showBio by rememberSaveable { mutableStateOf(true) }
 
             if (showBio && isBiometrySupported) {
-                BiometricPrompt(
+                BiometricsView(
                     onSuccess = { onSuccess?.invoke() },
-                    onError = { showBio = false },
-                )
-
-                val subtitleText = let {
-                    val biometricsName = stringResource(R.string.security__bio)
-                    stringResource(R.string.security__bio_auth_with).replace("{biometricsName}", biometricsName)
-                }
-                Icon(
-                    painter = painterResource(R.drawable.ic_fingerprint),
-                    contentDescription = null,
-                    modifier = Modifier.size(64.dp),
+                    onFailure = { showBio = false },
                 )
-                Spacer(modifier = Modifier.height(16.dp))
-                Subtitle(text = subtitleText)
             } else {
                 Subtitle(text = "TODO: Pin code auth")
                 PrimaryButton(
@@ -68,12 +69,25 @@ fun AuthCheckView(
     }
 }
 
-@Preview
+@Preview(showBackground = true)
+@Composable
+private fun PreviewBio() {
+    AppThemeSurface {
+        AuthCheckViewContent(
+            onSuccess = {},
+            isBiometricsEnabled = true,
+            isBiometrySupported = true,
+        )
+    }
+}
+
+@Preview(showBackground = true)
 @Composable
-fun AuthCheckPreview() {
+private fun PreviewPin() {
     AppThemeSurface {
-        AuthCheckView(
+        AuthCheckViewContent(
             onSuccess = {},
+            isBiometricsEnabled = false,
             isBiometrySupported = true,
         )
     }

app/src/main/java/to/bitkit/ui/components/BiometricsView.kt

@@ -0,0 +1,36 @@
+package to.bitkit.ui.components
+
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.size
+import androidx.compose.material3.Icon
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import to.bitkit.R
+import to.bitkit.ui.utils.BiometricPrompt
+
+@Composable
+fun BiometricsView(
+    onSuccess: (() -> Unit)? = null,
+    onFailure: (() -> Unit)? = null,
+) {
+    BiometricPrompt(
+        onSuccess = { onSuccess?.invoke() },
+        onError = { onFailure?.invoke() },
+    )
+    Icon(
+        painter = painterResource(R.drawable.ic_fingerprint),
+        contentDescription = null,
+        modifier = Modifier.Companion.size(64.dp),
+    )
+    Spacer(modifier = Modifier.Companion.height(16.dp))
+    Subtitle(
+        text = run {
+            val biometricsName = stringResource(R.string.security__bio)
+            stringResource(R.string.security__bio_auth_with).replace("{biometricsName}", biometricsName)
+        }
+    )
+}

app/src/main/java/to/bitkit/viewmodels/AppViewModel.kt

@@ -125,7 +125,7 @@ class AppViewModel @Inject constructor(
     }
 
     val isBiometricEnabled: StateFlow<Boolean> = settingsStore.isBiometricEnabled
-        .stateIn(viewModelScope, SharingStarted.Lazily, false)
+        .stateIn(viewModelScope, SharingStarted.Eagerly, false)
 
     fun setIsBiometricEnabled(value: Boolean) {
         viewModelScope.launch {