Merge branch 'main' into wear-tiles-screen-size-update

Author: ithinkihaveacat

compose/snippets/src/main/java/com/example/compose/snippets/layouts/InsetsSnippets.kt

@@ -28,9 +28,12 @@ import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.WindowInsetsSides
+import androidx.compose.foundation.layout.asPaddingValues
 import androidx.compose.foundation.layout.consumeWindowInsets
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.ime
 import androidx.compose.foundation.layout.imePadding
+import androidx.compose.foundation.layout.navigationBars
 import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.safeDrawingPadding
@@ -44,10 +47,16 @@ import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.LargeTopAppBar
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
+import androidx.compose.material3.TextField
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment.Companion.BottomCenter
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.layout.WindowInsetsRulers
+import androidx.compose.ui.layout.layout
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.Constraints
 import androidx.compose.ui.unit.dp
+import kotlin.math.roundToInt
 
 class InsetSnippetActivity : ComponentActivity() {
 
@@ -147,3 +156,55 @@ fun OverrideDefaultInsetsSnippet() {
     )
     // [END android_compose_insets_override_defaults]
 }
+
+// [START android_compose_insets_rulers]
+@Composable
+fun WindowInsetsRulersDemo(modifier: Modifier) {
+    Box(
+        contentAlignment = BottomCenter,
+        modifier = modifier
+            .fillMaxSize()
+            // The mistake that causes issues downstream, as .padding doesn't consume insets.
+            // While it's correct to instead use .windowInsetsPadding(WindowInsets.navigationBars),
+            // assume it's difficult to identify this issue to see how WindowInsetsRulers can help.
+            .padding(WindowInsets.navigationBars.asPaddingValues())
+    ) {
+        TextField(
+            value = "Demo IME Insets",
+            onValueChange = {},
+            modifier = modifier
+                // Use alignToSafeDrawing() instead of .imePadding() to precisely place this child
+                // Composable without having to fix the parent upstream.
+                .alignToSafeDrawing()
+
+            // .imePadding()
+            // .fillMaxWidth()
+        )
+    }
+}
+
+fun Modifier.alignToSafeDrawing(): Modifier {
+    return layout { measurable, constraints ->
+        if (constraints.hasBoundedWidth && constraints.hasBoundedHeight) {
+            val placeable = measurable.measure(constraints)
+            val width = placeable.width
+            val height = placeable.height
+            layout(width, height) {
+                val bottom = WindowInsetsRulers.SafeDrawing.current.bottom
+                    .current(0f).roundToInt() - height
+                val right = WindowInsetsRulers.SafeDrawing.current.right
+                    .current(0f).roundToInt()
+                val left = WindowInsetsRulers.SafeDrawing.current.left
+                    .current(0f).roundToInt()
+                measurable.measure(Constraints.fixed(right - left, height))
+                    .place(left, bottom)
+            }
+        } else {
+            val placeable = measurable.measure(constraints)
+            layout(placeable.width, placeable.height) {
+                placeable.place(0, 0)
+            }
+        }
+    }
+}
+// [END android_compose_insets_rulers]

compose/snippets/src/main/java/com/example/compose/snippets/text/StateBasedText.kt

@@ -38,14 +38,14 @@ import androidx.compose.material.TextField
 //noinspection UsingMaterialAndMaterial3Libraries
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.core.text.isDigitsOnly
@@ -144,21 +144,19 @@ fun TextFieldInitialState() {
     // [END android_compose_state_text_7]
 }
 
+@Preview(showBackground = true)
 @Composable
 fun TextFieldBuffer() {
     // [START android_compose_state_text_8]
-    val phoneNumberState = rememberTextFieldState()
-
-    LaunchedEffect(phoneNumberState) {
-        phoneNumberState.edit { // TextFieldBuffer scope
-            append("123456789")
-        }
-    }
+    val phoneNumberState = rememberTextFieldState("1234567890")
 
     TextField(
         state = phoneNumberState,
-        inputTransformation = InputTransformation { // TextFieldBuffer scope
-            if (asCharSequence().isDigitsOnly()) {
+        keyboardOptions = KeyboardOptions(
+            keyboardType = KeyboardType.Phone
+        ),
+        inputTransformation = InputTransformation.maxLength(10).then {
+            if (!asCharSequence().isDigitsOnly()) {
                 revertAllChanges()
             }
         },
@@ -174,32 +172,37 @@ fun TextFieldBuffer() {
 @Preview
 @Composable
 fun EditTextFieldState() {
-    // [START android_compose_state_text_9]
     val usernameState = rememberTextFieldState("I love Android")
+    editTFState(usernameState)
+}
+
+fun editTFState(textFieldState: TextFieldState) {
+    // [START android_compose_state_text_9]
+    // Initial textFieldState text passed in is "I love Android"
     // textFieldState.text : I love Android
     // textFieldState.selection: TextRange(14, 14)
-    usernameState.edit { insert(14, "!") }
+    textFieldState.edit { insert(14, "!") }
     // textFieldState.text : I love Android!
     // textFieldState.selection: TextRange(15, 15)
-    usernameState.edit { replace(7, 14, "Compose") }
+    textFieldState.edit { replace(7, 14, "Compose") }
     // textFieldState.text : I love Compose!
     // textFieldState.selection: TextRange(15, 15)
-    usernameState.edit { append("!!!") }
+    textFieldState.edit { append("!!!") }
     // textFieldState.text : I love Compose!!!!
     // textFieldState.selection: TextRange(18, 18)
-    usernameState.edit { selectAll() }
+    textFieldState.edit { selectAll() }
     // textFieldState.text : I love Compose!!!!
     // textFieldState.selection: TextRange(0, 18)
     // [END android_compose_state_text_9]
 
     // [START android_compose_state_text_10]
-    usernameState.setTextAndPlaceCursorAtEnd("I really love Android")
+    textFieldState.setTextAndPlaceCursorAtEnd("I really love Android")
     // textFieldState.text : I really love Android
     // textFieldState.selection : TextRange(21, 21)
     // [END android_compose_state_text_10]
 
     // [START android_compose_state_text_11]
-    usernameState.clearText()
+    textFieldState.clearText()
     // textFieldState.text :
     // textFieldState.selection : TextRange(0, 0)
     // [END android_compose_state_text_11]