feat: improve biometric login and update build gradle

feat: improve biometric login and update build gradle

Author: Fandroid745

app/build.gradle

@@ -13,8 +13,8 @@ android {
         applicationId "com.opennotes"
         minSdk 26
         targetSdk 36
-        versionCode 9
-        versionName "1.3.5"
+        versionCode 10
+        versionName "1.3.6"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {

app/src/main/java/com/opennotes/feature_node/presentation/MainActivity.kt

@@ -21,6 +21,7 @@ package com.opennotes.feature_node.presentation
 import android.os.Bundle
 import androidx.activity.compose.setContent
 import androidx.activity.viewModels
+import androidx.biometric.BiometricManager
 import androidx.biometric.BiometricPrompt
 import androidx.compose.animation.EnterTransition
 import androidx.compose.animation.ExitTransition
@@ -159,6 +160,16 @@ class MainActivity : FragmentActivity() {
         onSuccess: () -> Unit,
         onError: (Int, CharSequence) -> Unit
     ) {
+        val promptInfo = BiometricPrompt.PromptInfo.Builder()
+            .setTitle("Unlock OpenNotes")
+            .setSubtitle("Confirm your identity to access your notes")
+            .setAllowedAuthenticators(
+                BiometricManager.Authenticators.BIOMETRIC_STRONG or
+                        BiometricManager.Authenticators.BIOMETRIC_WEAK or
+                        BiometricManager.Authenticators.DEVICE_CREDENTIAL
+            )
+            .build()
+
         BiometricPrompt(
             this,
             ContextCompat.getMainExecutor(this),
@@ -171,13 +182,7 @@ class MainActivity : FragmentActivity() {
                 }
                 override fun onAuthenticationFailed() = Unit
             }
-        ).authenticate(
-            BiometricPrompt.PromptInfo.Builder()
-                .setTitle("Unlock OpenNotes")
-                .setSubtitle("Confirm your fingerprint to access your notes")
-                .setNegativeButtonText("Cancel")
-                .build()
-        )
+        ).authenticate(promptInfo)
     }
 
     private fun handleBiometricError(

app/src/main/java/com/opennotes/feature_node/presentation/settings/SettingsScreen.kt

@@ -117,7 +117,8 @@ fun SettingsScreen(
                     val biometricManager = BiometricManager.from(context)
                     val canAuthenticate = biometricManager.canAuthenticate(
                         BiometricManager.Authenticators.BIOMETRIC_STRONG or
-                                BiometricManager.Authenticators.BIOMETRIC_WEAK
+                                BiometricManager.Authenticators.BIOMETRIC_WEAK or
+                                BiometricManager.Authenticators.DEVICE_CREDENTIAL
                     )
 
                     if (canAuthenticate != BiometricManager.BIOMETRIC_SUCCESS) {
@@ -153,8 +154,12 @@ fun SettingsScreen(
 
                     val promptInfo = BiometricPrompt.PromptInfo.Builder()
                         .setTitle("Enable biometric lock")
-                        .setSubtitle("Confirm your fingerprint to enable app lock")
-                        .setNegativeButtonText("Cancel")
+                        .setSubtitle("Confirm your identity to enable app lock")
+                        .setAllowedAuthenticators(
+                            BiometricManager.Authenticators.BIOMETRIC_STRONG or
+                                    BiometricManager.Authenticators.BIOMETRIC_WEAK or
+                                    BiometricManager.Authenticators.DEVICE_CREDENTIAL
+                        )
                         .build()
 
                     prompt.authenticate(promptInfo)

app/src/main/java/com/opennotes/feature_node/presentation/settings/SettingsViewModel.kt

@@ -36,6 +36,7 @@ import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.receiveAsFlow
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
@@ -48,10 +49,13 @@ class SettingsViewModel @Inject constructor(
 ) : ViewModel() {
 
     val settings: StateFlow<Settings> = dataStoreRepository.getSettingsFlow()
+        .onEach {
+            if (!_isLoaded.value) _isLoaded.value = true
+        }
         .stateIn(
             scope = viewModelScope,
-            started = SharingStarted.WhileSubscribed(5000),
-            initialValue = Settings() // Default settings while loading
+            started = SharingStarted.Eagerly, // starts collecting immediately, not waiting for subscribers
+            initialValue = Settings()
         )
 
     private val _isAppUnlocked = MutableStateFlow(false)
@@ -75,16 +79,6 @@ class SettingsViewModel @Inject constructor(
         object RequestBiometricAuthForEnable : UiEvent()
     }
 
-    init {
-
-        viewModelScope.launch {
-
-            settings.first()
-            _isLoaded.value = true
-        }
-    }
-
-
     fun updateThemeMode(themeMode: ThemeMode) {
         val newSettings = settings.value.copy(themeMode = themeMode)
         viewModelScope.launch {