Merge pull request #296 from yogeshpaliyal/fix/share

[ComposeApp] Improve touch region area of input fields, Remove focus from fields on sharing image
PatilShreyas · Oct 31, 2021 · 8ed29b3 · 8ed29b3
2 parents 9c35e1a + 0ee9f1b
commit 8ed29b3
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/...mposeapp/src/main/java/dev/shreyaspatil/noty/composeapp/component/text/CommonTextField.kt b/...mposeapp/src/main/java/dev/shreyaspatil/noty/composeapp/component/text/CommonTextField.kt
@@ -19,6 +19,7 @@ package dev.shreyaspatil.noty.composeapp.component.text
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.material.MaterialTheme
@@ -68,7 +69,8 @@ fun BasicNotyTextField(
     label: String = "",
     textStyle: TextStyle = TextStyle(fontSize = 16.sp, fontWeight = FontWeight.Normal),
     onTextChange: (String) -> Unit,
-    maxLines: Int = Int.MAX_VALUE
+    maxLines: Int = Int.MAX_VALUE,
+    textFieldModifier: Modifier = Modifier
 ) {
 
     Box(modifier = modifier.padding(4.dp)) {
@@ -81,6 +83,7 @@ fun BasicNotyTextField(
             )
         }
         BasicTextField(
+            modifier = textFieldModifier.fillMaxWidth(),
             value = value,
             onValueChange = onTextChange,
             textStyle = textStyle.copy(color = MaterialTheme.colors.onPrimary),

diff --git a/...composeapp/src/main/java/dev/shreyaspatil/noty/composeapp/ui/screens/NoteDetailsScreen.kt b/...composeapp/src/main/java/dev/shreyaspatil/noty/composeapp/ui/screens/NoteDetailsScreen.kt
@@ -18,6 +18,7 @@ package dev.shreyaspatil.noty.composeapp.ui.screens
 
 import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.foundation.background
+import androidx.compose.foundation.focusable
 import androidx.compose.foundation.gestures.Orientation
 import androidx.compose.foundation.gestures.scrollable
 import androidx.compose.foundation.layout.Column
@@ -41,6 +42,8 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
@@ -75,6 +78,10 @@ fun NoteDetailsScreen(
     navController: NavHostController,
     viewModel: NoteDetailViewModel
 ) {
+
+    val focusRequester = remember {
+        FocusRequester()
+    }
     val context = LocalContext.current
 
     val updateState = viewModel.updateNoteState.collectAsState(initial = null)
@@ -88,6 +95,9 @@ fun NoteDetailsScreen(
         var captureNoteImageRequestKey: Int? by remember { mutableStateOf(null) }
 
         Scaffold(
+            modifier = Modifier
+                .focusRequester(focusRequester)
+                .focusable(true),
             topBar = {
                 TopAppBar(
                     title = {
@@ -134,6 +144,7 @@ fun NoteDetailsScreen(
                                 ShareActionItem(
                                     label = "Image",
                                     onActionClick = {
+                                        focusRequester.requestFocus()
                                         captureNoteImageRequestKey = Random.nextInt(Int.MAX_VALUE)
                                     }
                                 ),