From 113e972d2b18ccd28408313b4d1fc22ba224ea88 Mon Sep 17 00:00:00 2001 From: Meghan Date: Mon, 19 May 2025 11:00:15 -0700 Subject: [PATCH 1/4] Update StateBasedText.kt Update state based TF snippets --- .../compose/snippets/text/StateBasedText.kt | 26 ++++++++++++++----- 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/compose/snippets/src/main/java/com/example/compose/snippets/text/StateBasedText.kt b/compose/snippets/src/main/java/com/example/compose/snippets/text/StateBasedText.kt index 50375279c..cfcaebc9c 100644 --- a/compose/snippets/src/main/java/com/example/compose/snippets/text/StateBasedText.kt +++ b/compose/snippets/src/main/java/com/example/compose/snippets/text/StateBasedText.kt @@ -17,8 +17,8 @@ package com.example.compose.snippets.text import android.text.TextUtils +import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.text.BasicTextField import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.foundation.text.input.InputTransformation import androidx.compose.foundation.text.input.OutputTransformation @@ -32,6 +32,7 @@ import androidx.compose.foundation.text.input.rememberTextFieldState import androidx.compose.foundation.text.input.selectAll import androidx.compose.foundation.text.input.setTextAndPlaceCursorAtEnd import androidx.compose.foundation.text.input.then +import androidx.compose.material.OutlinedTextField //noinspection UsingMaterialAndMaterial3Libraries import androidx.compose.material.TextField //noinspection UsingMaterialAndMaterial3Libraries @@ -50,23 +51,36 @@ import androidx.compose.ui.unit.dp import androidx.core.text.isDigitsOnly import androidx.lifecycle.ViewModel +@Preview @Composable fun StateBasedTextSnippets() { - // [START android_compose_state_text_1] - BasicTextField(state = rememberTextFieldState()) + Column() { + // [START android_compose_state_text_0] + TextField( + state = rememberTextFieldState(initialText = "Hello"), + label = { Text("Label")} + ) + // [END android_compose_state_text_0] - TextField(state = rememberTextFieldState()) - // [END android_compose_state_text_1] + // [START android_compose_state_text_1] + OutlinedTextField( + state = rememberTextFieldState(), + label = { Text("Label") } + ) + // [END android_compose_state_text_1] + } } +@Preview @Composable fun StyleTextField() { // [START android_compose_state_text_2] TextField( - state = rememberTextFieldState(), + state = rememberTextFieldState("Hello\nWorld\nInvisible"), lineLimits = TextFieldLineLimits.MultiLine(maxHeightInLines = 2), placeholder = { Text("") }, textStyle = TextStyle(color = Color.Blue, fontWeight = FontWeight.Bold), + label = { Text("Enter text")}, modifier = Modifier.padding(20.dp) ) // [END android_compose_state_text_2] From fd7f989ad3c3d8863a81f5957ce2eb1e1ad2823b Mon Sep 17 00:00:00 2001 From: MagicalMeghan <46006059+MagicalMeghan@users.noreply.github.com> Date: Mon, 19 May 2025 18:03:09 +0000 Subject: [PATCH 2/4] Apply Spotless --- .../java/com/example/compose/snippets/text/StateBasedText.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose/snippets/src/main/java/com/example/compose/snippets/text/StateBasedText.kt b/compose/snippets/src/main/java/com/example/compose/snippets/text/StateBasedText.kt index cfcaebc9c..5e3cd6325 100644 --- a/compose/snippets/src/main/java/com/example/compose/snippets/text/StateBasedText.kt +++ b/compose/snippets/src/main/java/com/example/compose/snippets/text/StateBasedText.kt @@ -58,7 +58,7 @@ fun StateBasedTextSnippets() { // [START android_compose_state_text_0] TextField( state = rememberTextFieldState(initialText = "Hello"), - label = { Text("Label")} + label = { Text("Label") } ) // [END android_compose_state_text_0] @@ -80,7 +80,7 @@ fun StyleTextField() { lineLimits = TextFieldLineLimits.MultiLine(maxHeightInLines = 2), placeholder = { Text("") }, textStyle = TextStyle(color = Color.Blue, fontWeight = FontWeight.Bold), - label = { Text("Enter text")}, + label = { Text("Enter text") }, modifier = Modifier.padding(20.dp) ) // [END android_compose_state_text_2] From f03262786f2b441dbd194a7336fa9da974d553d8 Mon Sep 17 00:00:00 2001 From: Meghan Date: Mon, 19 May 2025 11:10:12 -0700 Subject: [PATCH 3/4] Update StateBasedText.kt --- .../example/compose/snippets/text/StateBasedText.kt | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/compose/snippets/src/main/java/com/example/compose/snippets/text/StateBasedText.kt b/compose/snippets/src/main/java/com/example/compose/snippets/text/StateBasedText.kt index cfcaebc9c..a88b37daa 100644 --- a/compose/snippets/src/main/java/com/example/compose/snippets/text/StateBasedText.kt +++ b/compose/snippets/src/main/java/com/example/compose/snippets/text/StateBasedText.kt @@ -18,6 +18,8 @@ package com.example.compose.snippets.text import android.text.TextUtils import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.foundation.text.input.InputTransformation @@ -95,9 +97,16 @@ fun ConfigureLineLimits() { ) // [END android_compose_state_text_3] + +} + +@Preview +@Composable +fun Multiline() { + Spacer(modifier = Modifier.height(15.dp)) // [START android_compose_state_text_4] TextField( - state = rememberTextFieldState(), + state = rememberTextFieldState("Hello\nWorld\nHello\nWorld"), lineLimits = TextFieldLineLimits.MultiLine(1, 4) ) // [END android_compose_state_text_4] From 14a27fd5a338e8c6b4c590fc5f9c038e354c0574 Mon Sep 17 00:00:00 2001 From: MagicalMeghan <46006059+MagicalMeghan@users.noreply.github.com> Date: Mon, 19 May 2025 18:12:37 +0000 Subject: [PATCH 4/4] Apply Spotless --- .../java/com/example/compose/snippets/text/StateBasedText.kt | 2 -- 1 file changed, 2 deletions(-) diff --git a/compose/snippets/src/main/java/com/example/compose/snippets/text/StateBasedText.kt b/compose/snippets/src/main/java/com/example/compose/snippets/text/StateBasedText.kt index b22f9fb18..b43aef25f 100644 --- a/compose/snippets/src/main/java/com/example/compose/snippets/text/StateBasedText.kt +++ b/compose/snippets/src/main/java/com/example/compose/snippets/text/StateBasedText.kt @@ -96,8 +96,6 @@ fun ConfigureLineLimits() { lineLimits = TextFieldLineLimits.SingleLine ) // [END android_compose_state_text_3] - - } @Preview