Merge "Revert "Add brush: () -> Brush override to BasicText"" into androidx-main

Author: Treehugger Robot

compose/foundation/foundation/api/current.txt

@@ -867,9 +867,7 @@ package androidx.compose.foundation.text {
 
   public final class BasicTextKt {
     method @androidx.compose.runtime.Composable public static void BasicText(String text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit>? onTextLayout, optional int overflow, optional boolean softWrap, optional int maxLines, optional int minLines, optional androidx.compose.ui.graphics.ColorLambda? color);
-    method @androidx.compose.runtime.Composable public static void BasicText(String text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit>? onTextLayout, optional int overflow, optional boolean softWrap, optional int maxLines, optional int minLines, optional kotlin.jvm.functions.Function0<? extends androidx.compose.ui.graphics.Brush>? brush, optional androidx.compose.ui.unit.FloatLambda? alpha);
     method @androidx.compose.runtime.Composable public static void BasicText(androidx.compose.ui.text.AnnotatedString text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit>? onTextLayout, optional int overflow, optional boolean softWrap, optional int maxLines, optional int minLines, optional java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent, optional androidx.compose.ui.graphics.ColorLambda? color);
-    method @androidx.compose.runtime.Composable public static void BasicText(androidx.compose.ui.text.AnnotatedString text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit>? onTextLayout, optional int overflow, optional boolean softWrap, optional int maxLines, optional int minLines, optional java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent, optional kotlin.jvm.functions.Function0<? extends androidx.compose.ui.graphics.Brush>? brush, optional androidx.compose.ui.unit.FloatLambda? alpha);
     method @Deprecated @androidx.compose.runtime.Composable public static void BasicText(String text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,? extends kotlin.Unit>? onTextLayout, optional int overflow, optional boolean softWrap, optional int maxLines);
     method @Deprecated @androidx.compose.runtime.Composable public static void BasicText(androidx.compose.ui.text.AnnotatedString text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,? extends kotlin.Unit>? onTextLayout, optional int overflow, optional boolean softWrap, optional int maxLines, optional java.util.Map<java.lang.String,? extends androidx.compose.foundation.text.InlineTextContent> inlineContent);
     method @Deprecated @androidx.compose.runtime.Composable public static void BasicText(String text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,? extends kotlin.Unit>? onTextLayout, optional int overflow, optional boolean softWrap, optional int maxLines, optional int minLines);

compose/foundation/foundation/api/public_plus_experimental_current.txt

@@ -1215,9 +1215,7 @@ package androidx.compose.foundation.text {
 
   public final class BasicTextKt {
     method @androidx.compose.runtime.Composable public static void BasicText(String text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit>? onTextLayout, optional int overflow, optional boolean softWrap, optional int maxLines, optional int minLines, optional androidx.compose.ui.graphics.ColorLambda? color);
-    method @androidx.compose.runtime.Composable public static void BasicText(String text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit>? onTextLayout, optional int overflow, optional boolean softWrap, optional int maxLines, optional int minLines, optional kotlin.jvm.functions.Function0<? extends androidx.compose.ui.graphics.Brush>? brush, optional androidx.compose.ui.unit.FloatLambda? alpha);
     method @androidx.compose.runtime.Composable public static void BasicText(androidx.compose.ui.text.AnnotatedString text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit>? onTextLayout, optional int overflow, optional boolean softWrap, optional int maxLines, optional int minLines, optional java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent, optional androidx.compose.ui.graphics.ColorLambda? color);
-    method @androidx.compose.runtime.Composable public static void BasicText(androidx.compose.ui.text.AnnotatedString text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit>? onTextLayout, optional int overflow, optional boolean softWrap, optional int maxLines, optional int minLines, optional java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent, optional kotlin.jvm.functions.Function0<? extends androidx.compose.ui.graphics.Brush>? brush, optional androidx.compose.ui.unit.FloatLambda? alpha);
     method @Deprecated @androidx.compose.runtime.Composable public static void BasicText(String text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,? extends kotlin.Unit>? onTextLayout, optional int overflow, optional boolean softWrap, optional int maxLines);
     method @Deprecated @androidx.compose.runtime.Composable public static void BasicText(androidx.compose.ui.text.AnnotatedString text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,? extends kotlin.Unit>? onTextLayout, optional int overflow, optional boolean softWrap, optional int maxLines, optional java.util.Map<java.lang.String,? extends androidx.compose.foundation.text.InlineTextContent> inlineContent);
     method @Deprecated @androidx.compose.runtime.Composable public static void BasicText(String text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,? extends kotlin.Unit>? onTextLayout, optional int overflow, optional boolean softWrap, optional int maxLines, optional int minLines);

compose/foundation/foundation/api/restricted_current.txt

@@ -867,9 +867,7 @@ package androidx.compose.foundation.text {
 
   public final class BasicTextKt {
     method @androidx.compose.runtime.Composable public static void BasicText(String text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit>? onTextLayout, optional int overflow, optional boolean softWrap, optional int maxLines, optional int minLines, optional androidx.compose.ui.graphics.ColorLambda? color);
-    method @androidx.compose.runtime.Composable public static void BasicText(String text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit>? onTextLayout, optional int overflow, optional boolean softWrap, optional int maxLines, optional int minLines, optional kotlin.jvm.functions.Function0<? extends androidx.compose.ui.graphics.Brush>? brush, optional androidx.compose.ui.unit.FloatLambda? alpha);
     method @androidx.compose.runtime.Composable public static void BasicText(androidx.compose.ui.text.AnnotatedString text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit>? onTextLayout, optional int overflow, optional boolean softWrap, optional int maxLines, optional int minLines, optional java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent, optional androidx.compose.ui.graphics.ColorLambda? color);
-    method @androidx.compose.runtime.Composable public static void BasicText(androidx.compose.ui.text.AnnotatedString text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit>? onTextLayout, optional int overflow, optional boolean softWrap, optional int maxLines, optional int minLines, optional java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent, optional kotlin.jvm.functions.Function0<? extends androidx.compose.ui.graphics.Brush>? brush, optional androidx.compose.ui.unit.FloatLambda? alpha);
     method @Deprecated @androidx.compose.runtime.Composable public static void BasicText(String text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,? extends kotlin.Unit>? onTextLayout, optional int overflow, optional boolean softWrap, optional int maxLines);
     method @Deprecated @androidx.compose.runtime.Composable public static void BasicText(androidx.compose.ui.text.AnnotatedString text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,? extends kotlin.Unit>? onTextLayout, optional int overflow, optional boolean softWrap, optional int maxLines, optional java.util.Map<java.lang.String,? extends androidx.compose.foundation.text.InlineTextContent> inlineContent);
     method @Deprecated @androidx.compose.runtime.Composable public static void BasicText(String text, optional androidx.compose.ui.Modifier modifier, optional androidx.compose.ui.text.TextStyle style, optional kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,? extends kotlin.Unit>? onTextLayout, optional int overflow, optional boolean softWrap, optional int maxLines, optional int minLines);

compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/TextAnimationDemo.kt

@@ -45,8 +45,6 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.text.ExperimentalTextApi
@@ -84,11 +82,7 @@ fun TextColorAnimation() {
         initialValue = Color.Black,
         targetValue = Color.Gray,
         animationSpec = InfiniteRepeatableSpec(
-            tween(
-                5_000,
-                50,
-                CubicBezierEasing(0.2f, 0.0f, 0.5f, 0.6f)
-            ),
+            tween(5_000, 50, CubicBezierEasing(0.2f, 0.0f, 0.5f, 0.6f)),
             repeatMode = RepeatMode.Reverse
         ),
         label = "slow gray"
@@ -115,38 +109,6 @@ fun TextColorAnimation() {
     }
 }
 
-@Composable
-fun TextGradientAnimation() {
-    val anim = rememberInfiniteTransition("gradient")
-    val offset = anim.animateFloat(
-        initialValue = 0.0f,
-        targetValue = 0.8f,
-        animationSpec = InfiniteRepeatableSpec(
-            animation = tween(
-                durationMillis = 4000,
-                delayMillis = 500,
-                easing = CubicBezierEasing(0.2f, 0.0f, 0.5f, 1.0f)
-            ),
-            repeatMode = RepeatMode.Reverse),
-        label = "offset"
-    )
-
-    Box(contentAlignment = Alignment.Center) {
-        BasicText(
-            "Search Light",
-            style = TextStyle.Default.copy(fontSize = 45.sp, textAlign = TextAlign.Center),
-            brush = {
-                Brush.radialGradient(
-                    offset.value + 0.2f to Color.LightGray, /* grow and sharpen */
-                    offset.value + 0.8f to Color.Black,
-                    center = Offset(600f * offset.value, 100f)
-                )
-            },
-            alpha = { 1.0f }
-        )
-    }
-}
-
 class TextMotionState(initialTextStyle: TextStyle) {
     var isStatic by mutableStateOf(true)
 

compose/foundation/foundation/integration-tests/foundation-demos/src/main/java/androidx/compose/foundation/demos/text/TextDemos.kt

@@ -34,8 +34,7 @@ val TextDemos = DemoCategory(
         DemoCategory(
             "Animation",
             listOf(
-                ComposableDemo("color = { animated.value }") { TextColorAnimation() },
-                ComposableDemo("gradient = { animated.value } ") { TextGradientAnimation() },
+                ComposableDemo("color = { animatedColor.value }") { TextColorAnimation() },
                 ComposableDemo("GraphicsLayer (skew, scale, etc)") { TextAnimationDemo() },
             )
         ),

compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/text/modifiers/NodeInvalidationTestParent.kt

@@ -19,6 +19,7 @@ package androidx.compose.foundation.text.modifiers
 import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorLambda
+import androidx.compose.ui.text.ExperimentalTextApi
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.createFontFamilyResolver
@@ -65,31 +66,7 @@ abstract class NodeInvalidationTestParent {
         assertThat(drawChanged).isTrue()
     }
 
-    @Test
-    fun brushChanged_usingLambda_doesInvalidateDraw() {
-        val params = generateParams()
-        val redFactory = { Brush.linearGradient(listOf(Color.Red)) }
-        val blueFactory = { Brush.linearGradient(listOf(Color.Blue)) }
-        val alpha = { 1.0f }
-        val drawParams = DrawParams(params.style, null, redFactory, alpha)
-        val subject = createSubject(params, drawParams)
-        val drawChanged = subject.updateDrawArgs(drawParams.copy(brush = blueFactory))
-        assertThat(drawChanged).isTrue()
-    }
-
-    @Test
-    fun brushChanged_usingStyle_doesInvalidateDraw() {
-        val params = generateParams()
-        val drawParams = DrawParams(params.style, null, null, null)
-        val subject = createSubject(params, drawParams)
-        val drawChanged = subject.updateDrawArgs(
-            drawParams = drawParams.copy(
-                style = drawParams.style.copy(brush = Brush.linearGradient(listOf(Color.Blue)))
-            )
-        )
-        assertThat(drawChanged).isTrue()
-    }
-
+    @OptIn(ExperimentalTextApi::class)
     @Test
     fun brushChange_doesNotInvalidateLayout() {
         val params = generateParams()
@@ -196,7 +173,7 @@ abstract class NodeInvalidationTestParent {
     data class DrawParams(
         val style: TextStyle,
         val color: ColorLambda? = null,
-        val brush: (() -> Brush)? = null,
-        val alpha: (() -> Float)? = null
+        val brush: Brush? = null,
+        val alpha: Float = Float.NaN
     )
 }

compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/text/modifiers/TextAnnotatedStringNodeInvalidationTest.kt

@@ -34,12 +34,7 @@ class TextAnnotatedStringNodeInvalidationTest : NodeInvalidationTestParent() {
 
     override fun Any.updateDrawArgs(drawParams: DrawParams): Boolean {
         this as TextAnnotatedStringNode
-        return updateDraw(
-            drawParams.color,
-            drawParams.brush,
-            drawParams.alpha,
-            drawParams.style
-        )
+        return updateDraw(drawParams.color, drawParams.style)
     }
 
     override fun createSubject(params: Params): Any {
@@ -51,7 +46,7 @@ class TextAnnotatedStringNodeInvalidationTest : NodeInvalidationTestParent() {
             overflow = params.overflow,
             softWrap = params.softWrap,
             maxLines = params.maxLines,
-            minLines = params.minLines,
+            minLines = params.minLines
         )
     }
 
@@ -65,9 +60,7 @@ class TextAnnotatedStringNodeInvalidationTest : NodeInvalidationTestParent() {
             softWrap = params.softWrap,
             maxLines = params.maxLines,
             minLines = params.minLines,
-            overrideColor = drawParams.color,
-            overrideBrush = drawParams.brush,
-            overrideAlpha = drawParams.alpha
+            overrideColor = drawParams.color
         )
     }
 }

compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/text/modifiers/TextStringSimpleNodeInvalidationTest.kt

@@ -19,12 +19,7 @@ package androidx.compose.foundation.text.modifiers
 class TextStringSimpleNodeInvalidationTest : NodeInvalidationTestParent() {
     override fun Any.updateDrawArgs(drawParams: DrawParams): Boolean {
         this as TextStringSimpleNode
-        return this.updateDraw(
-            drawParams.color,
-            drawParams.brush,
-            drawParams.alpha,
-            drawParams.style
-        )
+        return this.updateDraw(drawParams.color, drawParams.style)
     }
 
     override fun Any.updateAll(params: Params): Pair<Boolean, Boolean> {
@@ -47,7 +42,7 @@ class TextStringSimpleNodeInvalidationTest : NodeInvalidationTestParent() {
             params.overflow,
             params.softWrap,
             params.maxLines,
-            params.minLines,
+            params.minLines
         )
     }
 
@@ -60,9 +55,7 @@ class TextStringSimpleNodeInvalidationTest : NodeInvalidationTestParent() {
             params.softWrap,
             params.maxLines,
             params.minLines,
-            drawParams.color,
-            drawParams.brush,
-            drawParams.alpha
+            drawParams.color
         )
     }
 }