[ + ] Make vault incognito and autofill

Kin69 · Kin69 · commit 899eaef8f86a · 2025-04-14T17:24:51.000+02:00
diff --git a/app/src/main/java/com/kin/easynotes/presentation/components/AutoFill.kt b/app/src/main/java/com/kin/easynotes/presentation/components/AutoFill.kt
@@ -0,0 +1,118 @@
+package com.kin.easynotes.presentation.components
+
+import android.view.autofill.AutofillManager
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.ExperimentalComposeUiApi
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.autofill.Autofill
+import androidx.compose.ui.autofill.AutofillNode
+import androidx.compose.ui.autofill.AutofillType
+import androidx.compose.ui.focus.onFocusChanged
+import androidx.compose.ui.geometry.Rect
+import androidx.compose.ui.layout.boundsInWindow
+import androidx.compose.ui.layout.onGloballyPositioned
+import androidx.compose.ui.platform.LocalAutofill
+import androidx.compose.ui.platform.LocalAutofillTree
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalView
+import kotlin.math.roundToInt
+
+fun Modifier.connectNode(handler: AutoFillHandler): Modifier {
+    return with(handler) { fillBounds() }
+}
+
+fun Modifier.defaultFocusChangeAutoFill(handler: AutoFillHandler): Modifier {
+    return this.then(
+        Modifier.onFocusChanged {
+            if (it.isFocused) {
+                handler.request()
+            } else {
+                handler.cancel()
+            }
+        }
+    )
+}
+
+@OptIn(ExperimentalComposeUiApi::class)
+@Composable
+fun AutoFillRequestHandler(
+    autofillTypes: List<AutofillType> = listOf(),
+    onFill: (String) -> Unit,
+): AutoFillHandler {
+    val view = LocalView.current
+    val context = LocalContext.current
+    var isFillRecently = remember { false }
+    val autoFillNode = remember {
+        AutofillNode(
+            autofillTypes = autofillTypes,
+            onFill = {
+                isFillRecently = true
+                onFill(it)
+            }
+        )
+    }
+    val autofill = LocalAutofill.current
+    LocalAutofillTree.current += autoFillNode
+    return remember {
+        object : AutoFillHandler {
+            val autofillManager = context.getSystemService(AutofillManager::class.java)
+            override fun requestManual() {
+                autofillManager.requestAutofill(
+                    view,
+                    autoFillNode.id,
+                    autoFillNode.boundingBox?.toAndroidRect() ?: error("BoundingBox is not provided yet")
+                )
+            }
+
+            override fun requestVerifyManual() {
+                if (isFillRecently) {
+                    isFillRecently = false
+                    requestManual()
+                }
+            }
+
+            override val autoFill: Autofill?
+                get() = autofill
+
+            override val autoFillNode: AutofillNode
+                get() = autoFillNode
+
+            override fun request() {
+                autofill?.requestAutofillForNode(autofillNode = autoFillNode)
+            }
+
+            override fun cancel() {
+                autofill?.cancelAutofillForNode(autofillNode = autoFillNode)
+            }
+
+            override fun Modifier.fillBounds(): Modifier {
+                return this.then(
+                    Modifier.onGloballyPositioned {
+                        autoFillNode.boundingBox = it.boundsInWindow()
+                    })
+            }
+        }
+    }
+}
+
+fun Rect.toAndroidRect(): android.graphics.Rect {
+    return android.graphics.Rect(
+        left.roundToInt(),
+        top.roundToInt(),
+        right.roundToInt(),
+        bottom.roundToInt()
+    )
+}
+
+interface AutoFillHandler {
+    @OptIn(ExperimentalComposeUiApi::class)
+    val autoFill: Autofill?
+    @OptIn(ExperimentalComposeUiApi::class)
+    val autoFillNode: AutofillNode
+    fun requestVerifyManual()
+    fun requestManual()
+    fun request()
+    fun cancel()
+    fun Modifier.fillBounds(): Modifier
+}
diff --git a/app/src/main/java/com/kin/easynotes/presentation/screens/edit/EditScreen.kt b/app/src/main/java/com/kin/easynotes/presentation/screens/edit/EditScreen.kt
@@ -40,6 +40,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
+import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.focus.onFocusChanged
@@ -291,7 +292,7 @@ fun MinimalisticMode(
 
 
 
-@OptIn(ExperimentalFoundationApi::class)
+@OptIn(ExperimentalFoundationApi::class, ExperimentalComposeUiApi::class)
 @Composable
 fun EditScreen(viewModel: EditViewModel,settingsViewModel: SettingsViewModel, pagerState: PagerState,onClickBack: () -> Unit) {
 
diff --git a/app/src/main/java/com/kin/easynotes/presentation/screens/edit/components/CustomTextField.kt b/app/src/main/java/com/kin/easynotes/presentation/screens/edit/components/CustomTextField.kt
@@ -11,19 +11,31 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.TextRange
-import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontFamily
-import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.input.KeyboardCapitalization
+import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.input.PasswordVisualTransformation
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.text.input.VisualTransformation
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import androidx.compose.ui.autofill.AutofillNode
+import androidx.compose.ui.autofill.AutofillType
+import androidx.compose.ui.focus.onFocusChanged
+import androidx.compose.ui.layout.boundsInWindow
+import androidx.compose.ui.layout.onGloballyPositioned
+import androidx.compose.ui.platform.LocalAutofill
+import androidx.compose.ui.platform.LocalAutofillTree
+import com.kin.easynotes.presentation.components.AutoFillRequestHandler
+import com.kin.easynotes.presentation.components.connectNode
+import com.kin.easynotes.presentation.components.defaultFocusChangeAutoFill
 
+@OptIn(ExperimentalComposeUiApi::class)
 @Composable
 fun CustomTextField(
     value: TextFieldValue,
@@ -34,24 +46,53 @@ fun CustomTextField(
     singleLine: Boolean = false,
     modifier: Modifier = Modifier,
     hideContent: Boolean = false,
-    useMonoSpaceFont: Boolean = false
+    useMonoSpaceFont: Boolean = false,
+    autofillTypes: List<AutofillType>? = null
 ) {
+    val autoFillHandler = if (autofillTypes != null) AutoFillRequestHandler(autofillTypes = autofillTypes,
+        onFill = {
+            onValueChange(TextFieldValue(it))
+        }
+    ) else null
 
     val visualTransformation = if (hideContent) {
         PasswordVisualTransformation()
     } else {
         VisualTransformation.None
     }
+    
+    // Determine if this is a password field based on autofill types or hideContent flag
+    val isPasswordField = hideContent || (autofillTypes != null && 
+        (autofillTypes.contains(AutofillType.Password) || 
+         autofillTypes.contains(AutofillType.NewPassword)))
+
 
+    
     TextField(
         value = value,
-        textStyle =  if (useMonoSpaceFont) LocalTextStyle.current.copy(fontFamily = FontFamily.Monospace) else LocalTextStyle.current,
+        textStyle = if (useMonoSpaceFont) LocalTextStyle.current.copy(fontFamily = FontFamily.Monospace) else LocalTextStyle.current,
         visualTransformation = visualTransformation,
-        onValueChange = onValueChange,
+        onValueChange = {
+            onValueChange(it)
+            if (it.text.isEmpty()) autoFillHandler?.requestVerifyManual()
+        },
         interactionSource = interactionSource,
+        keyboardOptions = androidx.compose.foundation.text.KeyboardOptions(
+            autoCorrect = !isPasswordField,
+            keyboardType = if (isPasswordField) KeyboardType.Password else KeyboardType.Text,
+            capitalization = if (isPasswordField) KeyboardCapitalization.None else KeyboardCapitalization.Sentences,
+        ),
         modifier = modifier
             .fillMaxWidth()
-            .clip(shape),
+            .clip(shape)
+            .then(
+                if (autoFillHandler != null) {
+                    Modifier
+                        .connectNode(handler = autoFillHandler)
+                        .defaultFocusChangeAutoFill(handler = autoFillHandler)
+                } else Modifier
+            ),
+
         singleLine = singleLine,
         colors = TextFieldDefaults.colors(
             focusedContainerColor = Color.Transparent,
diff --git a/app/src/main/java/com/kin/easynotes/presentation/screens/settings/settings/Backup.kt b/app/src/main/java/com/kin/easynotes/presentation/screens/settings/settings/Backup.kt
@@ -30,8 +30,11 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
+import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.autofill.AutofillType
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.unit.dp
@@ -186,9 +189,12 @@ fun currentDateTime(): String {
     return formattedDateTime
 }
 
+@OptIn(ExperimentalComposeUiApi::class)
 @Composable
 fun PasswordPrompt(context: Context, text: String, settingsViewModel: SettingsViewModel, onExit: (TextFieldValue?) -> Unit, onBackup: () -> Unit = {}) {
     var password by remember { mutableStateOf(TextFieldValue("")) }
+    val focusManager = LocalFocusManager.current
+    
     Dialog(
         onDismissRequest = { onExit(null) },
         properties = DialogProperties(usePlatformDefaultWidth = false),
@@ -223,7 +229,8 @@ fun PasswordPrompt(context: Context, text: String, settingsViewModel: SettingsVi
                             hideContent = true,
                             value = password,
                             onValueChange = { password = it },
-                            placeholder = stringResource(id = R.string.password_prompt)
+                            placeholder = stringResource(id = R.string.password_prompt),
+                            autofillTypes = listOf(AutofillType.Password)
                         )
                     }
                     Button(
@@ -233,6 +240,7 @@ fun PasswordPrompt(context: Context, text: String, settingsViewModel: SettingsVi
                             .align(Alignment.End),
                         onClick = {
                             if (password.text.isNotBlank()) {
+                                focusManager.clearFocus() // Clear focus to dismiss autofill
                                 onExit(password)
                                 onBackup()
                             } else {
