Merge "Feature Carousel should allow internal focus movement before triggering slide changes" into androidx-main
diff --git a/camera/camera-core/api/current.txt b/camera/camera-core/api/current.txt
index 20658d2..2286727 100644
--- a/camera/camera-core/api/current.txt
+++ b/camera/camera-core/api/current.txt
@@ -213,7 +213,7 @@
method public boolean isOutputImageRotationEnabled();
method public void setAnalyzer(java.util.concurrent.Executor, androidx.camera.core.ImageAnalysis.Analyzer);
method public void setTargetRotation(int);
- method public void setTargetRotationDegrees(int);
+ method @Deprecated public void setTargetRotationDegrees(int);
field public static final int COORDINATE_SYSTEM_ORIGINAL = 0; // 0x0
field public static final int OUTPUT_IMAGE_FORMAT_RGBA_8888 = 2; // 0x2
field public static final int OUTPUT_IMAGE_FORMAT_YUV_420_888 = 1; // 0x1
@@ -253,7 +253,7 @@
method public void setCropAspectRatio(android.util.Rational);
method public void setFlashMode(int);
method public void setTargetRotation(int);
- method public void setTargetRotationDegrees(int);
+ method @Deprecated public void setTargetRotationDegrees(int);
method public void takePicture(java.util.concurrent.Executor, androidx.camera.core.ImageCapture.OnImageCapturedCallback);
method public void takePicture(androidx.camera.core.ImageCapture.OutputFileOptions, java.util.concurrent.Executor, androidx.camera.core.ImageCapture.OnImageSavedCallback);
field public static final int CAPTURE_MODE_MAXIMIZE_QUALITY = 0; // 0x0
@@ -474,6 +474,7 @@
}
@RequiresApi(21) public abstract class UseCase {
+ method public static int snapToSurfaceRotation(@IntRange(from=0, to=359) int);
}
@RequiresApi(21) public final class UseCaseGroup {
diff --git a/camera/camera-core/api/public_plus_experimental_current.txt b/camera/camera-core/api/public_plus_experimental_current.txt
index 635067b..ee3714c 100644
--- a/camera/camera-core/api/public_plus_experimental_current.txt
+++ b/camera/camera-core/api/public_plus_experimental_current.txt
@@ -228,7 +228,7 @@
method public boolean isOutputImageRotationEnabled();
method public void setAnalyzer(java.util.concurrent.Executor, androidx.camera.core.ImageAnalysis.Analyzer);
method public void setTargetRotation(int);
- method public void setTargetRotationDegrees(int);
+ method @Deprecated public void setTargetRotationDegrees(int);
field public static final int COORDINATE_SYSTEM_ORIGINAL = 0; // 0x0
field public static final int OUTPUT_IMAGE_FORMAT_RGBA_8888 = 2; // 0x2
field public static final int OUTPUT_IMAGE_FORMAT_YUV_420_888 = 1; // 0x1
@@ -268,7 +268,7 @@
method public void setCropAspectRatio(android.util.Rational);
method public void setFlashMode(int);
method public void setTargetRotation(int);
- method public void setTargetRotationDegrees(int);
+ method @Deprecated public void setTargetRotationDegrees(int);
method public void takePicture(java.util.concurrent.Executor, androidx.camera.core.ImageCapture.OnImageCapturedCallback);
method public void takePicture(androidx.camera.core.ImageCapture.OutputFileOptions, java.util.concurrent.Executor, androidx.camera.core.ImageCapture.OnImageSavedCallback);
field public static final int CAPTURE_MODE_MAXIMIZE_QUALITY = 0; // 0x0
@@ -491,6 +491,7 @@
}
@RequiresApi(21) public abstract class UseCase {
+ method public static int snapToSurfaceRotation(@IntRange(from=0, to=359) int);
}
@RequiresApi(21) public final class UseCaseGroup {
diff --git a/camera/camera-core/api/restricted_current.txt b/camera/camera-core/api/restricted_current.txt
index 20658d2..2286727 100644
--- a/camera/camera-core/api/restricted_current.txt
+++ b/camera/camera-core/api/restricted_current.txt
@@ -213,7 +213,7 @@
method public boolean isOutputImageRotationEnabled();
method public void setAnalyzer(java.util.concurrent.Executor, androidx.camera.core.ImageAnalysis.Analyzer);
method public void setTargetRotation(int);
- method public void setTargetRotationDegrees(int);
+ method @Deprecated public void setTargetRotationDegrees(int);
field public static final int COORDINATE_SYSTEM_ORIGINAL = 0; // 0x0
field public static final int OUTPUT_IMAGE_FORMAT_RGBA_8888 = 2; // 0x2
field public static final int OUTPUT_IMAGE_FORMAT_YUV_420_888 = 1; // 0x1
@@ -253,7 +253,7 @@
method public void setCropAspectRatio(android.util.Rational);
method public void setFlashMode(int);
method public void setTargetRotation(int);
- method public void setTargetRotationDegrees(int);
+ method @Deprecated public void setTargetRotationDegrees(int);
method public void takePicture(java.util.concurrent.Executor, androidx.camera.core.ImageCapture.OnImageCapturedCallback);
method public void takePicture(androidx.camera.core.ImageCapture.OutputFileOptions, java.util.concurrent.Executor, androidx.camera.core.ImageCapture.OnImageSavedCallback);
field public static final int CAPTURE_MODE_MAXIMIZE_QUALITY = 0; // 0x0
@@ -474,6 +474,7 @@
}
@RequiresApi(21) public abstract class UseCase {
+ method public static int snapToSurfaceRotation(@IntRange(from=0, to=359) int);
}
@RequiresApi(21) public final class UseCaseGroup {
diff --git a/camera/camera-core/src/androidTest/java/androidx/camera/core/UseCaseTest.kt b/camera/camera-core/src/androidTest/java/androidx/camera/core/UseCaseTest.kt
index 71f4651..52cb1a2 100644
--- a/camera/camera-core/src/androidTest/java/androidx/camera/core/UseCaseTest.kt
+++ b/camera/camera-core/src/androidTest/java/androidx/camera/core/UseCaseTest.kt
@@ -25,6 +25,7 @@
import androidx.camera.core.MirrorMode.MIRROR_MODE_OFF
import androidx.camera.core.MirrorMode.MIRROR_MODE_ON
import androidx.camera.core.MirrorMode.MIRROR_MODE_ON_FRONT_ONLY
+import androidx.camera.core.UseCase.snapToSurfaceRotation
import androidx.camera.core.concurrent.CameraCoordinator
import androidx.camera.core.impl.Config
import androidx.camera.core.impl.ImageOutputConfig
@@ -42,6 +43,7 @@
import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.filters.SdkSuppress
import androidx.test.filters.SmallTest
+import androidx.testutils.assertThrows
import com.google.common.truth.Truth.assertThat
import org.junit.Before
import org.junit.Test
@@ -292,6 +294,24 @@
assertThat(fakeUseCase.isMirroringRequired(fakeFrontCamera)).isTrue()
}
+ @Test
+ fun snapToSurfaceRotation_toCorrectValue() {
+ assertThat(snapToSurfaceRotation(45)).isEqualTo(Surface.ROTATION_270)
+ assertThat(snapToSurfaceRotation(135)).isEqualTo(Surface.ROTATION_180)
+ assertThat(snapToSurfaceRotation(225)).isEqualTo(Surface.ROTATION_90)
+ assertThat(snapToSurfaceRotation(315)).isEqualTo(Surface.ROTATION_0)
+ }
+
+ @Test
+ fun snapToSurfaceRotation_invalidInput() {
+ assertThrows<IllegalArgumentException> {
+ snapToSurfaceRotation(-1)
+ }
+ assertThrows<IllegalArgumentException> {
+ snapToSurfaceRotation(360)
+ }
+ }
+
private fun createFakeUseCase(
targetRotation: Int = Surface.ROTATION_0,
mirrorMode: Int? = null,
diff --git a/camera/camera-core/src/main/java/androidx/camera/core/ImageAnalysis.java b/camera/camera-core/src/main/java/androidx/camera/core/ImageAnalysis.java
index c708353..1c9e38a 100644
--- a/camera/camera-core/src/main/java/androidx/camera/core/ImageAnalysis.java
+++ b/camera/camera-core/src/main/java/androidx/camera/core/ImageAnalysis.java
@@ -41,6 +41,7 @@
import static androidx.camera.core.impl.UseCaseConfig.OPTION_TARGET_NAME;
import static androidx.camera.core.impl.UseCaseConfig.OPTION_USE_CASE_EVENT_CALLBACK;
import static androidx.camera.core.impl.UseCaseConfig.OPTION_ZSL_DISABLED;
+import static androidx.camera.core.impl.utils.TransformUtils.within360;
import static androidx.camera.core.internal.ThreadConfig.OPTION_BACKGROUND_EXECUTOR;
import android.graphics.ImageFormat;
@@ -441,8 +442,7 @@
* <p>
* The rotation can be set when constructing an {@link ImageAnalysis} instance using
* {@link ImageAnalysis.Builder#setTargetRotation(int)}, or dynamically by calling
- * {@link ImageAnalysis#setTargetRotation(int)} or
- * {@link ImageAnalysis#setTargetRotationDegrees(int)}. If not set, the target rotation
+ * {@link ImageAnalysis#setTargetRotation(int)}. If not set, the target rotation
* defaults to the value of {@link Display#getRotation()} of the default display at the time
* the use case is created. The use case is fully created once it has been attached to a camera.
* </p>
@@ -471,10 +471,11 @@
* set the target rotation. This way, the rotation output to the Analyzer will indicate
* which way is down for a given image. This is important since display orientation may be
* locked by device default, user setting, or app configuration, and some devices may not
- * transition to a reverse-portrait display orientation. In these cases, use
- * {@link ImageAnalysis#setTargetRotationDegrees(int)} to set target rotation dynamically
- * according to the {@link android.view.OrientationEventListener}, without re-creating the
- * use case. See {@link #setTargetRotationDegrees} for more information.
+ * transition to a reverse-portrait display orientation. In these cases, set target rotation
+ * dynamically according to the {@link android.view.OrientationEventListener}, without
+ * re-creating the use case. {@link UseCase#snapToSurfaceRotation(int)} is a helper function to
+ * convert the orientation of the {@link android.view.OrientationEventListener} to a rotation
+ * value. See {@link UseCase#snapToSurfaceRotation(int)} for more information and sample code.
*
* <p>When this function is called, value set by
* {@link ImageAnalysis.Builder#setTargetResolution(Size)} will be updated automatically to
@@ -497,6 +498,7 @@
}
}
+ // TODO(b/277999375): Remove API setTargetRotationDegrees.
/**
* Sets the target rotation in degrees.
*
@@ -560,9 +562,12 @@
* @param degrees Desired rotation degree of the output image.
* @see #setTargetRotation(int)
* @see #getTargetRotation()
+ * @deprecated Use {@link UseCase#snapToSurfaceRotation(int)} and
+ * {@link #setTargetRotation(int)} to convert and set the rotation.
*/
+ @Deprecated // TODO(b/277999375): Remove API setTargetRotationDegrees.
public void setTargetRotationDegrees(int degrees) {
- setTargetRotation(orientationDegreesToSurfaceRotation(degrees));
+ setTargetRotation(snapToSurfaceRotation(within360(degrees)));
}
/**
@@ -1315,9 +1320,8 @@
* Rotation values are relative to the "natural" rotation, {@link Surface#ROTATION_0}.
*
* <p>In general, it is best to additionally set the target rotation dynamically on the use
- * case. See
- * {@link androidx.camera.core.ImageAnalysis#setTargetRotationDegrees(int)} for additional
- * documentation.
+ * case. See {@link androidx.camera.core.ImageAnalysis#setTargetRotation(int)} for
+ * additional documentation.
*
* <p>If not set, the target rotation will default to the value of
* {@link android.view.Display#getRotation()} of the default display at the time the
@@ -1326,7 +1330,6 @@
* @param rotation The rotation of the intended target.
* @return The current Builder.
* @see androidx.camera.core.ImageAnalysis#setTargetRotation(int)
- * @see androidx.camera.core.ImageAnalysis#setTargetRotationDegrees(int)
* @see android.view.OrientationEventListener
*/
@NonNull
diff --git a/camera/camera-core/src/main/java/androidx/camera/core/ImageCapture.java b/camera/camera-core/src/main/java/androidx/camera/core/ImageCapture.java
index 8eea5df..4b48ba5 100644
--- a/camera/camera-core/src/main/java/androidx/camera/core/ImageCapture.java
+++ b/camera/camera-core/src/main/java/androidx/camera/core/ImageCapture.java
@@ -46,6 +46,7 @@
import static androidx.camera.core.impl.UseCaseConfig.OPTION_ZSL_DISABLED;
import static androidx.camera.core.impl.utils.Threads.checkMainThread;
import static androidx.camera.core.impl.utils.TransformUtils.is90or270;
+import static androidx.camera.core.impl.utils.TransformUtils.within360;
import static androidx.camera.core.internal.utils.ImageUtil.computeCropRectFromAspectRatio;
import static androidx.camera.core.internal.utils.ImageUtil.isAspectRatioValid;
import static androidx.core.util.Preconditions.checkNotNull;
@@ -700,8 +701,7 @@
*
* <p>The rotation can be set prior to constructing an ImageCapture using
* {@link ImageCapture.Builder#setTargetRotation(int)} or dynamically by calling
- * {@link ImageCapture#setTargetRotation(int)} or
- * {@link ImageCapture#setTargetRotationDegrees(int)}. The rotation of an image taken is
+ * {@link ImageCapture#setTargetRotation(int)}. The rotation of an image taken is
* determined by the rotation value set at the time image capture is initiated, such as when
* calling {@link #takePicture(Executor, OnImageCapturedCallback)}.
*
@@ -731,10 +731,11 @@
* set the target rotation. This way, the rotation output will indicate which way is down for
* a given image. This is important since display orientation may be locked by device
* default, user setting, or app configuration, and some devices may not transition to a
- * reverse-portrait display orientation. In these cases,
- * use {@link #setTargetRotationDegrees} to set target rotation dynamically according to the
- * {@link android.view.OrientationEventListener}, without re-creating the use case.
- * See {@link #setTargetRotationDegrees} for more information.
+ * reverse-portrait display orientation. In these cases, set target rotation dynamically
+ * according to the {@link android.view.OrientationEventListener}, without re-creating the
+ * use case. {@link UseCase#snapToSurfaceRotation(int)} is a helper function to convert the
+ * orientation of the {@link android.view.OrientationEventListener} to a rotation value.
+ * See {@link UseCase#snapToSurfaceRotation(int)} for more information and sample code.
*
* <p>When this function is called, value set by
* {@link ImageCapture.Builder#setTargetResolution(Size)} will be updated automatically to make
@@ -843,9 +844,12 @@
* @param degrees Desired rotation degree of the output image.
* @see #setTargetRotation(int)
* @see #getTargetRotation()
+ * @deprecated Use {@link UseCase#snapToSurfaceRotation(int)} and
+ * {@link #setTargetRotation(int)} to convert and set the rotation.
*/
+ @Deprecated // TODO(b/277999375): Remove API setTargetRotationDegrees.
public void setTargetRotationDegrees(int degrees) {
- setTargetRotation(orientationDegreesToSurfaceRotation(degrees));
+ setTargetRotation(snapToSurfaceRotation(within360(degrees)));
}
/**
@@ -2790,7 +2794,7 @@
* Rotation values are relative to the "natural" rotation, {@link Surface#ROTATION_0}.
*
* <p>In general, it is best to additionally set the target rotation dynamically on the use
- * case. See {@link androidx.camera.core.ImageCapture#setTargetRotationDegrees(int)} for
+ * case. See {@link androidx.camera.core.ImageCapture#setTargetRotation(int)} for
* additional documentation.
*
* <p>If not set, the target rotation will default to the value of
@@ -2800,7 +2804,6 @@
* @param rotation The rotation of the intended target.
* @return The current Builder.
* @see androidx.camera.core.ImageCapture#setTargetRotation(int)
- * @see androidx.camera.core.ImageCapture#setTargetRotationDegrees(int)
* @see android.view.OrientationEventListener
*/
@NonNull
diff --git a/camera/camera-core/src/main/java/androidx/camera/core/UseCase.java b/camera/camera-core/src/main/java/androidx/camera/core/UseCase.java
index adcb322..0136410 100644
--- a/camera/camera-core/src/main/java/androidx/camera/core/UseCase.java
+++ b/camera/camera-core/src/main/java/androidx/camera/core/UseCase.java
@@ -26,6 +26,7 @@
import static androidx.camera.core.impl.utils.TransformUtils.within360;
import static androidx.camera.core.processing.TargetUtils.isSuperset;
import static androidx.core.util.Preconditions.checkArgument;
+import static androidx.core.util.Preconditions.checkArgumentInRange;
import android.annotation.SuppressLint;
import android.graphics.Matrix;
@@ -33,6 +34,7 @@
import android.media.ImageReader;
import android.util.Range;
import android.util.Size;
+import android.view.OrientationEventListener;
import android.view.Surface;
import androidx.annotation.CallSuper;
@@ -292,17 +294,64 @@
}
/**
- * Converts orientation degrees to {@link Surface} rotation.
+ * A utility function that can convert the orientation degrees of
+ * {@link OrientationEventListener} to the nearest {@link Surface} rotation.
+ *
+ * <p>In general, it is best to use an {@link android.view.OrientationEventListener} to set
+ * the UseCase target rotation. This way, the rotation output will indicate which way is down
+ * for a given image or video. This is important since display orientation may be locked by
+ * device default, user setting, or app configuration, and some devices may not transition to a
+ * reverse-portrait display orientation. In these cases, set target rotation dynamically
+ * according to the {@link android.view.OrientationEventListener}, without re-creating the
+ * use case. The sample code is as below:
+ * <pre>{@code
+ * public class CameraXActivity extends AppCompatActivity {
+ *
+ * private OrientationEventListener mOrientationEventListener;
+ *
+ * @Override
+ * protected void onStart() {
+ * super.onStart();
+ * if (mOrientationEventListener == null) {
+ * mOrientationEventListener = new OrientationEventListener(this) {
+ * @Override
+ * public void onOrientationChanged(int orientation) {
+ * if (orientation == OrientationEventListener.ORIENTATION_UNKNOWN) {
+ * return;
+ * }
+ * int rotation = UseCase.snapToSurfaceRotation(orientation);
+ * mImageCapture.setTargetRotation(rotation);
+ * mImageAnalysis.setTargetRotation(rotation);
+ * mVideoCapture.setTargetRotation(rotation);
+ * }
+ * };
+ * }
+ * mOrientationEventListener.enable();
+ * }
+ *
+ * @Override
+ * protected void onStop() {
+ * super.onStop();
+ * mOrientationEventListener.disable();
+ * }
+ * }
+ * }</pre>
+ *
+ * @param orientation the orientation degrees in range [0, 359].
+ * @return surface rotation. One of {@link Surface#ROTATION_0}, {@link Surface#ROTATION_90},
+ * {@link Surface#ROTATION_180} and {@link Surface#ROTATION_270}.
+ * @throws IllegalArgumentException if the input orientation degrees is not in range [0, 359].
+ * @see ImageCapture#setTargetRotation(int)
+ * @see ImageAnalysis#setTargetRotation(int)
*/
- @RestrictTo(Scope.LIBRARY_GROUP)
@ImageOutputConfig.RotationValue
- protected static int orientationDegreesToSurfaceRotation(int degrees) {
- int degreesWithin360 = within360(degrees);
- if (degreesWithin360 >= 315 || degreesWithin360 < 45) {
+ public static int snapToSurfaceRotation(@IntRange(from = 0, to = 359) int orientation) {
+ checkArgumentInRange(orientation, 0, 359, "orientation");
+ if (orientation >= 315 || orientation < 45) {
return Surface.ROTATION_0;
- } else if (degreesWithin360 >= 225) {
+ } else if (orientation >= 225) {
return Surface.ROTATION_90;
- } else if (degreesWithin360 >= 135) {
+ } else if (orientation >= 135) {
return Surface.ROTATION_180;
} else {
return Surface.ROTATION_270;
diff --git a/camera/camera-core/src/test/java/androidx/camera/core/ImageAnalysisTest.java b/camera/camera-core/src/test/java/androidx/camera/core/ImageAnalysisTest.java
index 682887e..3195cae 100644
--- a/camera/camera-core/src/test/java/androidx/camera/core/ImageAnalysisTest.java
+++ b/camera/camera-core/src/test/java/androidx/camera/core/ImageAnalysisTest.java
@@ -163,23 +163,6 @@
}
@Test
- public void setTargetRotationDegrees() {
- ImageAnalysis imageAnalysis = new ImageAnalysis.Builder().build();
- imageAnalysis.setTargetRotationDegrees(45);
- assertThat(imageAnalysis.getTargetRotation()).isEqualTo(Surface.ROTATION_270);
- imageAnalysis.setTargetRotationDegrees(135);
- assertThat(imageAnalysis.getTargetRotation()).isEqualTo(Surface.ROTATION_180);
- imageAnalysis.setTargetRotationDegrees(225);
- assertThat(imageAnalysis.getTargetRotation()).isEqualTo(Surface.ROTATION_90);
- imageAnalysis.setTargetRotationDegrees(315);
- assertThat(imageAnalysis.getTargetRotation()).isEqualTo(Surface.ROTATION_0);
- imageAnalysis.setTargetRotationDegrees(405);
- assertThat(imageAnalysis.getTargetRotation()).isEqualTo(Surface.ROTATION_270);
- imageAnalysis.setTargetRotationDegrees(-45);
- assertThat(imageAnalysis.getTargetRotation()).isEqualTo(Surface.ROTATION_0);
- }
-
- @Test
public void defaultMirrorModeIsOff() {
ImageAnalysis imageAnalysis = new ImageAnalysis.Builder().build();
assertThat(imageAnalysis.getMirrorModeInternal()).isEqualTo(MIRROR_MODE_OFF);
diff --git a/camera/camera-core/src/test/java/androidx/camera/core/ImageCaptureTest.kt b/camera/camera-core/src/test/java/androidx/camera/core/ImageCaptureTest.kt
index 75b44d2..8d8aa3e 100644
--- a/camera/camera-core/src/test/java/androidx/camera/core/ImageCaptureTest.kt
+++ b/camera/camera-core/src/test/java/androidx/camera/core/ImageCaptureTest.kt
@@ -33,8 +33,8 @@
import androidx.camera.core.ImageCapture.ImageCaptureRequest
import androidx.camera.core.ImageCapture.ImageCaptureRequestProcessor
import androidx.camera.core.ImageCapture.ImageCaptureRequestProcessor.ImageCaptor
-import androidx.camera.core.MirrorMode.MIRROR_MODE_ON_FRONT_ONLY
import androidx.camera.core.MirrorMode.MIRROR_MODE_OFF
+import androidx.camera.core.MirrorMode.MIRROR_MODE_ON_FRONT_ONLY
import androidx.camera.core.impl.CameraConfig
import androidx.camera.core.impl.CameraFactory
import androidx.camera.core.impl.CaptureConfig
@@ -183,23 +183,6 @@
}
@Test
- fun setTargetRotationDegrees() {
- val imageCapture = ImageCapture.Builder().build()
- imageCapture.setTargetRotationDegrees(45)
- assertThat(imageCapture.targetRotation).isEqualTo(Surface.ROTATION_270)
- imageCapture.setTargetRotationDegrees(135)
- assertThat(imageCapture.targetRotation).isEqualTo(Surface.ROTATION_180)
- imageCapture.setTargetRotationDegrees(225)
- assertThat(imageCapture.targetRotation).isEqualTo(Surface.ROTATION_90)
- imageCapture.setTargetRotationDegrees(315)
- assertThat(imageCapture.targetRotation).isEqualTo(Surface.ROTATION_0)
- imageCapture.setTargetRotationDegrees(405)
- assertThat(imageCapture.targetRotation).isEqualTo(Surface.ROTATION_270)
- imageCapture.setTargetRotationDegrees(-45)
- assertThat(imageCapture.targetRotation).isEqualTo(Surface.ROTATION_0)
- }
-
- @Test
fun defaultMirrorModeIsOff() {
val imageCapture = ImageCapture.Builder().build()
assertThat(imageCapture.mirrorModeInternal).isEqualTo(MIRROR_MODE_OFF)
diff --git a/camera/camera-video/api/current.txt b/camera/camera-video/api/current.txt
index 7611bce..f1af41e 100644
--- a/camera/camera-video/api/current.txt
+++ b/camera/camera-video/api/current.txt
@@ -139,7 +139,7 @@
method public android.util.Range<java.lang.Integer!> getTargetFrameRate();
method public int getTargetRotation();
method public void setTargetRotation(int);
- method public void setTargetRotationDegrees(int);
+ method @Deprecated public void setTargetRotationDegrees(int);
method public static <T extends androidx.camera.video.VideoOutput> androidx.camera.video.VideoCapture<T!> withOutput(T);
}
diff --git a/camera/camera-video/api/public_plus_experimental_current.txt b/camera/camera-video/api/public_plus_experimental_current.txt
index 7611bce..f1af41e 100644
--- a/camera/camera-video/api/public_plus_experimental_current.txt
+++ b/camera/camera-video/api/public_plus_experimental_current.txt
@@ -139,7 +139,7 @@
method public android.util.Range<java.lang.Integer!> getTargetFrameRate();
method public int getTargetRotation();
method public void setTargetRotation(int);
- method public void setTargetRotationDegrees(int);
+ method @Deprecated public void setTargetRotationDegrees(int);
method public static <T extends androidx.camera.video.VideoOutput> androidx.camera.video.VideoCapture<T!> withOutput(T);
}
diff --git a/camera/camera-video/api/restricted_current.txt b/camera/camera-video/api/restricted_current.txt
index 7611bce..f1af41e 100644
--- a/camera/camera-video/api/restricted_current.txt
+++ b/camera/camera-video/api/restricted_current.txt
@@ -139,7 +139,7 @@
method public android.util.Range<java.lang.Integer!> getTargetFrameRate();
method public int getTargetRotation();
method public void setTargetRotation(int);
- method public void setTargetRotationDegrees(int);
+ method @Deprecated public void setTargetRotationDegrees(int);
method public static <T extends androidx.camera.video.VideoOutput> androidx.camera.video.VideoCapture<T!> withOutput(T);
}
diff --git a/camera/camera-video/src/androidTest/java/androidx/camera/video/VideoCaptureDeviceTest.kt b/camera/camera-video/src/androidTest/java/androidx/camera/video/VideoCaptureDeviceTest.kt
index 7a13541..892b739 100644
--- a/camera/camera-video/src/androidTest/java/androidx/camera/video/VideoCaptureDeviceTest.kt
+++ b/camera/camera-video/src/androidTest/java/androidx/camera/video/VideoCaptureDeviceTest.kt
@@ -222,6 +222,8 @@
@Test
fun addUseCases_setSupportedQuality_getCorrectResolution() = runBlocking {
+ assumeExtraCroppingQuirk(implName)
+
val videoCapabilities = createFakeVideoCapabilities(supportedResolutionMap)
assumeTrue(videoCapabilities.getSupportedQualities(dynamicRange).isNotEmpty())
// Cuttlefish API 29 has inconsistent resolution issue. See b/184015059.
diff --git a/camera/camera-video/src/androidTest/java/androidx/camera/video/VideoRecordingTest.kt b/camera/camera-video/src/androidTest/java/androidx/camera/video/VideoRecordingTest.kt
index ef0d4dc..2a79dbd 100644
--- a/camera/camera-video/src/androidTest/java/androidx/camera/video/VideoRecordingTest.kt
+++ b/camera/camera-video/src/androidTest/java/androidx/camera/video/VideoRecordingTest.kt
@@ -32,6 +32,7 @@
import android.util.Rational
import android.util.Size
import android.view.Surface
+import androidx.annotation.RequiresApi
import androidx.camera.camera2.Camera2Config
import androidx.camera.camera2.pipe.integration.CameraPipeConfig
import androidx.camera.core.AspectRatio
@@ -1063,13 +1064,7 @@
}
private fun assumeExtraCroppingQuirk() {
- val msg =
- "Devices in ExtraCroppingQuirk will get a fixed resolution regardless of any settings"
- if (implName.contains(CameraPipeConfig::class.simpleName!!)) {
- assumeTrue(msg, PipeDeviceQuirks[PipeExtraCroppingQuirk::class.java] == null)
- } else {
- assumeTrue(msg, Camera2DeviceQuirks.get(Camera2ExtraCroppingQuirk::class.java) == null)
- }
+ assumeExtraCroppingQuirk(implName)
}
private class ImageSavedCallback :
@@ -1162,4 +1157,15 @@
extractMetadata(MediaMetadataRetriever.METADATA_KEY_HAS_VIDEO) == "yes"
internal fun MediaMetadataRetriever.getDuration(): Long? =
- extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION)?.toLong()
\ No newline at end of file
+ extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION)?.toLong()
+
+@RequiresApi(21)
+fun assumeExtraCroppingQuirk(implName: String) {
+ val msg =
+ "Devices in ExtraCroppingQuirk will get a fixed resolution regardless of any settings"
+ if (implName.contains(CameraPipeConfig::class.simpleName!!)) {
+ assumeTrue(msg, PipeDeviceQuirks[PipeExtraCroppingQuirk::class.java] == null)
+ } else {
+ assumeTrue(msg, Camera2DeviceQuirks.get(Camera2ExtraCroppingQuirk::class.java) == null)
+ }
+}
\ No newline at end of file
diff --git a/camera/camera-video/src/main/java/androidx/camera/video/VideoCapture.java b/camera/camera-video/src/main/java/androidx/camera/video/VideoCapture.java
index 8d1e292..8c83205 100644
--- a/camera/camera-video/src/main/java/androidx/camera/video/VideoCapture.java
+++ b/camera/camera-video/src/main/java/androidx/camera/video/VideoCapture.java
@@ -38,6 +38,7 @@
import static androidx.camera.core.impl.UseCaseConfig.OPTION_ZSL_DISABLED;
import static androidx.camera.core.impl.utils.Threads.isMainThread;
import static androidx.camera.core.impl.utils.TransformUtils.rectToString;
+import static androidx.camera.core.impl.utils.TransformUtils.within360;
import static androidx.camera.core.internal.TargetConfig.OPTION_TARGET_CLASS;
import static androidx.camera.core.internal.TargetConfig.OPTION_TARGET_NAME;
import static androidx.camera.core.internal.ThreadConfig.OPTION_BACKGROUND_EXECUTOR;
@@ -247,13 +248,12 @@
*
* <p>The rotation can be set prior to constructing a VideoCapture using
* {@link VideoCapture.Builder#setTargetRotation(int)} or dynamically by calling
- * {@link VideoCapture#setTargetRotation(int)} or {@link #setTargetRotationDegrees(int)}.
+ * {@link VideoCapture#setTargetRotation(int)}.
* If not set, the target rotation defaults to the value of {@link Display#getRotation()} of
* the default display at the time the use case is bound.
*
* @return The rotation of the intended target.
* @see VideoCapture#setTargetRotation(int)
- * @see VideoCapture#setTargetRotationDegrees(int)
*/
@RotationValue
public int getTargetRotation() {
@@ -290,10 +290,11 @@
* the target rotation. This way, the rotation output will indicate which way is down for a
* given video. This is important since display orientation may be locked by device default,
* user setting, or app configuration, and some devices may not transition to a
- * reverse-portrait display orientation. In these cases, use
- * {@link #setTargetRotationDegrees} to set target rotation dynamically according to the
- * {@link android.view.OrientationEventListener}, without re-creating the use case.
- * See {@link #setTargetRotationDegrees} for more information.
+ * reverse-portrait display orientation. In these cases, set target rotation dynamically
+ * according to the {@link android.view.OrientationEventListener}, without re-creating the
+ * use case. {@link UseCase#snapToSurfaceRotation(int)} is a helper function to convert the
+ * orientation of the {@link android.view.OrientationEventListener} to a rotation value.
+ * See {@link UseCase#snapToSurfaceRotation(int)} for more information and sample code.
*
* <p>If not set, the target rotation will default to the value of
* {@link Display#getRotation()} of the default display at the time the use case is bound. To
@@ -385,9 +386,12 @@
* will choose a strategy according to the use case.
*
* @param degrees Desired rotation degree of the output video.
+ * @deprecated Use {@link UseCase#snapToSurfaceRotation(int)} and
+ * {@link #setTargetRotation(int)} to convert and set the rotation.
*/
+ @Deprecated // TODO(b/277999375): Remove API setTargetRotationDegrees.
public void setTargetRotationDegrees(int degrees) {
- setTargetRotation(orientationDegreesToSurfaceRotation(degrees));
+ setTargetRotation(snapToSurfaceRotation(within360(degrees)));
}
/**
@@ -1479,7 +1483,7 @@
* Rotation values are relative to the "natural" rotation, {@link Surface#ROTATION_0}.
*
* <p>In general, it is best to additionally set the target rotation dynamically on the
- * use case. See {@link VideoCapture#setTargetRotationDegrees(int)} for additional
+ * use case. See {@link VideoCapture#setTargetRotation(int)} for additional
* documentation.
*
* <p>If not set, the target rotation will default to the value of
@@ -1495,7 +1499,6 @@
* @param rotation The rotation of the intended target.
* @return The current Builder.
* @see VideoCapture#setTargetRotation(int)
- * @see VideoCapture#setTargetRotationDegrees(int)
* @see android.view.OrientationEventListener
*/
@NonNull
diff --git a/camera/camera-video/src/test/java/androidx/camera/video/VideoCaptureTest.kt b/camera/camera-video/src/test/java/androidx/camera/video/VideoCaptureTest.kt
index 7d1bb6d..93f2245 100644
--- a/camera/camera-video/src/test/java/androidx/camera/video/VideoCaptureTest.kt
+++ b/camera/camera-video/src/test/java/androidx/camera/video/VideoCaptureTest.kt
@@ -711,23 +711,6 @@
}
@Test
- fun setTargetRotationDegrees() {
- val videoCapture = createVideoCapture()
- videoCapture.setTargetRotationDegrees(45)
- assertThat(videoCapture.targetRotation).isEqualTo(Surface.ROTATION_270)
- videoCapture.setTargetRotationDegrees(135)
- assertThat(videoCapture.targetRotation).isEqualTo(Surface.ROTATION_180)
- videoCapture.setTargetRotationDegrees(225)
- assertThat(videoCapture.targetRotation).isEqualTo(Surface.ROTATION_90)
- videoCapture.setTargetRotationDegrees(315)
- assertThat(videoCapture.targetRotation).isEqualTo(Surface.ROTATION_0)
- videoCapture.setTargetRotationDegrees(405)
- assertThat(videoCapture.targetRotation).isEqualTo(Surface.ROTATION_270)
- videoCapture.setTargetRotationDegrees(-45)
- assertThat(videoCapture.targetRotation).isEqualTo(Surface.ROTATION_0)
- }
-
- @Test
fun hasSurfaceProcessingQuirk_nodeIsNeeded() {
// Arrange.
VideoCapture.sEnableSurfaceProcessingByQuirk = true
diff --git a/compose/ui/ui-text/api/current.ignore b/compose/ui/ui-text/api/current.ignore
index 7670599..bf842f8 100644
--- a/compose/ui/ui-text/api/current.ignore
+++ b/compose/ui/ui-text/api/current.ignore
@@ -1,4 +1,10 @@
// Baseline format: 1.0
+AddedAbstractMethod: androidx.compose.ui.text.Paragraph#paint(androidx.compose.ui.graphics.Canvas, androidx.compose.ui.graphics.Brush, float, androidx.compose.ui.graphics.Shadow, androidx.compose.ui.text.style.TextDecoration, androidx.compose.ui.graphics.drawscope.DrawStyle, int):
+ Added method androidx.compose.ui.text.Paragraph.paint(androidx.compose.ui.graphics.Canvas,androidx.compose.ui.graphics.Brush,float,androidx.compose.ui.graphics.Shadow,androidx.compose.ui.text.style.TextDecoration,androidx.compose.ui.graphics.drawscope.DrawStyle,int)
+AddedAbstractMethod: androidx.compose.ui.text.Paragraph#paint(androidx.compose.ui.graphics.Canvas, long, androidx.compose.ui.graphics.Shadow, androidx.compose.ui.text.style.TextDecoration, androidx.compose.ui.graphics.drawscope.DrawStyle, int):
+ Added method androidx.compose.ui.text.Paragraph.paint(androidx.compose.ui.graphics.Canvas,long,androidx.compose.ui.graphics.Shadow,androidx.compose.ui.text.style.TextDecoration,androidx.compose.ui.graphics.drawscope.DrawStyle,int)
+
+
ChangedType: androidx.compose.ui.text.AnnotatedString.Builder#append(char):
Method androidx.compose.ui.text.AnnotatedString.Builder.append has changed return type from androidx.compose.ui.text.AnnotatedString.Builder to void
diff --git a/compose/ui/ui-text/api/current.txt b/compose/ui/ui-text/api/current.txt
index f05e380..5851ea7 100644
--- a/compose/ui/ui-text/api/current.txt
+++ b/compose/ui/ui-text/api/current.txt
@@ -128,7 +128,9 @@
method public float getWidth();
method public long getWordBoundary(int offset);
method public boolean isLineEllipsized(int lineIndex);
- method public void paint(androidx.compose.ui.graphics.Canvas canvas, optional long color, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextDecoration? decoration);
+ method public void paint(androidx.compose.ui.graphics.Canvas canvas, optional long color, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextDecoration? decoration, optional androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle, optional int blendMode);
+ method public void paint(androidx.compose.ui.graphics.Canvas canvas, androidx.compose.ui.graphics.Brush brush, optional float alpha, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextDecoration? decoration, optional androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle, optional int blendMode);
+ method @Deprecated public void paint(androidx.compose.ui.graphics.Canvas canvas, optional long color, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextDecoration? decoration);
property public final boolean didExceedMaxLines;
property public final float firstBaseline;
property public final float height;
@@ -186,6 +188,8 @@
method public long getWordBoundary(int offset);
method public boolean isLineEllipsized(int lineIndex);
method public void paint(androidx.compose.ui.graphics.Canvas canvas, long color, androidx.compose.ui.graphics.Shadow? shadow, androidx.compose.ui.text.style.TextDecoration? textDecoration);
+ method public void paint(androidx.compose.ui.graphics.Canvas canvas, long color, androidx.compose.ui.graphics.Shadow? shadow, androidx.compose.ui.text.style.TextDecoration? textDecoration, androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle, int blendMode);
+ method public void paint(androidx.compose.ui.graphics.Canvas canvas, androidx.compose.ui.graphics.Brush brush, float alpha, androidx.compose.ui.graphics.Shadow? shadow, androidx.compose.ui.text.style.TextDecoration? textDecoration, androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle, int blendMode);
property public abstract boolean didExceedMaxLines;
property public abstract float firstBaseline;
property public abstract float height;
@@ -220,12 +224,14 @@
}
@androidx.compose.runtime.Immutable public final class ParagraphStyle {
- ctor public ParagraphStyle(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformParagraphStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak, optional androidx.compose.ui.text.style.Hyphens? hyphens);
+ ctor public ParagraphStyle(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformParagraphStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak, optional androidx.compose.ui.text.style.Hyphens? hyphens, optional androidx.compose.ui.text.style.TextMotion? textMotion);
ctor @Deprecated public ParagraphStyle(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent);
ctor @Deprecated public ParagraphStyle(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformParagraphStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle);
- method public androidx.compose.ui.text.ParagraphStyle copy(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformParagraphStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak, optional androidx.compose.ui.text.style.Hyphens? hyphens);
+ ctor @Deprecated public ParagraphStyle(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformParagraphStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak, optional androidx.compose.ui.text.style.Hyphens? hyphens);
+ method public androidx.compose.ui.text.ParagraphStyle copy(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformParagraphStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak, optional androidx.compose.ui.text.style.Hyphens? hyphens, optional androidx.compose.ui.text.style.TextMotion? textMotion);
method @Deprecated public androidx.compose.ui.text.ParagraphStyle copy(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent);
method @Deprecated public androidx.compose.ui.text.ParagraphStyle copy(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformParagraphStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle);
+ method @Deprecated public androidx.compose.ui.text.ParagraphStyle copy(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformParagraphStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak, optional androidx.compose.ui.text.style.Hyphens? hyphens);
method public androidx.compose.ui.text.style.Hyphens? getHyphens();
method public androidx.compose.ui.text.style.LineBreak? getLineBreak();
method public long getLineHeight();
@@ -234,6 +240,7 @@
method public androidx.compose.ui.text.style.TextAlign? getTextAlign();
method public androidx.compose.ui.text.style.TextDirection? getTextDirection();
method public androidx.compose.ui.text.style.TextIndent? getTextIndent();
+ method public androidx.compose.ui.text.style.TextMotion? getTextMotion();
method @androidx.compose.runtime.Stable public androidx.compose.ui.text.ParagraphStyle merge(optional androidx.compose.ui.text.ParagraphStyle? other);
method @androidx.compose.runtime.Stable public operator androidx.compose.ui.text.ParagraphStyle plus(androidx.compose.ui.text.ParagraphStyle other);
property public final androidx.compose.ui.text.style.Hyphens? hyphens;
@@ -244,6 +251,7 @@
property public final androidx.compose.ui.text.style.TextAlign? textAlign;
property public final androidx.compose.ui.text.style.TextDirection? textDirection;
property public final androidx.compose.ui.text.style.TextIndent? textIndent;
+ property public final androidx.compose.ui.text.style.TextMotion? textMotion;
}
public final class ParagraphStyleKt {
@@ -321,13 +329,20 @@
}
@androidx.compose.runtime.Immutable public final class SpanStyle {
- ctor public SpanStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow);
- ctor public SpanStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.PlatformSpanStyle? platformStyle);
- method public androidx.compose.ui.text.SpanStyle copy(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow);
- method public androidx.compose.ui.text.SpanStyle copy(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.PlatformSpanStyle? platformStyle);
+ ctor public SpanStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.PlatformSpanStyle? platformStyle, optional androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle);
+ ctor public SpanStyle(androidx.compose.ui.graphics.Brush? brush, optional float alpha, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.PlatformSpanStyle? platformStyle, optional androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle);
+ ctor @Deprecated public SpanStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow);
+ ctor @Deprecated public SpanStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.PlatformSpanStyle? platformStyle);
+ method public androidx.compose.ui.text.SpanStyle copy(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.PlatformSpanStyle? platformStyle, optional androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle);
+ method public androidx.compose.ui.text.SpanStyle copy(androidx.compose.ui.graphics.Brush? brush, optional float alpha, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.PlatformSpanStyle? platformStyle, optional androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle);
+ method @Deprecated public androidx.compose.ui.text.SpanStyle copy(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow);
+ method @Deprecated public androidx.compose.ui.text.SpanStyle copy(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.PlatformSpanStyle? platformStyle);
+ method public float getAlpha();
method public long getBackground();
method public androidx.compose.ui.text.style.BaselineShift? getBaselineShift();
+ method public androidx.compose.ui.graphics.Brush? getBrush();
method public long getColor();
+ method public androidx.compose.ui.graphics.drawscope.DrawStyle? getDrawStyle();
method public androidx.compose.ui.text.font.FontFamily? getFontFamily();
method public String? getFontFeatureSettings();
method public long getFontSize();
@@ -342,9 +357,12 @@
method public androidx.compose.ui.text.style.TextGeometricTransform? getTextGeometricTransform();
method @androidx.compose.runtime.Stable public androidx.compose.ui.text.SpanStyle merge(optional androidx.compose.ui.text.SpanStyle? other);
method @androidx.compose.runtime.Stable public operator androidx.compose.ui.text.SpanStyle plus(androidx.compose.ui.text.SpanStyle other);
+ property public final float alpha;
property public final long background;
property public final androidx.compose.ui.text.style.BaselineShift? baselineShift;
+ property public final androidx.compose.ui.graphics.Brush? brush;
property public final long color;
+ property public final androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle;
property public final androidx.compose.ui.text.font.FontFamily? fontFamily;
property public final String? fontFeatureSettings;
property public final long fontSize;
@@ -455,6 +473,13 @@
field public static final androidx.compose.ui.text.TextPainter INSTANCE;
}
+ public final class TextPainterKt {
+ method public static void drawText(androidx.compose.ui.graphics.drawscope.DrawScope, androidx.compose.ui.text.TextMeasurer textMeasurer, androidx.compose.ui.text.AnnotatedString text, optional long topLeft, optional androidx.compose.ui.text.TextStyle style, optional int overflow, optional boolean softWrap, optional int maxLines, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, optional long size, optional int blendMode);
+ method public static void drawText(androidx.compose.ui.graphics.drawscope.DrawScope, androidx.compose.ui.text.TextMeasurer textMeasurer, String text, optional long topLeft, optional androidx.compose.ui.text.TextStyle style, optional int overflow, optional boolean softWrap, optional int maxLines, optional long size, optional int blendMode);
+ method public static void drawText(androidx.compose.ui.graphics.drawscope.DrawScope, androidx.compose.ui.text.TextLayoutResult textLayoutResult, optional long color, optional long topLeft, optional float alpha, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle, optional int blendMode);
+ method public static void drawText(androidx.compose.ui.graphics.drawscope.DrawScope, androidx.compose.ui.text.TextLayoutResult textLayoutResult, androidx.compose.ui.graphics.Brush brush, optional long topLeft, optional float alpha, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle, optional int blendMode);
+ }
+
@androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class TextRange {
method public operator boolean contains(long other);
method public operator boolean contains(int offset);
@@ -489,15 +514,22 @@
}
@androidx.compose.runtime.Immutable public final class TextStyle {
- ctor public TextStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak, optional androidx.compose.ui.text.style.Hyphens? hyphens);
+ ctor public TextStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak, optional androidx.compose.ui.text.style.Hyphens? hyphens, optional androidx.compose.ui.text.style.TextMotion? textMotion);
+ ctor public TextStyle(androidx.compose.ui.graphics.Brush? brush, optional float alpha, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak, optional androidx.compose.ui.text.style.Hyphens? hyphens, optional androidx.compose.ui.text.style.TextMotion? textMotion);
ctor @Deprecated public TextStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent);
ctor @Deprecated public TextStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle);
- method public androidx.compose.ui.text.TextStyle copy(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak, optional androidx.compose.ui.text.style.Hyphens? hyphens);
+ ctor @Deprecated public TextStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak, optional androidx.compose.ui.text.style.Hyphens? hyphens);
+ method public androidx.compose.ui.text.TextStyle copy(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak, optional androidx.compose.ui.text.style.Hyphens? hyphens, optional androidx.compose.ui.text.style.TextMotion? textMotion);
+ method public androidx.compose.ui.text.TextStyle copy(androidx.compose.ui.graphics.Brush? brush, optional float alpha, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak, optional androidx.compose.ui.text.style.Hyphens? hyphens, optional androidx.compose.ui.text.style.TextMotion? textMotion);
method @Deprecated public androidx.compose.ui.text.TextStyle copy(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent);
method @Deprecated public androidx.compose.ui.text.TextStyle copy(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle);
+ method @Deprecated public androidx.compose.ui.text.TextStyle copy(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak, optional androidx.compose.ui.text.style.Hyphens? hyphens);
+ method public float getAlpha();
method public long getBackground();
method public androidx.compose.ui.text.style.BaselineShift? getBaselineShift();
+ method public androidx.compose.ui.graphics.Brush? getBrush();
method public long getColor();
+ method public androidx.compose.ui.graphics.drawscope.DrawStyle? getDrawStyle();
method public androidx.compose.ui.text.font.FontFamily? getFontFamily();
method public String? getFontFeatureSettings();
method public long getFontSize();
@@ -517,6 +549,7 @@
method public androidx.compose.ui.text.style.TextDirection? getTextDirection();
method public androidx.compose.ui.text.style.TextGeometricTransform? getTextGeometricTransform();
method public androidx.compose.ui.text.style.TextIndent? getTextIndent();
+ method public androidx.compose.ui.text.style.TextMotion? getTextMotion();
method public boolean hasSameLayoutAffectingAttributes(androidx.compose.ui.text.TextStyle other);
method @androidx.compose.runtime.Stable public androidx.compose.ui.text.TextStyle merge(optional androidx.compose.ui.text.TextStyle? other);
method @androidx.compose.runtime.Stable public androidx.compose.ui.text.TextStyle merge(androidx.compose.ui.text.SpanStyle other);
@@ -526,9 +559,12 @@
method @androidx.compose.runtime.Stable public operator androidx.compose.ui.text.TextStyle plus(androidx.compose.ui.text.SpanStyle other);
method @androidx.compose.runtime.Stable public androidx.compose.ui.text.ParagraphStyle toParagraphStyle();
method @androidx.compose.runtime.Stable public androidx.compose.ui.text.SpanStyle toSpanStyle();
+ property public final float alpha;
property public final long background;
property public final androidx.compose.ui.text.style.BaselineShift? baselineShift;
+ property public final androidx.compose.ui.graphics.Brush? brush;
property public final long color;
+ property public final androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle;
property public final androidx.compose.ui.text.font.FontFamily? fontFamily;
property public final String? fontFeatureSettings;
property public final long fontSize;
@@ -548,6 +584,7 @@
property public final androidx.compose.ui.text.style.TextDirection? textDirection;
property public final androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform;
property public final androidx.compose.ui.text.style.TextIndent? textIndent;
+ property public final androidx.compose.ui.text.style.TextMotion? textMotion;
field public static final androidx.compose.ui.text.TextStyle.Companion Companion;
}
@@ -1423,6 +1460,17 @@
method public static androidx.compose.ui.text.style.TextIndent lerp(androidx.compose.ui.text.style.TextIndent start, androidx.compose.ui.text.style.TextIndent stop, float fraction);
}
+ @androidx.compose.runtime.Immutable public final class TextMotion {
+ field public static final androidx.compose.ui.text.style.TextMotion.Companion Companion;
+ }
+
+ public static final class TextMotion.Companion {
+ method public androidx.compose.ui.text.style.TextMotion getAnimated();
+ method public androidx.compose.ui.text.style.TextMotion getStatic();
+ property public final androidx.compose.ui.text.style.TextMotion Animated;
+ property public final androidx.compose.ui.text.style.TextMotion Static;
+ }
+
@kotlin.jvm.JvmInline public final value class TextOverflow {
field public static final androidx.compose.ui.text.style.TextOverflow.Companion Companion;
}
diff --git a/compose/ui/ui-text/api/public_plus_experimental_current.txt b/compose/ui/ui-text/api/public_plus_experimental_current.txt
index c7477c0..d3a65c8 100644
--- a/compose/ui/ui-text/api/public_plus_experimental_current.txt
+++ b/compose/ui/ui-text/api/public_plus_experimental_current.txt
@@ -141,9 +141,9 @@
method public float getWidth();
method public long getWordBoundary(int offset);
method public boolean isLineEllipsized(int lineIndex);
- method public void paint(androidx.compose.ui.graphics.Canvas canvas, optional long color, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextDecoration? decoration);
- method @androidx.compose.ui.text.ExperimentalTextApi public void paint(androidx.compose.ui.graphics.Canvas canvas, optional long color, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextDecoration? decoration, optional androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle, optional int blendMode);
- method @androidx.compose.ui.text.ExperimentalTextApi public void paint(androidx.compose.ui.graphics.Canvas canvas, androidx.compose.ui.graphics.Brush brush, optional float alpha, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextDecoration? decoration, optional androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle, optional int blendMode);
+ method public void paint(androidx.compose.ui.graphics.Canvas canvas, optional long color, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextDecoration? decoration, optional androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle, optional int blendMode);
+ method public void paint(androidx.compose.ui.graphics.Canvas canvas, androidx.compose.ui.graphics.Brush brush, optional float alpha, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextDecoration? decoration, optional androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle, optional int blendMode);
+ method @Deprecated public void paint(androidx.compose.ui.graphics.Canvas canvas, optional long color, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextDecoration? decoration);
property public final boolean didExceedMaxLines;
property public final float firstBaseline;
property public final float height;
@@ -201,8 +201,8 @@
method public long getWordBoundary(int offset);
method public boolean isLineEllipsized(int lineIndex);
method public void paint(androidx.compose.ui.graphics.Canvas canvas, long color, androidx.compose.ui.graphics.Shadow? shadow, androidx.compose.ui.text.style.TextDecoration? textDecoration);
- method @androidx.compose.ui.text.ExperimentalTextApi public void paint(androidx.compose.ui.graphics.Canvas canvas, long color, androidx.compose.ui.graphics.Shadow? shadow, androidx.compose.ui.text.style.TextDecoration? textDecoration, androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle, int blendMode);
- method @androidx.compose.ui.text.ExperimentalTextApi public void paint(androidx.compose.ui.graphics.Canvas canvas, androidx.compose.ui.graphics.Brush brush, float alpha, androidx.compose.ui.graphics.Shadow? shadow, androidx.compose.ui.text.style.TextDecoration? textDecoration, androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle, int blendMode);
+ method public void paint(androidx.compose.ui.graphics.Canvas canvas, long color, androidx.compose.ui.graphics.Shadow? shadow, androidx.compose.ui.text.style.TextDecoration? textDecoration, androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle, int blendMode);
+ method public void paint(androidx.compose.ui.graphics.Canvas canvas, androidx.compose.ui.graphics.Brush brush, float alpha, androidx.compose.ui.graphics.Shadow? shadow, androidx.compose.ui.text.style.TextDecoration? textDecoration, androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle, int blendMode);
property public abstract boolean didExceedMaxLines;
property public abstract float firstBaseline;
property public abstract float height;
@@ -237,14 +237,14 @@
}
@androidx.compose.runtime.Immutable public final class ParagraphStyle {
- ctor @androidx.compose.ui.text.ExperimentalTextApi public ParagraphStyle(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformParagraphStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak, optional androidx.compose.ui.text.style.Hyphens? hyphens, optional androidx.compose.ui.text.style.TextMotion? textMotion);
- ctor public ParagraphStyle(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformParagraphStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak, optional androidx.compose.ui.text.style.Hyphens? hyphens);
+ ctor public ParagraphStyle(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformParagraphStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak, optional androidx.compose.ui.text.style.Hyphens? hyphens, optional androidx.compose.ui.text.style.TextMotion? textMotion);
ctor @Deprecated public ParagraphStyle(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent);
ctor @Deprecated public ParagraphStyle(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformParagraphStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle);
- method public androidx.compose.ui.text.ParagraphStyle copy(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformParagraphStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak, optional androidx.compose.ui.text.style.Hyphens? hyphens);
- method @androidx.compose.ui.text.ExperimentalTextApi public androidx.compose.ui.text.ParagraphStyle copy(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformParagraphStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak, optional androidx.compose.ui.text.style.Hyphens? hyphens, optional androidx.compose.ui.text.style.TextMotion? textMotion);
+ ctor @Deprecated public ParagraphStyle(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformParagraphStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak, optional androidx.compose.ui.text.style.Hyphens? hyphens);
+ method public androidx.compose.ui.text.ParagraphStyle copy(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformParagraphStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak, optional androidx.compose.ui.text.style.Hyphens? hyphens, optional androidx.compose.ui.text.style.TextMotion? textMotion);
method @Deprecated public androidx.compose.ui.text.ParagraphStyle copy(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent);
method @Deprecated public androidx.compose.ui.text.ParagraphStyle copy(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformParagraphStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle);
+ method @Deprecated public androidx.compose.ui.text.ParagraphStyle copy(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformParagraphStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak, optional androidx.compose.ui.text.style.Hyphens? hyphens);
method public androidx.compose.ui.text.style.Hyphens? getHyphens();
method public androidx.compose.ui.text.style.LineBreak? getLineBreak();
method public long getLineHeight();
@@ -253,7 +253,7 @@
method public androidx.compose.ui.text.style.TextAlign? getTextAlign();
method public androidx.compose.ui.text.style.TextDirection? getTextDirection();
method public androidx.compose.ui.text.style.TextIndent? getTextIndent();
- method @androidx.compose.ui.text.ExperimentalTextApi public androidx.compose.ui.text.style.TextMotion? getTextMotion();
+ method public androidx.compose.ui.text.style.TextMotion? getTextMotion();
method @androidx.compose.runtime.Stable public androidx.compose.ui.text.ParagraphStyle merge(optional androidx.compose.ui.text.ParagraphStyle? other);
method @androidx.compose.runtime.Stable public operator androidx.compose.ui.text.ParagraphStyle plus(androidx.compose.ui.text.ParagraphStyle other);
property public final androidx.compose.ui.text.style.Hyphens? hyphens;
@@ -264,7 +264,7 @@
property public final androidx.compose.ui.text.style.TextAlign? textAlign;
property public final androidx.compose.ui.text.style.TextDirection? textDirection;
property public final androidx.compose.ui.text.style.TextIndent? textIndent;
- property @androidx.compose.ui.text.ExperimentalTextApi public final androidx.compose.ui.text.style.TextMotion? textMotion;
+ property public final androidx.compose.ui.text.style.TextMotion? textMotion;
}
public final class ParagraphStyleKt {
@@ -342,20 +342,20 @@
}
@androidx.compose.runtime.Immutable public final class SpanStyle {
- ctor public SpanStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow);
- ctor public SpanStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.PlatformSpanStyle? platformStyle);
- ctor @androidx.compose.ui.text.ExperimentalTextApi public SpanStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.PlatformSpanStyle? platformStyle, optional androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle);
- ctor @androidx.compose.ui.text.ExperimentalTextApi public SpanStyle(androidx.compose.ui.graphics.Brush? brush, optional float alpha, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.PlatformSpanStyle? platformStyle, optional androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle);
- method public androidx.compose.ui.text.SpanStyle copy(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow);
- method public androidx.compose.ui.text.SpanStyle copy(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.PlatformSpanStyle? platformStyle);
- method @androidx.compose.ui.text.ExperimentalTextApi public androidx.compose.ui.text.SpanStyle copy(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.PlatformSpanStyle? platformStyle, optional androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle);
- method @androidx.compose.ui.text.ExperimentalTextApi public androidx.compose.ui.text.SpanStyle copy(androidx.compose.ui.graphics.Brush? brush, optional float alpha, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.PlatformSpanStyle? platformStyle, optional androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle);
- method @androidx.compose.ui.text.ExperimentalTextApi public float getAlpha();
+ ctor public SpanStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.PlatformSpanStyle? platformStyle, optional androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle);
+ ctor public SpanStyle(androidx.compose.ui.graphics.Brush? brush, optional float alpha, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.PlatformSpanStyle? platformStyle, optional androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle);
+ ctor @Deprecated public SpanStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow);
+ ctor @Deprecated public SpanStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.PlatformSpanStyle? platformStyle);
+ method public androidx.compose.ui.text.SpanStyle copy(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.PlatformSpanStyle? platformStyle, optional androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle);
+ method public androidx.compose.ui.text.SpanStyle copy(androidx.compose.ui.graphics.Brush? brush, optional float alpha, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.PlatformSpanStyle? platformStyle, optional androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle);
+ method @Deprecated public androidx.compose.ui.text.SpanStyle copy(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow);
+ method @Deprecated public androidx.compose.ui.text.SpanStyle copy(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.PlatformSpanStyle? platformStyle);
+ method public float getAlpha();
method public long getBackground();
method public androidx.compose.ui.text.style.BaselineShift? getBaselineShift();
- method @androidx.compose.ui.text.ExperimentalTextApi public androidx.compose.ui.graphics.Brush? getBrush();
+ method public androidx.compose.ui.graphics.Brush? getBrush();
method public long getColor();
- method @androidx.compose.ui.text.ExperimentalTextApi public androidx.compose.ui.graphics.drawscope.DrawStyle? getDrawStyle();
+ method public androidx.compose.ui.graphics.drawscope.DrawStyle? getDrawStyle();
method public androidx.compose.ui.text.font.FontFamily? getFontFamily();
method public String? getFontFeatureSettings();
method public long getFontSize();
@@ -370,12 +370,12 @@
method public androidx.compose.ui.text.style.TextGeometricTransform? getTextGeometricTransform();
method @androidx.compose.runtime.Stable public androidx.compose.ui.text.SpanStyle merge(optional androidx.compose.ui.text.SpanStyle? other);
method @androidx.compose.runtime.Stable public operator androidx.compose.ui.text.SpanStyle plus(androidx.compose.ui.text.SpanStyle other);
- property @androidx.compose.ui.text.ExperimentalTextApi public final float alpha;
+ property public final float alpha;
property public final long background;
property public final androidx.compose.ui.text.style.BaselineShift? baselineShift;
- property @androidx.compose.ui.text.ExperimentalTextApi public final androidx.compose.ui.graphics.Brush? brush;
+ property public final androidx.compose.ui.graphics.Brush? brush;
property public final long color;
- property @androidx.compose.ui.text.ExperimentalTextApi public final androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle;
+ property public final androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle;
property public final androidx.compose.ui.text.font.FontFamily? fontFamily;
property public final String? fontFeatureSettings;
property public final long fontSize;
@@ -487,10 +487,10 @@
}
public final class TextPainterKt {
- method @androidx.compose.ui.text.ExperimentalTextApi public static void drawText(androidx.compose.ui.graphics.drawscope.DrawScope, androidx.compose.ui.text.TextMeasurer textMeasurer, androidx.compose.ui.text.AnnotatedString text, optional long topLeft, optional androidx.compose.ui.text.TextStyle style, optional int overflow, optional boolean softWrap, optional int maxLines, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, optional long size, optional int blendMode);
- method @androidx.compose.ui.text.ExperimentalTextApi public static void drawText(androidx.compose.ui.graphics.drawscope.DrawScope, androidx.compose.ui.text.TextMeasurer textMeasurer, String text, optional long topLeft, optional androidx.compose.ui.text.TextStyle style, optional int overflow, optional boolean softWrap, optional int maxLines, optional long size, optional int blendMode);
- method @androidx.compose.ui.text.ExperimentalTextApi public static void drawText(androidx.compose.ui.graphics.drawscope.DrawScope, androidx.compose.ui.text.TextLayoutResult textLayoutResult, optional long color, optional long topLeft, optional float alpha, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle, optional int blendMode);
- method @androidx.compose.ui.text.ExperimentalTextApi public static void drawText(androidx.compose.ui.graphics.drawscope.DrawScope, androidx.compose.ui.text.TextLayoutResult textLayoutResult, androidx.compose.ui.graphics.Brush brush, optional long topLeft, optional float alpha, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle, optional int blendMode);
+ method public static void drawText(androidx.compose.ui.graphics.drawscope.DrawScope, androidx.compose.ui.text.TextMeasurer textMeasurer, androidx.compose.ui.text.AnnotatedString text, optional long topLeft, optional androidx.compose.ui.text.TextStyle style, optional int overflow, optional boolean softWrap, optional int maxLines, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, optional long size, optional int blendMode);
+ method public static void drawText(androidx.compose.ui.graphics.drawscope.DrawScope, androidx.compose.ui.text.TextMeasurer textMeasurer, String text, optional long topLeft, optional androidx.compose.ui.text.TextStyle style, optional int overflow, optional boolean softWrap, optional int maxLines, optional long size, optional int blendMode);
+ method public static void drawText(androidx.compose.ui.graphics.drawscope.DrawScope, androidx.compose.ui.text.TextLayoutResult textLayoutResult, optional long color, optional long topLeft, optional float alpha, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle, optional int blendMode);
+ method public static void drawText(androidx.compose.ui.graphics.drawscope.DrawScope, androidx.compose.ui.text.TextLayoutResult textLayoutResult, androidx.compose.ui.graphics.Brush brush, optional long topLeft, optional float alpha, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle, optional int blendMode);
}
@androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class TextRange {
@@ -527,22 +527,22 @@
}
@androidx.compose.runtime.Immutable public final class TextStyle {
- ctor public TextStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak, optional androidx.compose.ui.text.style.Hyphens? hyphens);
- ctor @androidx.compose.ui.text.ExperimentalTextApi public TextStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak, optional androidx.compose.ui.text.style.Hyphens? hyphens, optional androidx.compose.ui.text.style.TextMotion? textMotion);
- ctor @androidx.compose.ui.text.ExperimentalTextApi public TextStyle(androidx.compose.ui.graphics.Brush? brush, optional float alpha, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak, optional androidx.compose.ui.text.style.Hyphens? hyphens, optional androidx.compose.ui.text.style.TextMotion? textMotion);
+ ctor public TextStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak, optional androidx.compose.ui.text.style.Hyphens? hyphens, optional androidx.compose.ui.text.style.TextMotion? textMotion);
+ ctor public TextStyle(androidx.compose.ui.graphics.Brush? brush, optional float alpha, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak, optional androidx.compose.ui.text.style.Hyphens? hyphens, optional androidx.compose.ui.text.style.TextMotion? textMotion);
ctor @Deprecated public TextStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent);
ctor @Deprecated public TextStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle);
- method public androidx.compose.ui.text.TextStyle copy(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak, optional androidx.compose.ui.text.style.Hyphens? hyphens);
- method @androidx.compose.ui.text.ExperimentalTextApi public androidx.compose.ui.text.TextStyle copy(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak, optional androidx.compose.ui.text.style.Hyphens? hyphens, optional androidx.compose.ui.text.style.TextMotion? textMotion);
- method @androidx.compose.ui.text.ExperimentalTextApi public androidx.compose.ui.text.TextStyle copy(androidx.compose.ui.graphics.Brush? brush, optional float alpha, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak, optional androidx.compose.ui.text.style.Hyphens? hyphens, optional androidx.compose.ui.text.style.TextMotion? textMotion);
+ ctor @Deprecated public TextStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak, optional androidx.compose.ui.text.style.Hyphens? hyphens);
+ method public androidx.compose.ui.text.TextStyle copy(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak, optional androidx.compose.ui.text.style.Hyphens? hyphens, optional androidx.compose.ui.text.style.TextMotion? textMotion);
+ method public androidx.compose.ui.text.TextStyle copy(androidx.compose.ui.graphics.Brush? brush, optional float alpha, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak, optional androidx.compose.ui.text.style.Hyphens? hyphens, optional androidx.compose.ui.text.style.TextMotion? textMotion);
method @Deprecated public androidx.compose.ui.text.TextStyle copy(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent);
method @Deprecated public androidx.compose.ui.text.TextStyle copy(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle);
- method @androidx.compose.ui.text.ExperimentalTextApi public float getAlpha();
+ method @Deprecated public androidx.compose.ui.text.TextStyle copy(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak, optional androidx.compose.ui.text.style.Hyphens? hyphens);
+ method public float getAlpha();
method public long getBackground();
method public androidx.compose.ui.text.style.BaselineShift? getBaselineShift();
- method @androidx.compose.ui.text.ExperimentalTextApi public androidx.compose.ui.graphics.Brush? getBrush();
+ method public androidx.compose.ui.graphics.Brush? getBrush();
method public long getColor();
- method @androidx.compose.ui.text.ExperimentalTextApi public androidx.compose.ui.graphics.drawscope.DrawStyle? getDrawStyle();
+ method public androidx.compose.ui.graphics.drawscope.DrawStyle? getDrawStyle();
method public androidx.compose.ui.text.font.FontFamily? getFontFamily();
method public String? getFontFeatureSettings();
method public long getFontSize();
@@ -562,7 +562,7 @@
method public androidx.compose.ui.text.style.TextDirection? getTextDirection();
method public androidx.compose.ui.text.style.TextGeometricTransform? getTextGeometricTransform();
method public androidx.compose.ui.text.style.TextIndent? getTextIndent();
- method @androidx.compose.ui.text.ExperimentalTextApi public androidx.compose.ui.text.style.TextMotion? getTextMotion();
+ method public androidx.compose.ui.text.style.TextMotion? getTextMotion();
method public boolean hasSameLayoutAffectingAttributes(androidx.compose.ui.text.TextStyle other);
method @androidx.compose.runtime.Stable public androidx.compose.ui.text.TextStyle merge(optional androidx.compose.ui.text.TextStyle? other);
method @androidx.compose.runtime.Stable public androidx.compose.ui.text.TextStyle merge(androidx.compose.ui.text.SpanStyle other);
@@ -572,12 +572,12 @@
method @androidx.compose.runtime.Stable public operator androidx.compose.ui.text.TextStyle plus(androidx.compose.ui.text.SpanStyle other);
method @androidx.compose.runtime.Stable public androidx.compose.ui.text.ParagraphStyle toParagraphStyle();
method @androidx.compose.runtime.Stable public androidx.compose.ui.text.SpanStyle toSpanStyle();
- property @androidx.compose.ui.text.ExperimentalTextApi public final float alpha;
+ property public final float alpha;
property public final long background;
property public final androidx.compose.ui.text.style.BaselineShift? baselineShift;
- property @androidx.compose.ui.text.ExperimentalTextApi public final androidx.compose.ui.graphics.Brush? brush;
+ property public final androidx.compose.ui.graphics.Brush? brush;
property public final long color;
- property @androidx.compose.ui.text.ExperimentalTextApi public final androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle;
+ property public final androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle;
property public final androidx.compose.ui.text.font.FontFamily? fontFamily;
property public final String? fontFeatureSettings;
property public final long fontSize;
@@ -597,7 +597,7 @@
property public final androidx.compose.ui.text.style.TextDirection? textDirection;
property public final androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform;
property public final androidx.compose.ui.text.style.TextIndent? textIndent;
- property @androidx.compose.ui.text.ExperimentalTextApi public final androidx.compose.ui.text.style.TextMotion? textMotion;
+ property public final androidx.compose.ui.text.style.TextMotion? textMotion;
field public static final androidx.compose.ui.text.TextStyle.Companion Companion;
}
@@ -1515,7 +1515,7 @@
method public static androidx.compose.ui.text.style.TextIndent lerp(androidx.compose.ui.text.style.TextIndent start, androidx.compose.ui.text.style.TextIndent stop, float fraction);
}
- @androidx.compose.runtime.Immutable @androidx.compose.ui.text.ExperimentalTextApi public final class TextMotion {
+ @androidx.compose.runtime.Immutable public final class TextMotion {
field public static final androidx.compose.ui.text.style.TextMotion.Companion Companion;
}
diff --git a/compose/ui/ui-text/api/restricted_current.ignore b/compose/ui/ui-text/api/restricted_current.ignore
index 7670599..bf842f8 100644
--- a/compose/ui/ui-text/api/restricted_current.ignore
+++ b/compose/ui/ui-text/api/restricted_current.ignore
@@ -1,4 +1,10 @@
// Baseline format: 1.0
+AddedAbstractMethod: androidx.compose.ui.text.Paragraph#paint(androidx.compose.ui.graphics.Canvas, androidx.compose.ui.graphics.Brush, float, androidx.compose.ui.graphics.Shadow, androidx.compose.ui.text.style.TextDecoration, androidx.compose.ui.graphics.drawscope.DrawStyle, int):
+ Added method androidx.compose.ui.text.Paragraph.paint(androidx.compose.ui.graphics.Canvas,androidx.compose.ui.graphics.Brush,float,androidx.compose.ui.graphics.Shadow,androidx.compose.ui.text.style.TextDecoration,androidx.compose.ui.graphics.drawscope.DrawStyle,int)
+AddedAbstractMethod: androidx.compose.ui.text.Paragraph#paint(androidx.compose.ui.graphics.Canvas, long, androidx.compose.ui.graphics.Shadow, androidx.compose.ui.text.style.TextDecoration, androidx.compose.ui.graphics.drawscope.DrawStyle, int):
+ Added method androidx.compose.ui.text.Paragraph.paint(androidx.compose.ui.graphics.Canvas,long,androidx.compose.ui.graphics.Shadow,androidx.compose.ui.text.style.TextDecoration,androidx.compose.ui.graphics.drawscope.DrawStyle,int)
+
+
ChangedType: androidx.compose.ui.text.AnnotatedString.Builder#append(char):
Method androidx.compose.ui.text.AnnotatedString.Builder.append has changed return type from androidx.compose.ui.text.AnnotatedString.Builder to void
diff --git a/compose/ui/ui-text/api/restricted_current.txt b/compose/ui/ui-text/api/restricted_current.txt
index f05e380..5851ea7 100644
--- a/compose/ui/ui-text/api/restricted_current.txt
+++ b/compose/ui/ui-text/api/restricted_current.txt
@@ -128,7 +128,9 @@
method public float getWidth();
method public long getWordBoundary(int offset);
method public boolean isLineEllipsized(int lineIndex);
- method public void paint(androidx.compose.ui.graphics.Canvas canvas, optional long color, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextDecoration? decoration);
+ method public void paint(androidx.compose.ui.graphics.Canvas canvas, optional long color, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextDecoration? decoration, optional androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle, optional int blendMode);
+ method public void paint(androidx.compose.ui.graphics.Canvas canvas, androidx.compose.ui.graphics.Brush brush, optional float alpha, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextDecoration? decoration, optional androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle, optional int blendMode);
+ method @Deprecated public void paint(androidx.compose.ui.graphics.Canvas canvas, optional long color, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextDecoration? decoration);
property public final boolean didExceedMaxLines;
property public final float firstBaseline;
property public final float height;
@@ -186,6 +188,8 @@
method public long getWordBoundary(int offset);
method public boolean isLineEllipsized(int lineIndex);
method public void paint(androidx.compose.ui.graphics.Canvas canvas, long color, androidx.compose.ui.graphics.Shadow? shadow, androidx.compose.ui.text.style.TextDecoration? textDecoration);
+ method public void paint(androidx.compose.ui.graphics.Canvas canvas, long color, androidx.compose.ui.graphics.Shadow? shadow, androidx.compose.ui.text.style.TextDecoration? textDecoration, androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle, int blendMode);
+ method public void paint(androidx.compose.ui.graphics.Canvas canvas, androidx.compose.ui.graphics.Brush brush, float alpha, androidx.compose.ui.graphics.Shadow? shadow, androidx.compose.ui.text.style.TextDecoration? textDecoration, androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle, int blendMode);
property public abstract boolean didExceedMaxLines;
property public abstract float firstBaseline;
property public abstract float height;
@@ -220,12 +224,14 @@
}
@androidx.compose.runtime.Immutable public final class ParagraphStyle {
- ctor public ParagraphStyle(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformParagraphStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak, optional androidx.compose.ui.text.style.Hyphens? hyphens);
+ ctor public ParagraphStyle(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformParagraphStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak, optional androidx.compose.ui.text.style.Hyphens? hyphens, optional androidx.compose.ui.text.style.TextMotion? textMotion);
ctor @Deprecated public ParagraphStyle(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent);
ctor @Deprecated public ParagraphStyle(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformParagraphStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle);
- method public androidx.compose.ui.text.ParagraphStyle copy(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformParagraphStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak, optional androidx.compose.ui.text.style.Hyphens? hyphens);
+ ctor @Deprecated public ParagraphStyle(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformParagraphStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak, optional androidx.compose.ui.text.style.Hyphens? hyphens);
+ method public androidx.compose.ui.text.ParagraphStyle copy(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformParagraphStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak, optional androidx.compose.ui.text.style.Hyphens? hyphens, optional androidx.compose.ui.text.style.TextMotion? textMotion);
method @Deprecated public androidx.compose.ui.text.ParagraphStyle copy(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent);
method @Deprecated public androidx.compose.ui.text.ParagraphStyle copy(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformParagraphStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle);
+ method @Deprecated public androidx.compose.ui.text.ParagraphStyle copy(optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformParagraphStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak, optional androidx.compose.ui.text.style.Hyphens? hyphens);
method public androidx.compose.ui.text.style.Hyphens? getHyphens();
method public androidx.compose.ui.text.style.LineBreak? getLineBreak();
method public long getLineHeight();
@@ -234,6 +240,7 @@
method public androidx.compose.ui.text.style.TextAlign? getTextAlign();
method public androidx.compose.ui.text.style.TextDirection? getTextDirection();
method public androidx.compose.ui.text.style.TextIndent? getTextIndent();
+ method public androidx.compose.ui.text.style.TextMotion? getTextMotion();
method @androidx.compose.runtime.Stable public androidx.compose.ui.text.ParagraphStyle merge(optional androidx.compose.ui.text.ParagraphStyle? other);
method @androidx.compose.runtime.Stable public operator androidx.compose.ui.text.ParagraphStyle plus(androidx.compose.ui.text.ParagraphStyle other);
property public final androidx.compose.ui.text.style.Hyphens? hyphens;
@@ -244,6 +251,7 @@
property public final androidx.compose.ui.text.style.TextAlign? textAlign;
property public final androidx.compose.ui.text.style.TextDirection? textDirection;
property public final androidx.compose.ui.text.style.TextIndent? textIndent;
+ property public final androidx.compose.ui.text.style.TextMotion? textMotion;
}
public final class ParagraphStyleKt {
@@ -321,13 +329,20 @@
}
@androidx.compose.runtime.Immutable public final class SpanStyle {
- ctor public SpanStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow);
- ctor public SpanStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.PlatformSpanStyle? platformStyle);
- method public androidx.compose.ui.text.SpanStyle copy(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow);
- method public androidx.compose.ui.text.SpanStyle copy(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.PlatformSpanStyle? platformStyle);
+ ctor public SpanStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.PlatformSpanStyle? platformStyle, optional androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle);
+ ctor public SpanStyle(androidx.compose.ui.graphics.Brush? brush, optional float alpha, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.PlatformSpanStyle? platformStyle, optional androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle);
+ ctor @Deprecated public SpanStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow);
+ ctor @Deprecated public SpanStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.PlatformSpanStyle? platformStyle);
+ method public androidx.compose.ui.text.SpanStyle copy(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.PlatformSpanStyle? platformStyle, optional androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle);
+ method public androidx.compose.ui.text.SpanStyle copy(androidx.compose.ui.graphics.Brush? brush, optional float alpha, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.PlatformSpanStyle? platformStyle, optional androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle);
+ method @Deprecated public androidx.compose.ui.text.SpanStyle copy(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow);
+ method @Deprecated public androidx.compose.ui.text.SpanStyle copy(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.PlatformSpanStyle? platformStyle);
+ method public float getAlpha();
method public long getBackground();
method public androidx.compose.ui.text.style.BaselineShift? getBaselineShift();
+ method public androidx.compose.ui.graphics.Brush? getBrush();
method public long getColor();
+ method public androidx.compose.ui.graphics.drawscope.DrawStyle? getDrawStyle();
method public androidx.compose.ui.text.font.FontFamily? getFontFamily();
method public String? getFontFeatureSettings();
method public long getFontSize();
@@ -342,9 +357,12 @@
method public androidx.compose.ui.text.style.TextGeometricTransform? getTextGeometricTransform();
method @androidx.compose.runtime.Stable public androidx.compose.ui.text.SpanStyle merge(optional androidx.compose.ui.text.SpanStyle? other);
method @androidx.compose.runtime.Stable public operator androidx.compose.ui.text.SpanStyle plus(androidx.compose.ui.text.SpanStyle other);
+ property public final float alpha;
property public final long background;
property public final androidx.compose.ui.text.style.BaselineShift? baselineShift;
+ property public final androidx.compose.ui.graphics.Brush? brush;
property public final long color;
+ property public final androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle;
property public final androidx.compose.ui.text.font.FontFamily? fontFamily;
property public final String? fontFeatureSettings;
property public final long fontSize;
@@ -455,6 +473,13 @@
field public static final androidx.compose.ui.text.TextPainter INSTANCE;
}
+ public final class TextPainterKt {
+ method public static void drawText(androidx.compose.ui.graphics.drawscope.DrawScope, androidx.compose.ui.text.TextMeasurer textMeasurer, androidx.compose.ui.text.AnnotatedString text, optional long topLeft, optional androidx.compose.ui.text.TextStyle style, optional int overflow, optional boolean softWrap, optional int maxLines, optional java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, optional long size, optional int blendMode);
+ method public static void drawText(androidx.compose.ui.graphics.drawscope.DrawScope, androidx.compose.ui.text.TextMeasurer textMeasurer, String text, optional long topLeft, optional androidx.compose.ui.text.TextStyle style, optional int overflow, optional boolean softWrap, optional int maxLines, optional long size, optional int blendMode);
+ method public static void drawText(androidx.compose.ui.graphics.drawscope.DrawScope, androidx.compose.ui.text.TextLayoutResult textLayoutResult, optional long color, optional long topLeft, optional float alpha, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle, optional int blendMode);
+ method public static void drawText(androidx.compose.ui.graphics.drawscope.DrawScope, androidx.compose.ui.text.TextLayoutResult textLayoutResult, androidx.compose.ui.graphics.Brush brush, optional long topLeft, optional float alpha, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle, optional int blendMode);
+ }
+
@androidx.compose.runtime.Immutable @kotlin.jvm.JvmInline public final value class TextRange {
method public operator boolean contains(long other);
method public operator boolean contains(int offset);
@@ -489,15 +514,22 @@
}
@androidx.compose.runtime.Immutable public final class TextStyle {
- ctor public TextStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak, optional androidx.compose.ui.text.style.Hyphens? hyphens);
+ ctor public TextStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak, optional androidx.compose.ui.text.style.Hyphens? hyphens, optional androidx.compose.ui.text.style.TextMotion? textMotion);
+ ctor public TextStyle(androidx.compose.ui.graphics.Brush? brush, optional float alpha, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak, optional androidx.compose.ui.text.style.Hyphens? hyphens, optional androidx.compose.ui.text.style.TextMotion? textMotion);
ctor @Deprecated public TextStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent);
ctor @Deprecated public TextStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle);
- method public androidx.compose.ui.text.TextStyle copy(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak, optional androidx.compose.ui.text.style.Hyphens? hyphens);
+ ctor @Deprecated public TextStyle(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak, optional androidx.compose.ui.text.style.Hyphens? hyphens);
+ method public androidx.compose.ui.text.TextStyle copy(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak, optional androidx.compose.ui.text.style.Hyphens? hyphens, optional androidx.compose.ui.text.style.TextMotion? textMotion);
+ method public androidx.compose.ui.text.TextStyle copy(androidx.compose.ui.graphics.Brush? brush, optional float alpha, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak, optional androidx.compose.ui.text.style.Hyphens? hyphens, optional androidx.compose.ui.text.style.TextMotion? textMotion);
method @Deprecated public androidx.compose.ui.text.TextStyle copy(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent);
method @Deprecated public androidx.compose.ui.text.TextStyle copy(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle);
+ method @Deprecated public androidx.compose.ui.text.TextStyle copy(optional long color, optional long fontSize, optional androidx.compose.ui.text.font.FontWeight? fontWeight, optional androidx.compose.ui.text.font.FontStyle? fontStyle, optional androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, optional androidx.compose.ui.text.font.FontFamily? fontFamily, optional String? fontFeatureSettings, optional long letterSpacing, optional androidx.compose.ui.text.style.BaselineShift? baselineShift, optional androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, optional androidx.compose.ui.text.intl.LocaleList? localeList, optional long background, optional androidx.compose.ui.text.style.TextDecoration? textDecoration, optional androidx.compose.ui.graphics.Shadow? shadow, optional androidx.compose.ui.text.style.TextAlign? textAlign, optional androidx.compose.ui.text.style.TextDirection? textDirection, optional long lineHeight, optional androidx.compose.ui.text.style.TextIndent? textIndent, optional androidx.compose.ui.text.PlatformTextStyle? platformStyle, optional androidx.compose.ui.text.style.LineHeightStyle? lineHeightStyle, optional androidx.compose.ui.text.style.LineBreak? lineBreak, optional androidx.compose.ui.text.style.Hyphens? hyphens);
+ method public float getAlpha();
method public long getBackground();
method public androidx.compose.ui.text.style.BaselineShift? getBaselineShift();
+ method public androidx.compose.ui.graphics.Brush? getBrush();
method public long getColor();
+ method public androidx.compose.ui.graphics.drawscope.DrawStyle? getDrawStyle();
method public androidx.compose.ui.text.font.FontFamily? getFontFamily();
method public String? getFontFeatureSettings();
method public long getFontSize();
@@ -517,6 +549,7 @@
method public androidx.compose.ui.text.style.TextDirection? getTextDirection();
method public androidx.compose.ui.text.style.TextGeometricTransform? getTextGeometricTransform();
method public androidx.compose.ui.text.style.TextIndent? getTextIndent();
+ method public androidx.compose.ui.text.style.TextMotion? getTextMotion();
method public boolean hasSameLayoutAffectingAttributes(androidx.compose.ui.text.TextStyle other);
method @androidx.compose.runtime.Stable public androidx.compose.ui.text.TextStyle merge(optional androidx.compose.ui.text.TextStyle? other);
method @androidx.compose.runtime.Stable public androidx.compose.ui.text.TextStyle merge(androidx.compose.ui.text.SpanStyle other);
@@ -526,9 +559,12 @@
method @androidx.compose.runtime.Stable public operator androidx.compose.ui.text.TextStyle plus(androidx.compose.ui.text.SpanStyle other);
method @androidx.compose.runtime.Stable public androidx.compose.ui.text.ParagraphStyle toParagraphStyle();
method @androidx.compose.runtime.Stable public androidx.compose.ui.text.SpanStyle toSpanStyle();
+ property public final float alpha;
property public final long background;
property public final androidx.compose.ui.text.style.BaselineShift? baselineShift;
+ property public final androidx.compose.ui.graphics.Brush? brush;
property public final long color;
+ property public final androidx.compose.ui.graphics.drawscope.DrawStyle? drawStyle;
property public final androidx.compose.ui.text.font.FontFamily? fontFamily;
property public final String? fontFeatureSettings;
property public final long fontSize;
@@ -548,6 +584,7 @@
property public final androidx.compose.ui.text.style.TextDirection? textDirection;
property public final androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform;
property public final androidx.compose.ui.text.style.TextIndent? textIndent;
+ property public final androidx.compose.ui.text.style.TextMotion? textMotion;
field public static final androidx.compose.ui.text.TextStyle.Companion Companion;
}
@@ -1423,6 +1460,17 @@
method public static androidx.compose.ui.text.style.TextIndent lerp(androidx.compose.ui.text.style.TextIndent start, androidx.compose.ui.text.style.TextIndent stop, float fraction);
}
+ @androidx.compose.runtime.Immutable public final class TextMotion {
+ field public static final androidx.compose.ui.text.style.TextMotion.Companion Companion;
+ }
+
+ public static final class TextMotion.Companion {
+ method public androidx.compose.ui.text.style.TextMotion getAnimated();
+ method public androidx.compose.ui.text.style.TextMotion getStatic();
+ property public final androidx.compose.ui.text.style.TextMotion Animated;
+ property public final androidx.compose.ui.text.style.TextMotion Static;
+ }
+
@kotlin.jvm.JvmInline public final value class TextOverflow {
field public static final androidx.compose.ui.text.style.TextOverflow.Companion Companion;
}
diff --git a/compose/ui/ui-text/benchmark/src/androidTest/java/androidx/compose/ui/text/benchmark/TextMeasurerBenchmark.kt b/compose/ui/ui-text/benchmark/src/androidTest/java/androidx/compose/ui/text/benchmark/TextMeasurerBenchmark.kt
index 3a5ebaf..993ebf5 100644
--- a/compose/ui/ui-text/benchmark/src/androidTest/java/androidx/compose/ui/text/benchmark/TextMeasurerBenchmark.kt
+++ b/compose/ui/ui-text/benchmark/src/androidTest/java/androidx/compose/ui/text/benchmark/TextMeasurerBenchmark.kt
@@ -25,7 +25,6 @@
import androidx.compose.ui.graphics.ImageBitmap
import androidx.compose.ui.graphics.drawscope.CanvasDrawScope
import androidx.compose.ui.text.AnnotatedString
-import androidx.compose.ui.text.ExperimentalTextApi
import androidx.compose.ui.text.TextMeasurer
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.drawText
@@ -44,7 +43,6 @@
import org.junit.runner.RunWith
import org.junit.runners.Parameterized
-@OptIn(ExperimentalTextApi::class)
@LargeTest
@RunWith(Parameterized::class)
class TextMeasurerBenchmark(
@@ -94,7 +92,6 @@
return AnnotatedString(text = text, spanStyles = spanStyles)
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun text_measurer_no_cache() {
textBenchmarkRule.generator { textGenerator ->
@@ -115,7 +112,6 @@
}
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun text_measurer_cached() {
textBenchmarkRule.generator { textGenerator ->
@@ -136,7 +132,6 @@
}
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun drawText_TextLayoutResult_no_change() {
textBenchmarkRule.generator { textGenerator ->
@@ -168,7 +163,6 @@
}
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun drawText_TextLayoutResult_color_override() {
textBenchmarkRule.generator { textGenerator ->
diff --git a/compose/ui/ui-text/samples/src/main/java/androidx/compose/ui/text/samples/DrawTextSamples.kt b/compose/ui/ui-text/samples/src/main/java/androidx/compose/ui/text/samples/DrawTextSamples.kt
index e655120..2a7f037 100644
--- a/compose/ui/ui-text/samples/src/main/java/androidx/compose/ui/text/samples/DrawTextSamples.kt
+++ b/compose/ui/ui-text/samples/src/main/java/androidx/compose/ui/text/samples/DrawTextSamples.kt
@@ -27,14 +27,12 @@
import androidx.compose.ui.Modifier
import androidx.compose.ui.layout.layout
import androidx.compose.ui.text.AnnotatedString
-import androidx.compose.ui.text.ExperimentalTextApi
import androidx.compose.ui.text.TextLayoutResult
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.drawText
import androidx.compose.ui.text.rememberTextMeasurer
import androidx.compose.ui.unit.sp
-@OptIn(ExperimentalTextApi::class)
@Sampled
@Composable
fun DrawTextLayoutResultSample() {
diff --git a/compose/ui/ui-text/samples/src/main/java/androidx/compose/ui/text/samples/SpanStyleSamples.kt b/compose/ui/ui-text/samples/src/main/java/androidx/compose/ui/text/samples/SpanStyleSamples.kt
index 88619248..15918fb 100644
--- a/compose/ui/ui-text/samples/src/main/java/androidx/compose/ui/text/samples/SpanStyleSamples.kt
+++ b/compose/ui/ui-text/samples/src/main/java/androidx/compose/ui/text/samples/SpanStyleSamples.kt
@@ -21,7 +21,6 @@
import androidx.compose.runtime.Composable
import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.text.ExperimentalTextApi
import androidx.compose.ui.text.SpanStyle
import androidx.compose.ui.text.buildAnnotatedString
import androidx.compose.ui.text.withStyle
@@ -43,7 +42,6 @@
)
}
-@OptIn(ExperimentalTextApi::class)
@Sampled
@Composable
fun SpanStyleBrushSample() {
diff --git a/compose/ui/ui-text/samples/src/main/java/androidx/compose/ui/text/samples/TextStyleSamples.kt b/compose/ui/ui-text/samples/src/main/java/androidx/compose/ui/text/samples/TextStyleSamples.kt
index 2742cdc..2950317 100644
--- a/compose/ui/ui-text/samples/src/main/java/androidx/compose/ui/text/samples/TextStyleSamples.kt
+++ b/compose/ui/ui-text/samples/src/main/java/androidx/compose/ui/text/samples/TextStyleSamples.kt
@@ -21,7 +21,6 @@
import androidx.compose.runtime.Composable
import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.Color
-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.FontStyle
@@ -48,7 +47,6 @@
)
}
-@OptIn(ExperimentalTextApi::class)
@Sampled
@Composable
fun TextStyleBrushSample() {
diff --git a/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/AndroidParagraphTest.kt b/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/AndroidParagraphTest.kt
index 0a5a040..386b478 100644
--- a/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/AndroidParagraphTest.kt
+++ b/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/AndroidParagraphTest.kt
@@ -175,7 +175,6 @@
assertThat(paragraph.charSequence).hasSpanOnTop(ForegroundColorSpan::class, 0, "abc".length)
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun testAnnotatedString_setBrushOnWholeText() {
val text = "abcde"
@@ -193,7 +192,6 @@
}
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun testAnnotatedString_setSolidColorBrushOnWholeText() {
val text = "abcde"
@@ -209,7 +207,6 @@
assertThat(paragraph.charSequence).hasSpan(ForegroundColorSpan::class, 0, text.length)
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun testAnnotatedString_setBrushOnPartOfText() {
val text = "abcde"
@@ -227,7 +224,6 @@
}
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun testAnnotatedString_brushSpanReceivesSize() {
with(defaultDensity) {
@@ -909,7 +905,6 @@
}
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun testAnnotatedString_setDrawStyle() {
val text = "abcde"
@@ -943,7 +938,6 @@
}
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun testAnnotatedString_setDrawStyle_FillOnTopOfStroke() {
val text = "abcde"
@@ -1348,7 +1342,6 @@
assertThat(paragraph.textPaint.color).isEqualTo(color.toArgb())
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun testSpanStyle_brush_appliedOnTextPaint() {
val brush = Brush.horizontalGradient(listOf(Color.Red, Color.Blue)) as ShaderBrush
@@ -1485,7 +1478,6 @@
assertThat(paragraph.textPaint.isStrikeThruText).isTrue()
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun testSpanStyle_drawStyle_stroke_appliedOnTextPaint() {
val paragraph = simpleParagraph(
@@ -1506,7 +1498,6 @@
assertThat(paragraph.textPaint.strokeJoin).isEqualTo(Paint.Join.BEVEL)
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun testSpanStyle_drawStyle_fill_appliedOnTextPaint() {
val paragraph = simpleParagraph(
@@ -1582,7 +1573,6 @@
assertThat(paragraph.textPaint.isUnderlineText).isTrue()
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun testPaint_can_change_DrawStyle_to_Stroke() {
val paragraph = simpleParagraph(
@@ -1603,7 +1593,6 @@
assertThat(paragraph.textPaint.strokeJoin).isEqualTo(Paint.Join.BEVEL)
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun testPaint_can_change_DrawStyle_to_Fill() {
val paragraph = simpleParagraph(
@@ -1619,7 +1608,6 @@
assertThat(paragraph.textPaint.style).isEqualTo(Paint.Style.FILL)
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun testPaint_null_drawStyle_should_be_noop() {
val paragraph = simpleParagraph(
@@ -1984,7 +1972,6 @@
)
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun shaderBrushSpan_createsShaderOnlyOnce() {
val fontSize = 20
@@ -2042,7 +2029,6 @@
assertThat(bitmapWithSpan).isEqualToBitmap(bitmapNoSpan)
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun textMotionStatic_setsCorrectFlagsOnTextPaint() {
val textMotion = TextMotion.Static
@@ -2058,7 +2044,6 @@
assertThat(paragraph.textPaint.hinting).isEqualTo(TextPaint.HINTING_ON)
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun textMotionAnimated_setsCorrectFlagsOnTextPaint() {
val textMotion = TextMotion.Animated
diff --git a/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/CacheTextLayoutInputTest.kt b/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/CacheTextLayoutInputTest.kt
index d377ab3..43d704c 100644
--- a/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/CacheTextLayoutInputTest.kt
+++ b/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/CacheTextLayoutInputTest.kt
@@ -14,8 +14,6 @@
* limitations under the License.
*/
-@file:OptIn(ExperimentalTextApi::class)
-
package androidx.compose.ui.text
import androidx.compose.ui.geometry.Offset
diff --git a/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/MultiParagraphIntegrationTest.kt b/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/MultiParagraphIntegrationTest.kt
index efe1944..10b709b 100644
--- a/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/MultiParagraphIntegrationTest.kt
+++ b/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/MultiParagraphIntegrationTest.kt
@@ -1512,7 +1512,6 @@
}
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun multiParagraph_appliesBrush_toTheWholeText() = with(defaultDensity) {
val fontSize = 20.sp
@@ -1550,7 +1549,6 @@
.isEqualToBitmap(multiParagraph2.bitmap(brush))
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun multiParagraph_overridesAlphaDuringDraw() = with(defaultDensity) {
val fontSize = 20.sp
diff --git a/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/ParagraphIntegrationTest.kt b/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/ParagraphIntegrationTest.kt
index c2fe639..1b3119b 100644
--- a/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/ParagraphIntegrationTest.kt
+++ b/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/ParagraphIntegrationTest.kt
@@ -3740,7 +3740,6 @@
}
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun testDefaultSpanStyle_setBrush() {
with(defaultDensity) {
@@ -3770,7 +3769,6 @@
}
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun testDefaultSpanStyle_setBrushAlpha() {
with(defaultDensity) {
@@ -3802,7 +3800,6 @@
}
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun testDefaultSpanStyle_overrideAlphaDuringDraw() {
with(defaultDensity) {
@@ -4366,7 +4363,6 @@
)
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun testSolidBrushColorIsSameAsColor() {
with(defaultDensity) {
@@ -4393,7 +4389,6 @@
}
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun testSpanBrush_overridesDefaultBrush() {
with(defaultDensity) {
@@ -4435,7 +4430,6 @@
}
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun testBrush_notEffectedBy_TextDirection() {
with(defaultDensity) {
@@ -4518,7 +4512,6 @@
}
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun paint_withBlendMode_changesVisual() {
with(defaultDensity) {
@@ -4554,7 +4547,6 @@
}
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun paint_withBlendMode_sameResult() {
with(defaultDensity) {
diff --git a/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/PlatformParagraphStyleTest.kt b/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/PlatformParagraphStyleTest.kt
index b0feae1..09d8375 100644
--- a/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/PlatformParagraphStyleTest.kt
+++ b/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/PlatformParagraphStyleTest.kt
@@ -14,8 +14,6 @@
* limitations under the License.
*/
-@file:OptIn(ExperimentalTextApi::class)
-
package androidx.compose.ui.text
import com.google.common.truth.Truth.assertThat
@@ -23,7 +21,6 @@
import org.junit.runner.RunWith
import org.junit.runners.JUnit4
-@Suppress("DEPRECATION")
@RunWith(JUnit4::class)
class PlatformParagraphStyleTest {
diff --git a/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/PlatformSpanStyleTest.kt b/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/PlatformSpanStyleTest.kt
index ae7baff..ef9afe5 100644
--- a/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/PlatformSpanStyleTest.kt
+++ b/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/PlatformSpanStyleTest.kt
@@ -14,8 +14,6 @@
* limitations under the License.
*/
-@file:OptIn(ExperimentalTextApi::class)
-
package androidx.compose.ui.text
import com.google.common.truth.Truth.assertThat
diff --git a/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/PlatformTextStyleTest.kt b/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/PlatformTextStyleTest.kt
index a51ee71..8aa22e0 100644
--- a/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/PlatformTextStyleTest.kt
+++ b/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/PlatformTextStyleTest.kt
@@ -14,8 +14,6 @@
* limitations under the License.
*/
-@file:OptIn(ExperimentalTextApi::class)
-
package androidx.compose.ui.text
import com.google.common.truth.Truth.assertThat
@@ -23,7 +21,6 @@
import org.junit.runner.RunWith
import org.junit.runners.JUnit4
-@Suppress("DEPRECATION")
@RunWith(JUnit4::class)
class PlatformTextStyleTest {
diff --git a/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/TextLayoutCacheTest.kt b/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/TextLayoutCacheTest.kt
index f025c2f..14984f1 100644
--- a/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/TextLayoutCacheTest.kt
+++ b/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/TextLayoutCacheTest.kt
@@ -14,8 +14,6 @@
* limitations under the License.
*/
-@file:OptIn(ExperimentalTextApi::class)
-
package androidx.compose.ui.text
import androidx.compose.ui.graphics.Brush
diff --git a/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/TextMeasurerTest.kt b/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/TextMeasurerTest.kt
index 37667e3..dcbf9bb 100644
--- a/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/TextMeasurerTest.kt
+++ b/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/TextMeasurerTest.kt
@@ -14,8 +14,6 @@
* limitations under the License.
*/
-@file:OptIn(ExperimentalTextApi::class)
-
package androidx.compose.ui.text
import androidx.compose.ui.graphics.Brush
diff --git a/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/TextPainterTest.kt b/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/TextPainterTest.kt
index 3eb5285..af0ce0e3 100644
--- a/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/TextPainterTest.kt
+++ b/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/TextPainterTest.kt
@@ -14,8 +14,6 @@
* limitations under the License.
*/
-@file:OptIn(ExperimentalTextApi::class)
-
package androidx.compose.ui.text
import android.graphics.Bitmap
diff --git a/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/TextTestExtensions.kt b/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/TextTestExtensions.kt
index d629400..102ce80a 100644
--- a/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/TextTestExtensions.kt
+++ b/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/TextTestExtensions.kt
@@ -73,7 +73,6 @@
return bitmap
}
-@OptIn(ExperimentalTextApi::class)
fun Paragraph.bitmap(
color: Color = Color.Unspecified,
shadow: Shadow? = null,
@@ -93,7 +92,6 @@
}
}
-@OptIn(ExperimentalTextApi::class)
fun Paragraph.bitmap(
brush: Brush,
alpha: Float,
@@ -123,7 +121,6 @@
* We have to re-specify the brush during paint(draw) to apply it according to the total size of
* MultiParagraph.
*/
-@OptIn(ExperimentalTextApi::class)
fun MultiParagraph.bitmap(
brush: Brush? = null,
alpha: Float = Float.NaN,
diff --git a/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/font/FontListFontFamilyTypefaceAdapterTest.kt b/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/font/FontListFontFamilyTypefaceAdapterTest.kt
index 26b1954..b6168c47 100644
--- a/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/font/FontListFontFamilyTypefaceAdapterTest.kt
+++ b/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/font/FontListFontFamilyTypefaceAdapterTest.kt
@@ -102,7 +102,6 @@
fontLoader.cacheKey
)
- @OptIn(ExperimentalCoroutinesApi::class)
@Test
fun onResolve_onlyBlockingFonts_doesNotLoad() {
val expected = Typeface.MONOSPACE
@@ -117,7 +116,6 @@
assertThat(result).isImmutableTypefaceOf(expected)
}
- @OptIn(ExperimentalCoroutinesApi::class)
@Test
fun onResolve_blockingAndAsyncFonts_matchesBlocking_doesLoad() {
val expected = Typeface.MONOSPACE
@@ -365,7 +363,6 @@
)
}
- @OptIn(ExperimentalCoroutinesApi::class)
@Test
fun onResolve_optionalAndAsyncFonts_matchesOptional_doesLoad() {
val expected = Typeface.MONOSPACE
@@ -470,7 +467,6 @@
scope.advanceUntilIdle()
}
- @OptIn(ExperimentalCoroutinesApi::class)
@Test
fun onResolve_optionalAndAsyncAndBlockingFonts_matchesOptional_doesNotLoadBlockingAsync() {
val asyncFont = AsyncFauxFont(typefaceLoader)
@@ -689,7 +685,6 @@
requestAndCompleteOnRealDispatcher()
}
- @OptIn(ExperimentalCoroutinesApi::class)
@Test
fun runtimeExceptionOnRealDispatcher_informsExceptionHandler() {
val exception: CompletableDeferred<Throwable> = CompletableDeferred()
diff --git a/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/font/testutils/AsyncTestFonts.kt b/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/font/testutils/AsyncTestFonts.kt
index 0c3455e..9f24373 100644
--- a/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/font/testutils/AsyncTestFonts.kt
+++ b/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/font/testutils/AsyncTestFonts.kt
@@ -18,7 +18,6 @@
import android.content.Context
import android.graphics.Typeface
-import androidx.compose.ui.text.ExperimentalTextApi
import androidx.compose.ui.text.font.AndroidFont
import androidx.compose.ui.text.font.Font
import androidx.compose.ui.text.font.FontLoadingStrategy.Companion.Async
@@ -156,7 +155,6 @@
}
}
-@OptIn(ExperimentalTextApi::class)
class BlockingFauxFont(
typefaceLoader: AsyncTestTypefaceLoader,
internal val typeface: Typeface,
diff --git a/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/platform/SpannableExtensionsTest.kt b/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/platform/SpannableExtensionsTest.kt
index 576b5339..2ec8bcb 100644
--- a/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/platform/SpannableExtensionsTest.kt
+++ b/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/platform/SpannableExtensionsTest.kt
@@ -24,7 +24,6 @@
import androidx.compose.ui.graphics.SolidColor
import androidx.compose.ui.graphics.toArgb
import androidx.compose.ui.text.AnnotatedString
-import androidx.compose.ui.text.ExperimentalTextApi
import androidx.compose.ui.text.SpanStyle
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.font.FontStyle
@@ -37,6 +36,9 @@
import androidx.compose.ui.unit.sp
import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.filters.SmallTest
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.ArgumentMatchers.anyInt
import org.mockito.kotlin.any
import org.mockito.kotlin.argThat
import org.mockito.kotlin.eq
@@ -45,9 +47,6 @@
import org.mockito.kotlin.never
import org.mockito.kotlin.times
import org.mockito.kotlin.verify
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.mockito.ArgumentMatchers.anyInt
@RunWith(AndroidJUnit4::class)
@SmallTest
@@ -505,7 +504,6 @@
}
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun shaderBrush_shouldAdd_shaderBrushSpan_whenApplied() {
val text = "abcde abcde"
@@ -524,7 +522,6 @@
}
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun shaderBrush_shouldAdd_shaderBrushSpan_whenApplied_withSpecifiedAlpha() {
val text = "abcde abcde"
@@ -543,7 +540,6 @@
}
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun solidColorBrush_shouldAdd_ForegroundColorSpan_whenApplied() {
val text = "abcde abcde"
@@ -557,7 +553,6 @@
)
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun whenColorAndShaderBrushSpansCollide_bothShouldApply() {
val text = "abcde abcde"
@@ -581,7 +576,6 @@
assertThat(spannable).hasSpan(ForegroundColorSpan::class, 0, text.length)
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun whenColorAndSolidColorBrushSpansCollide_bothShouldApply() {
val text = "abcde abcde"
diff --git a/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/platform/TextPaintExtensionsTest.kt b/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/platform/TextPaintExtensionsTest.kt
index 70890ed..b7cdc5e3 100644
--- a/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/platform/TextPaintExtensionsTest.kt
+++ b/compose/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/ui/text/platform/TextPaintExtensionsTest.kt
@@ -22,7 +22,6 @@
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.Shadow
import androidx.compose.ui.graphics.toArgb
-import androidx.compose.ui.text.ExperimentalTextApi
import androidx.compose.ui.text.SpanStyle
import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.text.font.FontStyle
@@ -355,7 +354,6 @@
assertThat(notApplied?.color).isEqualTo(Color.Unspecified)
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun setTextMotion_setsCorrectFlags_forLinearAndSubpixel() {
val textMotion = TextMotion(TextMotion.Linearity.Linear, true)
@@ -369,7 +367,6 @@
assertThat(tp.hinting).isEqualTo(TextPaint.HINTING_OFF)
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun setTextMotion_setsCorrectFlags_forFontHintingAndSubpixel() {
val textMotion = TextMotion(TextMotion.Linearity.FontHinting, true)
@@ -383,7 +380,6 @@
assertThat(tp.hinting).isEqualTo(TextPaint.HINTING_ON)
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun setTextMotion_setsCorrectFlags_forNoneAndSubpixel() {
val textMotion = TextMotion(TextMotion.Linearity.None, true)
@@ -397,7 +393,6 @@
assertThat(tp.hinting).isEqualTo(TextPaint.HINTING_OFF)
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun setTextMotion_setsCorrectFlags_forLinear() {
val textMotion = TextMotion(TextMotion.Linearity.Linear, false)
@@ -409,7 +404,6 @@
assertThat(tp.hinting).isEqualTo(TextPaint.HINTING_OFF)
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun setTextMotion_setsCorrectFlags_forFontHinting() {
val textMotion = TextMotion(TextMotion.Linearity.FontHinting, false)
@@ -421,7 +415,6 @@
assertThat(tp.hinting).isEqualTo(TextPaint.HINTING_ON)
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun setTextMotion_setsCorrectFlags_forNone() {
val textMotion = TextMotion(TextMotion.Linearity.None, false)
diff --git a/compose/ui/ui-text/src/androidMain/kotlin/androidx/compose/ui/text/AndroidParagraph.android.kt b/compose/ui/ui-text/src/androidMain/kotlin/androidx/compose/ui/text/AndroidParagraph.android.kt
index 3aff906..35b572e 100644
--- a/compose/ui/ui-text/src/androidMain/kotlin/androidx/compose/ui/text/AndroidParagraph.android.kt
+++ b/compose/ui/ui-text/src/androidMain/kotlin/androidx/compose/ui/text/AndroidParagraph.android.kt
@@ -459,7 +459,6 @@
paint(canvas)
}
- @OptIn(ExperimentalTextApi::class)
override fun paint(
canvas: Canvas,
color: Color,
@@ -482,7 +481,6 @@
textPaint.blendMode = currBlendMode
}
- @OptIn(ExperimentalTextApi::class)
override fun paint(
canvas: Canvas,
brush: Brush,
diff --git a/compose/ui/ui-text/src/androidMain/kotlin/androidx/compose/ui/text/Paragraph.android.kt b/compose/ui/ui-text/src/androidMain/kotlin/androidx/compose/ui/text/Paragraph.android.kt
index 7bbfe8d..83ba3cb 100644
--- a/compose/ui/ui-text/src/androidMain/kotlin/androidx/compose/ui/text/Paragraph.android.kt
+++ b/compose/ui/ui-text/src/androidMain/kotlin/androidx/compose/ui/text/Paragraph.android.kt
@@ -58,7 +58,6 @@
actual fun getBoundingBox(offset: Int): Rect
actual fun getWordBoundary(offset: Int): TextRange
actual fun paint(canvas: Canvas, color: Color, shadow: Shadow?, textDecoration: TextDecoration?)
- @ExperimentalTextApi
actual fun paint(
canvas: Canvas,
color: Color,
@@ -67,7 +66,6 @@
drawStyle: DrawStyle?,
blendMode: BlendMode
)
- @ExperimentalTextApi
actual fun paint(
canvas: Canvas,
brush: Brush,
diff --git a/compose/ui/ui-text/src/androidMain/kotlin/androidx/compose/ui/text/platform/AndroidMultiParagraphDraw.kt b/compose/ui/ui-text/src/androidMain/kotlin/androidx/compose/ui/text/platform/AndroidMultiParagraphDraw.kt
index e88267d..0b86686 100644
--- a/compose/ui/ui-text/src/androidMain/kotlin/androidx/compose/ui/text/platform/AndroidMultiParagraphDraw.kt
+++ b/compose/ui/ui-text/src/androidMain/kotlin/androidx/compose/ui/text/platform/AndroidMultiParagraphDraw.kt
@@ -25,12 +25,10 @@
import androidx.compose.ui.graphics.Shadow
import androidx.compose.ui.graphics.SolidColor
import androidx.compose.ui.graphics.drawscope.DrawStyle
-import androidx.compose.ui.text.ExperimentalTextApi
import androidx.compose.ui.text.MultiParagraph
import androidx.compose.ui.text.style.TextDecoration
import androidx.compose.ui.util.fastForEach
-@OptIn(ExperimentalTextApi::class)
internal actual fun MultiParagraph.drawMultiParagraph(
canvas: Canvas,
brush: Brush,
@@ -80,7 +78,6 @@
canvas.restore()
}
-@OptIn(ExperimentalTextApi::class)
private fun MultiParagraph.drawParagraphs(
canvas: Canvas,
brush: Brush,
diff --git a/compose/ui/ui-text/src/androidMain/kotlin/androidx/compose/ui/text/platform/AndroidParagraphHelper.android.kt b/compose/ui/ui-text/src/androidMain/kotlin/androidx/compose/ui/text/platform/AndroidParagraphHelper.android.kt
index 3bcd60e..2fd7809 100644
--- a/compose/ui/ui-text/src/androidMain/kotlin/androidx/compose/ui/text/platform/AndroidParagraphHelper.android.kt
+++ b/compose/ui/ui-text/src/androidMain/kotlin/androidx/compose/ui/text/platform/AndroidParagraphHelper.android.kt
@@ -23,7 +23,6 @@
import android.text.style.CharacterStyle
import androidx.compose.ui.text.AnnotatedString
import androidx.compose.ui.text.DefaultIncludeFontPadding
-import androidx.compose.ui.text.ExperimentalTextApi
import androidx.compose.ui.text.Placeholder
import androidx.compose.ui.text.SpanStyle
import androidx.compose.ui.text.TextStyle
@@ -44,7 +43,7 @@
import androidx.compose.ui.unit.isUnspecified
import androidx.emoji2.text.EmojiCompat
-@OptIn(InternalPlatformTextApi::class, ExperimentalTextApi::class)
+@OptIn(InternalPlatformTextApi::class)
internal fun createCharSequence(
text: String,
contextFontSize: Float,
@@ -118,8 +117,6 @@
return spannableString
}
-@OptIn(ExperimentalTextApi::class)
-@Suppress("DEPRECATION")
internal fun TextStyle.isIncludeFontPaddingEnabled(): Boolean {
return platformStyle?.paragraphStyle?.includeFontPadding ?: DefaultIncludeFontPadding
}
diff --git a/compose/ui/ui-text/src/androidMain/kotlin/androidx/compose/ui/text/platform/extensions/SpannableExtensions.android.kt b/compose/ui/ui-text/src/androidMain/kotlin/androidx/compose/ui/text/platform/extensions/SpannableExtensions.android.kt
index 3b316c8..972b324 100644
--- a/compose/ui/ui-text/src/androidMain/kotlin/androidx/compose/ui/text/platform/extensions/SpannableExtensions.android.kt
+++ b/compose/ui/ui-text/src/androidMain/kotlin/androidx/compose/ui/text/platform/extensions/SpannableExtensions.android.kt
@@ -215,7 +215,6 @@
}
}
-@OptIn(ExperimentalTextApi::class)
private fun Spannable.setSpanStyle(
spanStyleRange: AnnotatedString.Range<SpanStyle>,
density: Density
diff --git a/compose/ui/ui-text/src/androidMain/kotlin/androidx/compose/ui/text/platform/extensions/TextPaintExtensions.android.kt b/compose/ui/ui-text/src/androidMain/kotlin/androidx/compose/ui/text/platform/extensions/TextPaintExtensions.android.kt
index b92b9c55..ee6daab 100644
--- a/compose/ui/ui-text/src/androidMain/kotlin/androidx/compose/ui/text/platform/extensions/TextPaintExtensions.android.kt
+++ b/compose/ui/ui-text/src/androidMain/kotlin/androidx/compose/ui/text/platform/extensions/TextPaintExtensions.android.kt
@@ -21,7 +21,6 @@
import android.text.TextPaint
import androidx.compose.ui.geometry.Size
import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.text.ExperimentalTextApi
import androidx.compose.ui.text.SpanStyle
import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.text.font.FontStyle
@@ -44,7 +43,6 @@
* regular platform spans such as background, baselineShift. This function also returns a new
* SpanStyle that consists of attributes that were not applied to the TextPaint.
*/
-@OptIn(ExperimentalTextApi::class)
internal fun AndroidTextPaint.applySpanStyle(
style: SpanStyle,
resolveTypeface: (FontFamily?, FontWeight, FontStyle, FontSynthesis) -> Typeface,
@@ -154,7 +152,6 @@
}
}
-@OptIn(ExperimentalTextApi::class)
internal fun AndroidTextPaint.setTextMotion(textMotion: TextMotion?) {
val finalTextMotion = textMotion ?: TextMotion.Static
flags = if (finalTextMotion.subpixelTextPositioning) {
diff --git a/compose/ui/ui-text/src/androidMain/kotlin/androidx/compose/ui/text/style/TextMotion.android.kt b/compose/ui/ui-text/src/androidMain/kotlin/androidx/compose/ui/text/style/TextMotion.android.kt
index e4434ce..c508974 100644
--- a/compose/ui/ui-text/src/androidMain/kotlin/androidx/compose/ui/text/style/TextMotion.android.kt
+++ b/compose/ui/ui-text/src/androidMain/kotlin/androidx/compose/ui/text/style/TextMotion.android.kt
@@ -17,12 +17,10 @@
package androidx.compose.ui.text.style
import androidx.compose.runtime.Immutable
-import androidx.compose.ui.text.ExperimentalTextApi
/**
* Implementation of possible TextMotion configurations on Android.
*/
-@ExperimentalTextApi
@Immutable
actual class TextMotion internal constructor(
internal val linearity: Linearity,
diff --git a/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/MultiParagraph.kt b/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/MultiParagraph.kt
index dc32ce8..c0fb6f3 100644
--- a/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/MultiParagraph.kt
+++ b/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/MultiParagraph.kt
@@ -385,6 +385,10 @@
}
/** Paint the paragraphs to canvas. */
+ @Deprecated(
+ "Use the new paint function that takes canvas as the only required parameter.",
+ level = DeprecationLevel.HIDDEN
+ )
fun paint(
canvas: Canvas,
color: Color = Color.Unspecified,
@@ -400,7 +404,6 @@
}
/** Paint the paragraphs to canvas. */
- @ExperimentalTextApi
fun paint(
canvas: Canvas,
color: Color = Color.Unspecified,
@@ -418,7 +421,6 @@
}
/** Paint the paragraphs to canvas. */
- @ExperimentalTextApi
fun paint(
canvas: Canvas,
brush: Brush,
diff --git a/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/Paragraph.kt b/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/Paragraph.kt
index 9b24ca1..b3653ef 100644
--- a/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/Paragraph.kt
+++ b/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/Paragraph.kt
@@ -254,6 +254,10 @@
* TextDecoration on this paragraph, `null` does not change the currently set [TextDecoration]
* configuration.
*/
+ @Deprecated(
+ "Use the new paint function that takes canvas as the only required parameter.",
+ level = DeprecationLevel.HIDDEN
+ )
fun paint(
canvas: Canvas,
color: Color = Color.Unspecified,
@@ -281,7 +285,6 @@
* currently set DrawStyle.
* @param blendMode Blending algorithm to be applied to the Paragraph while painting.
*/
- @ExperimentalTextApi
fun paint(
canvas: Canvas,
color: Color = Color.Unspecified,
@@ -316,7 +319,6 @@
* currently set DrawStyle.
* @param blendMode Blending algorithm to be applied to the Paragraph while painting.
*/
- @ExperimentalTextApi
fun paint(
canvas: Canvas,
brush: Brush,
diff --git a/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/ParagraphStyle.kt b/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/ParagraphStyle.kt
index f97de62..c16af63 100644
--- a/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/ParagraphStyle.kt
+++ b/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/ParagraphStyle.kt
@@ -62,7 +62,7 @@
* @see TextStyle
*/
@Immutable
-class ParagraphStyle @ExperimentalTextApi constructor(
+class ParagraphStyle constructor(
val textAlign: TextAlign? = null,
val textDirection: TextDirection? = null,
val lineHeight: TextUnit = TextUnit.Unspecified,
@@ -71,9 +71,6 @@
val lineHeightStyle: LineHeightStyle? = null,
val lineBreak: LineBreak? = null,
val hyphens: Hyphens? = null,
- @Suppress("OPT_IN_MARKER_ON_WRONG_TARGET")
- @get:ExperimentalTextApi
- @property:ExperimentalTextApi
val textMotion: TextMotion? = null
) {
@@ -89,7 +86,6 @@
"constructor.",
level = DeprecationLevel.HIDDEN
)
- @OptIn(ExperimentalTextApi::class)
constructor(
textAlign: TextAlign? = null,
textDirection: TextDirection? = null,
@@ -113,7 +109,6 @@
"constructors.",
level = DeprecationLevel.HIDDEN
)
- @OptIn(ExperimentalTextApi::class)
constructor(
textAlign: TextAlign? = null,
textDirection: TextDirection? = null,
@@ -133,35 +128,12 @@
textMotion = null
)
- /**
- * Paragraph styling configuration for a paragraph. The difference between [SpanStyle] and
- * `ParagraphStyle` is that, `ParagraphStyle` can be applied to a whole [Paragraph] while
- * [SpanStyle] can be applied at the character level.
- * Once a portion of the text is marked with a `ParagraphStyle`, that portion will be separated from
- * the remaining as if a line feed character was added.
- *
- * @sample androidx.compose.ui.text.samples.ParagraphStyleSample
- * @sample androidx.compose.ui.text.samples.ParagraphStyleAnnotatedStringsSample
- *
- * @param textAlign The alignment of the text within the lines of the paragraph.
- * @param textDirection The algorithm to be used to resolve the final text direction:
- * Left To Right or Right To Left.
- * @param lineHeight Line height for the [Paragraph] in [TextUnit] unit, e.g. SP or EM.
- * @param textIndent The indentation of the paragraph.
- * @param platformStyle Platform specific [ParagraphStyle] parameters.
- * @param lineHeightStyle the configuration for line height such as vertical alignment of the
- * line, whether to apply additional space as a result of line height to top of first line top and
- * bottom of last line. The configuration is applied only when a [lineHeight] is defined.
- * When null, [LineHeightStyle.Default] is used.
- * @param lineBreak The line breaking configuration for the text.
- * @param hyphens The configuration of hyphenation.
- *
- * @see Paragraph
- * @see AnnotatedString
- * @see SpanStyle
- * @see TextStyle
- */
- @OptIn(ExperimentalTextApi::class)
+ @Deprecated(
+ "ParagraphStyle constructors that do not take new stable parameters " +
+ "like LineBreak, Hyphens, TextMotion are deprecated. Please use the new stable " +
+ "constructors.",
+ level = DeprecationLevel.HIDDEN
+ )
constructor(
textAlign: TextAlign? = null,
textDirection: TextDirection? = null,
@@ -198,7 +170,6 @@
*
* If the given paragraph style is null, returns this paragraph style.
*/
- @OptIn(ExperimentalTextApi::class)
@Stable
fun merge(other: ParagraphStyle? = null): ParagraphStyle {
if (other == null) return this
@@ -238,7 +209,6 @@
"copy constructor.",
level = DeprecationLevel.HIDDEN
)
- @OptIn(ExperimentalTextApi::class)
fun copy(
textAlign: TextAlign? = this.textAlign,
textDirection: TextDirection? = this.textDirection,
@@ -264,7 +234,6 @@
"copy constructor.",
level = DeprecationLevel.HIDDEN
)
- @OptIn(ExperimentalTextApi::class)
fun copy(
textAlign: TextAlign? = this.textAlign,
textDirection: TextDirection? = this.textDirection,
@@ -286,7 +255,12 @@
)
}
- @OptIn(ExperimentalTextApi::class)
+ @Deprecated(
+ "ParagraphStyle copy constructors that do not take new stable parameters " +
+ "like LineBreak, Hyphens, TextMotion are deprecated. Please use the new stable " +
+ "copy constructor.",
+ level = DeprecationLevel.HIDDEN
+ )
fun copy(
textAlign: TextAlign? = this.textAlign,
textDirection: TextDirection? = this.textDirection,
@@ -310,7 +284,6 @@
)
}
- @ExperimentalTextApi
fun copy(
textAlign: TextAlign? = this.textAlign,
textDirection: TextDirection? = this.textDirection,
@@ -335,7 +308,6 @@
)
}
- @OptIn(ExperimentalTextApi::class)
override fun equals(other: Any?): Boolean {
if (this === other) return true
if (other !is ParagraphStyle) return false
@@ -353,7 +325,6 @@
return true
}
- @OptIn(ExperimentalTextApi::class)
override fun hashCode(): Int {
var result = textAlign?.hashCode() ?: 0
result = 31 * result + (textDirection?.hashCode() ?: 0)
@@ -367,7 +338,6 @@
return result
}
- @OptIn(ExperimentalTextApi::class)
override fun toString(): String {
return "ParagraphStyle(" +
"textAlign=$textAlign, " +
@@ -396,7 +366,6 @@
* between [start] and [stop]. The interpolation can be extrapolated beyond 0.0 and
* 1.0, so negative values and values greater than 1.0 are valid.
*/
-@OptIn(ExperimentalTextApi::class)
@Stable
fun lerp(start: ParagraphStyle, stop: ParagraphStyle, fraction: Float): ParagraphStyle {
return ParagraphStyle(
@@ -435,7 +404,6 @@
return lerp(startNonNull, stopNonNull, fraction)
}
-@OptIn(ExperimentalTextApi::class)
internal fun resolveParagraphStyleDefaults(
style: ParagraphStyle,
direction: LayoutDirection
diff --git a/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/SpanStyle.kt b/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/SpanStyle.kt
index aafe77a..64056d4 100644
--- a/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/SpanStyle.kt
+++ b/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/SpanStyle.kt
@@ -101,9 +101,7 @@
val textDecoration: TextDecoration? = null,
val shadow: Shadow? = null,
val platformStyle: PlatformSpanStyle? = null,
- @Suppress("OPT_IN_MARKER_ON_WRONG_TARGET")
- @property:ExperimentalTextApi
- @get:ExperimentalTextApi val drawStyle: DrawStyle? = null
+ val drawStyle: DrawStyle? = null
) {
/**
@@ -138,6 +136,12 @@
* @see TextStyle
* @see ParagraphStyle
*/
+ @Deprecated(
+ "SpanStyle constructors that do not take new stable parameters " +
+ "like PlatformStyle, DrawStyle are deprecated. Please use the new stable " +
+ "constructor.",
+ level = DeprecationLevel.HIDDEN
+ )
constructor(
color: Color = Color.Unspecified,
fontSize: TextUnit = TextUnit.Unspecified,
@@ -204,6 +208,12 @@
* @see TextStyle
* @see ParagraphStyle
*/
+ @Deprecated(
+ "SpanStyle constructors that do not take new stable parameters " +
+ "like PlatformStyle, DrawStyle are deprecated. Please use the new stable " +
+ "constructor.",
+ level = DeprecationLevel.HIDDEN
+ )
constructor(
color: Color = Color.Unspecified,
fontSize: TextUnit = TextUnit.Unspecified,
@@ -273,7 +283,6 @@
* @see TextStyle
* @see ParagraphStyle
*/
- @ExperimentalTextApi
constructor(
color: Color = Color.Unspecified,
fontSize: TextUnit = TextUnit.Unspecified,
@@ -349,7 +358,6 @@
* @see TextStyle
* @see ParagraphStyle
*/
- @ExperimentalTextApi
constructor(
brush: Brush?,
alpha: Float = Float.NaN,
@@ -395,18 +403,12 @@
/**
* Brush to draw text. If not null, overrides [color].
*/
- @ExperimentalTextApi
- @Suppress("OPT_IN_MARKER_ON_WRONG_TARGET")
- @get:ExperimentalTextApi
val brush: Brush? get() = this.textForegroundStyle.brush
/**
* Opacity of text. This value is either provided along side Brush, or via alpha channel in
* color.
*/
- @ExperimentalTextApi
- @Suppress("OPT_IN_MARKER_ON_WRONG_TARGET")
- @get:ExperimentalTextApi
val alpha: Float get() = this.textForegroundStyle.alpha
/**
@@ -418,7 +420,6 @@
*
* If the given span style is null, returns this span style.
*/
- @OptIn(ExperimentalTextApi::class)
@Stable
fun merge(other: SpanStyle? = null): SpanStyle {
if (other == null) return this
@@ -459,7 +460,12 @@
@Stable
operator fun plus(other: SpanStyle): SpanStyle = this.merge(other)
- @OptIn(ExperimentalTextApi::class)
+ @Deprecated(
+ "SpanStyle copy constructors that do not take new stable parameters " +
+ "like PlatformStyle, DrawStyle are deprecated. Please use the new stable " +
+ "copy constructor.",
+ level = DeprecationLevel.HIDDEN
+ )
fun copy(
color: Color = this.color,
fontSize: TextUnit = this.fontSize,
@@ -500,6 +506,12 @@
)
}
+ @Deprecated(
+ "SpanStyle copy constructors that do not take new stable parameters " +
+ "like PlatformStyle, DrawStyle are deprecated. Please use the new stable " +
+ "copy constructor.",
+ level = DeprecationLevel.HIDDEN
+ )
fun copy(
color: Color = this.color,
fontSize: TextUnit = this.fontSize,
@@ -540,7 +552,6 @@
)
}
- @ExperimentalTextApi
fun copy(
color: Color = this.color,
fontSize: TextUnit = this.fontSize,
@@ -583,7 +594,6 @@
)
}
- @ExperimentalTextApi
fun copy(
brush: Brush?,
alpha: Float = this.alpha,
@@ -647,7 +657,6 @@
return true
}
- @OptIn(ExperimentalTextApi::class)
private fun hasSameNonLayoutAttributes(other: SpanStyle): Boolean {
if (textForegroundStyle != other.textForegroundStyle) return false
if (textDecoration != other.textDecoration) return false
@@ -656,7 +665,6 @@
return true
}
- @OptIn(ExperimentalTextApi::class)
override fun hashCode(): Int {
var result = color.hashCode()
result = 31 * result + brush.hashCode()
@@ -695,7 +703,6 @@
return result
}
- @OptIn(ExperimentalTextApi::class)
override fun toString(): String {
return "SpanStyle(" +
"color=$color, " +
@@ -748,7 +755,6 @@
* between [start] and [stop]. The interpolation can be extrapolated beyond 0.0 and
* 1.0, so negative values and values greater than 1.0 are valid.
*/
-@OptIn(ExperimentalTextApi::class)
fun lerp(start: SpanStyle, stop: SpanStyle, fraction: Float): SpanStyle {
return SpanStyle(
textForegroundStyle = lerp(start.textForegroundStyle, stop.textForegroundStyle, fraction),
@@ -829,7 +835,6 @@
return lerp(startNonNull, stopNonNull, fraction)
}
-@OptIn(ExperimentalTextApi::class)
internal fun resolveSpanStyleDefaults(style: SpanStyle) = SpanStyle(
textForegroundStyle = style.textForegroundStyle.takeOrElse {
TextForegroundStyle.from(DefaultColor)
diff --git a/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/TextPainter.kt b/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/TextPainter.kt
index 44c34a2..f9aa838 100644
--- a/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/TextPainter.kt
+++ b/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/TextPainter.kt
@@ -40,8 +40,6 @@
import kotlin.math.ceil
import kotlin.math.roundToInt
-internal val DefaultTextBlendMode = BlendMode.SrcOver
-
object TextPainter {
// TODO(b/236964276): Deprecate when TextMeasurer and drawText are no longer Experimental
@@ -51,7 +49,6 @@
* @param canvas a canvas to be drawn
* @param textLayoutResult a result of text layout
*/
- @OptIn(ExperimentalTextApi::class)
fun paint(canvas: Canvas, textLayoutResult: TextLayoutResult) {
val needClipping = textLayoutResult.hasVisualOverflow &&
textLayoutResult.layoutInput.overflow != TextOverflow.Visible
@@ -143,7 +140,6 @@
*
* @see TextMeasurer
*/
-@ExperimentalTextApi
fun DrawScope.drawText(
textMeasurer: TextMeasurer,
text: AnnotatedString,
@@ -211,7 +207,6 @@
*
* @see TextMeasurer
*/
-@ExperimentalTextApi
fun DrawScope.drawText(
textMeasurer: TextMeasurer,
text: String,
@@ -263,7 +258,6 @@
*
* @sample androidx.compose.ui.text.samples.DrawTextLayoutResultSample
*/
-@ExperimentalTextApi
fun DrawScope.drawText(
textLayoutResult: TextLayoutResult,
color: Color = Color.Unspecified,
@@ -326,7 +320,6 @@
*
* @sample androidx.compose.ui.text.samples.DrawTextLayoutResultSample
*/
-@ExperimentalTextApi
fun DrawScope.drawText(
textLayoutResult: TextLayoutResult,
brush: Brush,
diff --git a/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/TextStyle.kt b/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/TextStyle.kt
index ca8e2c9..1814b67 100644
--- a/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/TextStyle.kt
+++ b/compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/TextStyle.kt
@@ -78,7 +78,6 @@
"constructor.",
level = DeprecationLevel.HIDDEN
)
- @OptIn(ExperimentalTextApi::class)
constructor(
color: Color = Color.Unspecified,
fontSize: TextUnit = TextUnit.Unspecified,
@@ -137,7 +136,6 @@
"constructor.",
level = DeprecationLevel.HIDDEN
)
- @OptIn(ExperimentalTextApi::class)
constructor(
color: Color = Color.Unspecified,
fontSize: TextUnit = TextUnit.Unspecified,
@@ -229,6 +227,12 @@
* @param lineBreak The line breaking configuration for the text.
* @param hyphens The configuration of hyphenation.
*/
+ @Deprecated(
+ "TextStyle constructors that do not take new stable parameters " +
+ "like TextMotion are deprecated. Please use the new stable " +
+ "constructor.",
+ level = DeprecationLevel.HIDDEN
+ )
constructor(
color: Color = Color.Unspecified,
fontSize: TextUnit = TextUnit.Unspecified,
@@ -323,7 +327,6 @@
* @param hyphens The configuration of hyphenation.
* @param textMotion Text character placement, whether to optimize for animated or static text.
*/
- @ExperimentalTextApi
constructor(
color: Color = Color.Unspecified,
fontSize: TextUnit = TextUnit.Unspecified,
@@ -425,7 +428,6 @@
* @param hyphens The configuration of hyphenation.
* @param textMotion Text character placement, whether to optimize for animated or static text.
*/
- @ExperimentalTextApi
constructor(
brush: Brush?,
alpha: Float = Float.NaN,
@@ -560,7 +562,6 @@
"copy constructor.",
level = DeprecationLevel.HIDDEN
)
- @OptIn(ExperimentalTextApi::class)
fun copy(
color: Color = this.spanStyle.color,
fontSize: TextUnit = this.spanStyle.fontSize,
@@ -625,7 +626,6 @@
"copy constructor.",
level = DeprecationLevel.HIDDEN
)
- @OptIn(ExperimentalTextApi::class)
fun copy(
color: Color = this.spanStyle.color,
fontSize: TextUnit = this.spanStyle.fontSize,
@@ -686,7 +686,12 @@
)
}
- @OptIn(ExperimentalTextApi::class)
+ @Deprecated(
+ "TextStyle copy constructors that do not take new stable parameters " +
+ "like LineBreak, Hyphens, and TextMotion are deprecated. Please use the new stable " +
+ "copy constructor.",
+ level = DeprecationLevel.HIDDEN
+ )
fun copy(
color: Color = this.spanStyle.color,
fontSize: TextUnit = this.spanStyle.fontSize,
@@ -749,7 +754,6 @@
)
}
- @ExperimentalTextApi
fun copy(
color: Color = this.spanStyle.color,
fontSize: TextUnit = this.spanStyle.fontSize,
@@ -814,7 +818,6 @@
)
}
- @ExperimentalTextApi
fun copy(
brush: Brush?,
alpha: Float = this.spanStyle.alpha,
@@ -880,9 +883,6 @@
/**
* The brush to use when drawing text. If not null, overrides [color].
*/
- @ExperimentalTextApi
- @Suppress("OPT_IN_MARKER_ON_WRONG_TARGET")
- @get:ExperimentalTextApi
val brush: Brush? get() = this.spanStyle.brush
/**
@@ -894,9 +894,6 @@
* Opacity of text. This value is either provided along side Brush, or via alpha channel in
* color.
*/
- @ExperimentalTextApi
- @Suppress("OPT_IN_MARKER_ON_WRONG_TARGET")
- @get:ExperimentalTextApi
val alpha: Float get() = this.spanStyle.alpha
/**
@@ -972,9 +969,6 @@
/**
* Drawing style of text, whether fill in the text while drawing or stroke around the edges.
*/
- @ExperimentalTextApi
- @Suppress("OPT_IN_MARKER_ON_WRONG_TARGET")
- @get:ExperimentalTextApi
val drawStyle: DrawStyle? get() = this.spanStyle.drawStyle
/**
@@ -1022,9 +1016,6 @@
/**
* Text character placement configuration, whether to optimize for animated or static text.
*/
- @ExperimentalTextApi
- @Suppress("OPT_IN_MARKER_ON_WRONG_TARGET")
- @get:ExperimentalTextApi
val textMotion: TextMotion? get() = this.paragraphStyle.textMotion
override fun equals(other: Any?): Boolean {
@@ -1070,7 +1061,6 @@
return result
}
- @OptIn(ExperimentalTextApi::class)
override fun toString(): String {
return "TextStyle(" +
"color=$color, " +
diff --git a/compose/ui/ui-text/src/skikoMain/kotlin/androidx/compose/ui/text/Paragraph.skiko.kt b/compose/ui/ui-text/src/skikoMain/kotlin/androidx/compose/ui/text/Paragraph.skiko.kt
index 7bbfe8d..83ba3cb 100644
--- a/compose/ui/ui-text/src/skikoMain/kotlin/androidx/compose/ui/text/Paragraph.skiko.kt
+++ b/compose/ui/ui-text/src/skikoMain/kotlin/androidx/compose/ui/text/Paragraph.skiko.kt
@@ -58,7 +58,6 @@
actual fun getBoundingBox(offset: Int): Rect
actual fun getWordBoundary(offset: Int): TextRange
actual fun paint(canvas: Canvas, color: Color, shadow: Shadow?, textDecoration: TextDecoration?)
- @ExperimentalTextApi
actual fun paint(
canvas: Canvas,
color: Color,
@@ -67,7 +66,6 @@
drawStyle: DrawStyle?,
blendMode: BlendMode
)
- @ExperimentalTextApi
actual fun paint(
canvas: Canvas,
brush: Brush,
diff --git a/compose/ui/ui-text/src/skikoMain/kotlin/androidx/compose/ui/text/SkiaParagraph.skiko.kt b/compose/ui/ui-text/src/skikoMain/kotlin/androidx/compose/ui/text/SkiaParagraph.skiko.kt
index 5ecc8b4..b91bd0f 100644
--- a/compose/ui/ui-text/src/skikoMain/kotlin/androidx/compose/ui/text/SkiaParagraph.skiko.kt
+++ b/compose/ui/ui-text/src/skikoMain/kotlin/androidx/compose/ui/text/SkiaParagraph.skiko.kt
@@ -310,7 +310,6 @@
para.paint(canvas.nativeCanvas, 0.0f, 0.0f)
}
- @ExperimentalTextApi
override fun paint(
canvas: Canvas,
color: Color,
@@ -332,7 +331,6 @@
}
// TODO(b/229518449): Implement this paint function that draws text with a Brush.
- @ExperimentalTextApi
override fun paint(
canvas: Canvas,
brush: Brush,
diff --git a/compose/ui/ui-text/src/skikoMain/kotlin/androidx/compose/ui/text/style/TextMotion.skiko.kt b/compose/ui/ui-text/src/skikoMain/kotlin/androidx/compose/ui/text/style/TextMotion.skiko.kt
index 67749c5..63c3537 100644
--- a/compose/ui/ui-text/src/skikoMain/kotlin/androidx/compose/ui/text/style/TextMotion.skiko.kt
+++ b/compose/ui/ui-text/src/skikoMain/kotlin/androidx/compose/ui/text/style/TextMotion.skiko.kt
@@ -17,10 +17,8 @@
package androidx.compose.ui.text.style
import androidx.compose.runtime.Immutable
-import androidx.compose.ui.text.ExperimentalTextApi
@Immutable
-@ExperimentalTextApi
actual class TextMotion private constructor() {
actual companion object {
actual val Static: TextMotion = TextMotion()
diff --git a/compose/ui/ui-text/src/test/java/androidx/compose/ui/text/SpanStyleTest.kt b/compose/ui/ui-text/src/test/java/androidx/compose/ui/text/SpanStyleTest.kt
index fa5f81c..3872a3b 100644
--- a/compose/ui/ui-text/src/test/java/androidx/compose/ui/text/SpanStyleTest.kt
+++ b/compose/ui/ui-text/src/test/java/androidx/compose/ui/text/SpanStyleTest.kt
@@ -44,7 +44,6 @@
@RunWith(JUnit4::class)
class SpanStyleTest {
- @OptIn(ExperimentalTextApi::class)
@Test
fun `constructor with default values`() {
val style = SpanStyle()
@@ -62,7 +61,6 @@
assertThat(style.drawStyle).isNull()
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun `constructor with customized brush`() {
val brush = Brush.linearGradient(colors = listOf(Color.Blue, Color.Red))
@@ -72,7 +70,6 @@
assertThat(style.brush).isEqualTo(brush)
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun `constructor with customized brush and alpha`() {
val brush = Brush.linearGradient(colors = listOf(Color.Blue, Color.Red))
@@ -83,7 +80,6 @@
assertThat(style.alpha).isEqualTo(0.3f)
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun `constructor with gradient brush has unspecified color`() {
val brush = Brush.linearGradient(colors = listOf(Color.Blue, Color.Red))
@@ -93,7 +89,6 @@
assertThat(style.color).isEqualTo(Color.Unspecified)
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun `constructor with SolidColor converts to regular color`() {
val brush = SolidColor(Color.Red)
@@ -112,7 +107,6 @@
assertThat(style.color).isEqualTo(color)
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun `constructor with half-transparent color`() {
val color = Color.Red.copy(alpha = 0.5f)
@@ -204,7 +198,6 @@
assertThat(style.fontFamily).isEqualTo(fontFamily)
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun `constructor with customized drawStyle`() {
val stroke = Stroke(width = 4f)
@@ -461,7 +454,6 @@
assertThat(mergedStyle.platformStyle).isNull()
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun `merge with brush has other brush and no color`() {
val brush = Brush.linearGradient(listOf(Color.Blue, Color.Red))
@@ -475,7 +467,6 @@
assertThat(mergedStyle.brush).isEqualTo(brush)
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun `merge with unspecified brush has original brush`() {
val brush = Brush.linearGradient(listOf(Color.Blue, Color.Red))
@@ -489,7 +480,6 @@
assertThat(mergedStyle.brush).isEqualTo(brush)
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun `merge brush with brush uses other's alpha`() {
val brush = Brush.linearGradient(listOf(Color.Blue, Color.Red))
@@ -504,7 +494,6 @@
assertThat(mergedStyle.alpha).isEqualTo(0.6f)
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun `merge brush with brush uses current alpha if other's is NaN`() {
val brush = Brush.linearGradient(listOf(Color.Blue, Color.Red))
@@ -519,7 +508,6 @@
assertThat(mergedStyle.alpha).isEqualTo(0.3f)
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun `merge with other's drawStyle is null should use this' drawStyle`() {
val drawStyle1 = Stroke(cap = StrokeCap.Butt)
@@ -530,7 +518,6 @@
assertThat(newSpanStyle.drawStyle).isEqualTo(drawStyle1)
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun `merge with other's drawStyle is set should use other's drawStyle`() {
val drawStyle1 = Stroke(cap = StrokeCap.Butt)
@@ -890,7 +877,6 @@
assertThat(lerpedStyle.platformStyle).isNull()
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun `lerp brush with a specified, b specified and t is smaller than half`() {
val brush = Brush.linearGradient(listOf(Color.Blue, Color.Red))
@@ -903,7 +889,6 @@
assertThat(newStyle.color).isEqualTo(Color.Unspecified)
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun `lerp brush with a specified, b specified and t is larger than half`() {
val brush = Brush.linearGradient(listOf(Color.Blue, Color.Red))
@@ -916,7 +901,6 @@
assertThat(newStyle.color).isEqualTo(Color.Red)
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun `lerp brush with a specified, b not specified and t is larger than half`() {
val brush = Brush.linearGradient(listOf(Color.Blue, Color.Red))
diff --git a/compose/ui/ui-text/src/test/java/androidx/compose/ui/text/TextStyleLayoutAttributesTest.kt b/compose/ui/ui-text/src/test/java/androidx/compose/ui/text/TextStyleLayoutAttributesTest.kt
index a9c8a9f..d6376fd 100644
--- a/compose/ui/ui-text/src/test/java/androidx/compose/ui/text/TextStyleLayoutAttributesTest.kt
+++ b/compose/ui/ui-text/src/test/java/androidx/compose/ui/text/TextStyleLayoutAttributesTest.kt
@@ -75,7 +75,6 @@
).isTrue()
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun returns_true_for_color_to_brush_change() {
val style = TextStyle(color = Color.Red)
@@ -84,7 +83,6 @@
).isTrue()
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun returns_true_for_brush_to_color_change() {
val style = TextStyle(brush = SolidColor(Color.Green))
@@ -93,7 +91,6 @@
).isTrue()
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun returns_true_for_brush_solid_color_change() {
val style = TextStyle(brush = SolidColor(Color.Red))
@@ -103,7 +100,6 @@
).isTrue()
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun returns_true_for_brush_shader_change() {
val style = TextStyle(brush = Brush.linearGradient(listOf(Color.Black, Color.White)))
@@ -114,7 +110,6 @@
).isTrue()
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun returns_true_for_brush_alpha_change() {
val brush = Brush.linearGradient(listOf(Color.Black, Color.White))
diff --git a/compose/ui/ui-text/src/test/java/androidx/compose/ui/text/TextStyleResolveDefaultsTest.kt b/compose/ui/ui-text/src/test/java/androidx/compose/ui/text/TextStyleResolveDefaultsTest.kt
index 5bff8e8..167bd68 100644
--- a/compose/ui/ui-text/src/test/java/androidx/compose/ui/text/TextStyleResolveDefaultsTest.kt
+++ b/compose/ui/ui-text/src/test/java/androidx/compose/ui/text/TextStyleResolveDefaultsTest.kt
@@ -49,7 +49,6 @@
private val DefaultLineHeight = TextUnit.Unspecified
private val DefaultColor = Color.Black
- @OptIn(ExperimentalTextApi::class)
@Test
fun test_default_values() {
// We explicitly expect the default values since we do not want to change these values.
@@ -79,7 +78,6 @@
}
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun test_use_provided_values_brush() {
val brush = Brush.linearGradient(listOf(Color.White, Color.Black))
@@ -102,7 +100,6 @@
).isEqualTo(Hyphens.Auto)
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun test_use_provided_values_shader_brush_color_unspecified() {
val brush = Brush.linearGradient(listOf(Color.White, Color.Black))
diff --git a/compose/ui/ui-text/src/test/java/androidx/compose/ui/text/TextStyleTest.kt b/compose/ui/ui-text/src/test/java/androidx/compose/ui/text/TextStyleTest.kt
index c6cff1d..8886cf9 100644
--- a/compose/ui/ui-text/src/test/java/androidx/compose/ui/text/TextStyleTest.kt
+++ b/compose/ui/ui-text/src/test/java/androidx/compose/ui/text/TextStyleTest.kt
@@ -56,7 +56,6 @@
@RunWith(JUnit4::class)
class TextStyleTest {
- @OptIn(ExperimentalTextApi::class)
@Test
fun `constructor with default values`() {
val style = TextStyle()
@@ -85,7 +84,6 @@
assertThat(style.lineBreak).isNull()
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun `constructor with customized brush`() {
val brush = Brush.linearGradient(colors = listOf(Color.Blue, Color.Red))
@@ -95,7 +93,6 @@
assertThat(style.brush).isEqualTo(brush)
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun `constructor with customized brush and alpha`() {
val brush = Brush.linearGradient(colors = listOf(Color.Blue, Color.Red))
@@ -106,7 +103,6 @@
assertThat(style.alpha).isEqualTo(0.3f)
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun `constructor with gradient brush has unspecified color`() {
val brush = Brush.linearGradient(colors = listOf(Color.Blue, Color.Red))
@@ -116,7 +112,6 @@
assertThat(style.color).isEqualTo(Color.Unspecified)
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun `constructor with SolidColor converts to regular color`() {
val brush = SolidColor(Color.Red)
@@ -126,7 +121,6 @@
assertThat(style.color).isEqualTo(Color.Red)
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun `constructor with customized textMotion`() {
val style = TextStyle(textMotion = TextMotion.Animated)
@@ -134,7 +128,6 @@
assertThat(style.textMotion).isEqualTo(TextMotion.Animated)
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun `empty copy with existing brush should not remove brush`() {
val brush = Brush.linearGradient(listOf(Color.Red, Color.Blue))
@@ -151,7 +144,6 @@
assertThat(style.copy().color).isEqualTo(Color.Red)
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun `empty copy with existing drawStyle should not remove drawStyle`() {
val style = TextStyle(drawStyle = Stroke(2f))
@@ -160,7 +152,6 @@
}
@Suppress("DEPRECATION")
- @OptIn(ExperimentalTextApi::class)
@Test
fun `platformTextStyle copy with existing drawStyle should not remove drawStyle`() {
val style = TextStyle(drawStyle = Stroke(2f))
@@ -170,7 +161,6 @@
).isEqualTo(Stroke(2f))
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun `empty copy with existing hyphens should not remove hyphens`() {
val style = TextStyle(hyphens = Hyphens.Auto)
@@ -185,7 +175,6 @@
assertThat(style.copy(hyphens = Hyphens.None).hyphens).isEqualTo(Hyphens.None)
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun `brush copy with existing color should remove color`() {
val style = TextStyle(color = Color.Red)
@@ -197,7 +186,6 @@
}
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun `color copy with existing brush should remove brush`() {
val brush = Brush.linearGradient(listOf(Color.Red, Color.Blue))
@@ -209,7 +197,6 @@
}
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun `copy with textMotion returns new textMotion`() {
val style = TextStyle(textMotion = TextMotion.Animated)
@@ -246,7 +233,6 @@
assertThat(style.color).isEqualTo(color)
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun `constructor with half-transparent color`() {
val color = Color.Red.copy(alpha = 0.5f)
@@ -365,7 +351,6 @@
assertThat(style.lineBreak).isEqualTo(LineBreak.Heading)
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun `constructor with customized drawStyle`() {
val stroke = Stroke(width = 8f)
@@ -593,7 +578,6 @@
assertThat(newStyle.textDecoration).isEqualTo(otherStyle.textDecoration)
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun `merge with other's drawStyle is null should use this' drawStyle`() {
val drawStyle1 = Stroke(cap = StrokeCap.Butt)
@@ -604,7 +588,6 @@
assertThat(newTextStyle.drawStyle).isEqualTo(drawStyle1)
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun `merge with other's drawStyle is set should use other's drawStyle`() {
val drawStyle1 = Stroke(cap = StrokeCap.Butt)
@@ -758,7 +741,6 @@
assertThat(mergedStyle.platformStyle).isNull()
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun `merge with brush has other brush and no color`() {
val brush = Brush.linearGradient(listOf(Color.Blue, Color.Red))
@@ -772,7 +754,6 @@
assertThat(mergedStyle.brush).isEqualTo(brush)
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun `merge with unspecified brush has original brush`() {
val brush = Brush.linearGradient(listOf(Color.Blue, Color.Red))
@@ -786,7 +767,6 @@
assertThat(mergedStyle.brush).isEqualTo(brush)
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun `merge brush with brush uses other's alpha`() {
val brush = Brush.linearGradient(listOf(Color.Blue, Color.Red))
@@ -801,7 +781,6 @@
assertThat(mergedStyle.alpha).isEqualTo(0.6f)
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun `merge brush with brush uses current alpha if other's is NaN`() {
val brush = Brush.linearGradient(listOf(Color.Blue, Color.Red))
@@ -856,7 +835,6 @@
assertThat(mergedStyle.lineBreak).isEqualTo(otherStyle.lineBreak)
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun `merge null and non-null textMotion uses other's textMotion`() {
val style = TextStyle(textMotion = null)
@@ -867,7 +845,6 @@
assertThat(mergedStyle.textMotion).isEqualTo(otherStyle.textMotion)
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun `merge non-null and null textMotion uses original`() {
val style = TextStyle(textMotion = TextMotion.Animated)
@@ -878,7 +855,6 @@
assertThat(mergedStyle.textMotion).isEqualTo(style.textMotion)
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun `merge with both null textMotion uses null`() {
val style = TextStyle(textMotion = null)
@@ -889,7 +865,6 @@
assertThat(mergedStyle.textMotion).isEqualTo(null)
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun `merge with both non-null textMotion uses other's textMotion`() {
val style = TextStyle(textMotion = TextMotion.Animated)
@@ -1290,7 +1265,6 @@
assertThat(newStyle.textDecoration).isEqualTo(decoration2)
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun `lerp drawStyle with a and b are not null and fraction is smaller than half`() {
val drawStyle1 = Fill
@@ -1304,7 +1278,6 @@
assertThat(newStyle.drawStyle).isEqualTo(drawStyle1)
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun `lerp drawStyle with a and b are not null and fraction is larger than half`() {
val drawStyle1 = Fill
@@ -1453,7 +1426,6 @@
assertThat(newStyle.platformStyle).isEqualTo(style.platformStyle)
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun `lerp brush with a specified, b specified and t is smaller than half`() {
val brush = Brush.linearGradient(listOf(Color.Blue, Color.Red))
@@ -1466,7 +1438,6 @@
assertThat(newStyle.color).isEqualTo(Color.Unspecified)
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun `lerp brush with a specified, b specified and t is larger than half`() {
val brush = Brush.linearGradient(listOf(Color.Blue, Color.Red))
@@ -1479,7 +1450,6 @@
assertThat(newStyle.color).isEqualTo(Color.Red)
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun `lerp brush with a specified, b not specified and t is larger than half`() {
val brush = Brush.linearGradient(listOf(Color.Blue, Color.Red))
@@ -1532,7 +1502,6 @@
assertThat(lerpedStyle.lineBreak).isSameInstanceAs(otherStyle.lineBreak)
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun `lerp with non-null start, null end, closer to start has non-null textMotion`() {
val style = TextStyle(textMotion = TextMotion.Animated)
@@ -1543,7 +1512,6 @@
assertThat(lerpedStyle.textMotion).isSameInstanceAs(style.textMotion)
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun `lerp with non-null start, null end, closer to end has null textMotion`() {
val style = TextStyle(textMotion = TextMotion.Animated)
@@ -1554,7 +1522,6 @@
assertThat(lerpedStyle.textMotion).isNull()
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun `lerp with null start, non-null end, closer to start has null textMotion`() {
val style = TextStyle(textMotion = null)
@@ -1565,7 +1532,6 @@
assertThat(lerpedStyle.textMotion).isNull()
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun `lerp with null start, non-null end, closer to end has non-null textMotion`() {
val style = TextStyle(textMotion = null)
@@ -1630,7 +1596,6 @@
)
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun `toSpanStyle return attributes with correct values for brush`() {
val brush = Brush.linearGradient(listOf(Color.Blue, Color.Red))
@@ -1688,7 +1653,6 @@
)
}
- @OptIn(ExperimentalTextApi::class)
@Test
fun `toParagraphStyle return attributes with correct values`() {
val textAlign = TextAlign.Justify
