Refactors androidx.compose.ui:ui-text to the androidx.compose.ui.text package name
Bug: b/160233169
Test: ./gradlew checkApi
Relnote: N/A
Change-Id: Ide9b7d12c9f46dac717a602592bd168312253ce6
diff --git a/compose/compose-runtime/compose-runtime-benchmark/src/androidTest/java/androidx/compose/benchmark/siblings/SiblingManagement.kt b/compose/compose-runtime/compose-runtime-benchmark/src/androidTest/java/androidx/compose/benchmark/siblings/SiblingManagement.kt
index b848e96..5ad9bf0 100644
--- a/compose/compose-runtime/compose-runtime-benchmark/src/androidTest/java/androidx/compose/benchmark/siblings/SiblingManagement.kt
+++ b/compose/compose-runtime/compose-runtime-benchmark/src/androidTest/java/androidx/compose/benchmark/siblings/SiblingManagement.kt
@@ -28,7 +28,7 @@
import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.ui.text.TextStyle
+import androidx.compose.ui.text.TextStyle
import kotlin.random.Random
val blackBackground = Modifier.background(color = Color.Black)
diff --git a/compose/compose-runtime/samples/src/main/java/androidx/compose/samples/ModelSamples.kt b/compose/compose-runtime/samples/src/main/java/androidx/compose/samples/ModelSamples.kt
index 1c9369d..4d46770 100644
--- a/compose/compose-runtime/samples/src/main/java/androidx/compose/samples/ModelSamples.kt
+++ b/compose/compose-runtime/samples/src/main/java/androidx/compose/samples/ModelSamples.kt
@@ -24,7 +24,7 @@
import androidx.compose.getValue
import androidx.compose.setValue
import androidx.compose.state
-import androidx.ui.input.TextFieldValue
+import androidx.compose.ui.text.input.TextFieldValue
import androidx.ui.material.Button
@Composable
diff --git a/compose/compose-runtime/samples/src/main/java/androidx/compose/samples/MutableStateListSamples.kt b/compose/compose-runtime/samples/src/main/java/androidx/compose/samples/MutableStateListSamples.kt
index 3541075..01bf602 100644
--- a/compose/compose-runtime/samples/src/main/java/androidx/compose/samples/MutableStateListSamples.kt
+++ b/compose/compose-runtime/samples/src/main/java/androidx/compose/samples/MutableStateListSamples.kt
@@ -25,7 +25,7 @@
import androidx.compose.mutableStateListOf
import androidx.compose.state
import androidx.compose.foundation.Text
-import androidx.ui.input.TextFieldValue
+import androidx.compose.ui.text.input.TextFieldValue
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.ui.material.Button
diff --git a/compose/compose-runtime/samples/src/main/java/androidx/compose/samples/MutableStateMapSample.kt b/compose/compose-runtime/samples/src/main/java/androidx/compose/samples/MutableStateMapSample.kt
index fb45ffd..8d3b211 100644
--- a/compose/compose-runtime/samples/src/main/java/androidx/compose/samples/MutableStateMapSample.kt
+++ b/compose/compose-runtime/samples/src/main/java/androidx/compose/samples/MutableStateMapSample.kt
@@ -25,7 +25,7 @@
import androidx.compose.mutableStateMapOf
import androidx.compose.state
import androidx.compose.foundation.Text
-import androidx.ui.input.TextFieldValue
+import androidx.compose.ui.text.input.TextFieldValue
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.ui.material.Button
diff --git a/ui/integration-tests/benchmark/src/androidTest/java/androidx/ui/text/FrameworkTextLayoutBenchmark.kt b/ui/integration-tests/benchmark/src/androidTest/java/androidx/compose/ui/text/FrameworkTextLayoutBenchmark.kt
similarity index 98%
rename from ui/integration-tests/benchmark/src/androidTest/java/androidx/ui/text/FrameworkTextLayoutBenchmark.kt
rename to ui/integration-tests/benchmark/src/androidTest/java/androidx/compose/ui/text/FrameworkTextLayoutBenchmark.kt
index a6c73df..c47096e4 100644
--- a/ui/integration-tests/benchmark/src/androidTest/java/androidx/ui/text/FrameworkTextLayoutBenchmark.kt
+++ b/ui/integration-tests/benchmark/src/androidTest/java/androidx/compose/ui/text/FrameworkTextLayoutBenchmark.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.text
+package androidx.compose.ui.text
import android.content.Context
import android.graphics.Color
diff --git a/ui/integration-tests/benchmark/src/androidTest/java/androidx/ui/text/ParagraphBenchmark.kt b/ui/integration-tests/benchmark/src/androidTest/java/androidx/compose/ui/text/ParagraphBenchmark.kt
similarity index 98%
rename from ui/integration-tests/benchmark/src/androidTest/java/androidx/ui/text/ParagraphBenchmark.kt
rename to ui/integration-tests/benchmark/src/androidTest/java/androidx/compose/ui/text/ParagraphBenchmark.kt
index 9013115..2ff1be4 100644
--- a/ui/integration-tests/benchmark/src/androidTest/java/androidx/ui/text/ParagraphBenchmark.kt
+++ b/ui/integration-tests/benchmark/src/androidTest/java/androidx/compose/ui/text/ParagraphBenchmark.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.text
+package androidx.compose.ui.text
import android.content.Context
import android.util.TypedValue
@@ -31,7 +31,7 @@
import androidx.ui.integration.test.TextBenchmarkTestRule
import androidx.ui.integration.test.TextType
import androidx.ui.integration.test.cartesian
-import androidx.ui.text.font.Font
+import androidx.compose.ui.text.font.Font
import org.junit.Before
import org.junit.Rule
import org.junit.Test
diff --git a/ui/integration-tests/benchmark/src/androidTest/java/androidx/ui/text/ParagraphMethodBenchmark.kt b/ui/integration-tests/benchmark/src/androidTest/java/androidx/compose/ui/text/ParagraphMethodBenchmark.kt
similarity index 98%
rename from ui/integration-tests/benchmark/src/androidTest/java/androidx/ui/text/ParagraphMethodBenchmark.kt
rename to ui/integration-tests/benchmark/src/androidTest/java/androidx/compose/ui/text/ParagraphMethodBenchmark.kt
index 16c542d..507259a 100644
--- a/ui/integration-tests/benchmark/src/androidTest/java/androidx/ui/text/ParagraphMethodBenchmark.kt
+++ b/ui/integration-tests/benchmark/src/androidTest/java/androidx/compose/ui/text/ParagraphMethodBenchmark.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.text
+package androidx.compose.ui.text
import androidx.benchmark.junit4.BenchmarkRule
import androidx.benchmark.junit4.measureRepeated
@@ -24,7 +24,7 @@
import androidx.ui.integration.test.TextBenchmarkTestRule
import androidx.ui.integration.test.TextType
import androidx.ui.integration.test.cartesian
-import androidx.ui.text.font.Font
+import androidx.compose.ui.text.font.Font
import androidx.ui.unit.Density
import androidx.ui.unit.sp
import org.junit.Rule
diff --git a/ui/integration-tests/benchmark/src/androidTest/java/androidx/ui/text/TextDelegateBenchmark.kt b/ui/integration-tests/benchmark/src/androidTest/java/androidx/compose/ui/text/TextDelegateBenchmark.kt
similarity index 98%
rename from ui/integration-tests/benchmark/src/androidTest/java/androidx/ui/text/TextDelegateBenchmark.kt
rename to ui/integration-tests/benchmark/src/androidTest/java/androidx/compose/ui/text/TextDelegateBenchmark.kt
index 6fcff27..ed454ce 100644
--- a/ui/integration-tests/benchmark/src/androidTest/java/androidx/ui/text/TextDelegateBenchmark.kt
+++ b/ui/integration-tests/benchmark/src/androidTest/java/androidx/compose/ui/text/TextDelegateBenchmark.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.text
+package androidx.compose.ui.text
import android.content.Context
import android.util.TypedValue
@@ -32,7 +32,7 @@
import androidx.ui.integration.test.RandomTextGenerator
import androidx.ui.integration.test.TextBenchmarkTestRule
import androidx.ui.integration.test.cartesian
-import androidx.ui.text.font.Font
+import androidx.compose.ui.text.font.Font
import androidx.ui.unit.Density
import androidx.ui.unit.sp
import org.junit.Before
diff --git a/ui/integration-tests/benchmark/src/androidTest/java/androidx/ui/input/EditProcessorBenchmark.kt b/ui/integration-tests/benchmark/src/androidTest/java/androidx/compose/ui/text/input/EditProcessorBenchmark.kt
similarity index 96%
rename from ui/integration-tests/benchmark/src/androidTest/java/androidx/ui/input/EditProcessorBenchmark.kt
rename to ui/integration-tests/benchmark/src/androidTest/java/androidx/compose/ui/text/input/EditProcessorBenchmark.kt
index 3f9c70e..f30d311 100644
--- a/ui/integration-tests/benchmark/src/androidTest/java/androidx/ui/input/EditProcessorBenchmark.kt
+++ b/ui/integration-tests/benchmark/src/androidTest/java/androidx/compose/ui/text/input/EditProcessorBenchmark.kt
@@ -14,15 +14,15 @@
* limitations under the License.
*/
-package androidx.ui.input
+package androidx.compose.ui.text.input
import androidx.benchmark.junit4.BenchmarkRule
import androidx.benchmark.junit4.measureRepeated
import androidx.test.filters.LargeTest
import androidx.ui.integration.test.RandomTextGenerator
import androidx.ui.integration.test.cartesian
-import androidx.ui.text.InternalTextApi
-import androidx.ui.text.TextRange
+import androidx.compose.ui.text.InternalTextApi
+import androidx.compose.ui.text.TextRange
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/ui/integration-tests/benchmark/src/androidTest/java/androidx/ui/input/GapBufferBenchmark.kt b/ui/integration-tests/benchmark/src/androidTest/java/androidx/compose/ui/text/input/GapBufferBenchmark.kt
similarity index 97%
rename from ui/integration-tests/benchmark/src/androidTest/java/androidx/ui/input/GapBufferBenchmark.kt
rename to ui/integration-tests/benchmark/src/androidTest/java/androidx/compose/ui/text/input/GapBufferBenchmark.kt
index 757b3cd..4ad4255 100644
--- a/ui/integration-tests/benchmark/src/androidTest/java/androidx/ui/input/GapBufferBenchmark.kt
+++ b/ui/integration-tests/benchmark/src/androidTest/java/androidx/compose/ui/text/input/GapBufferBenchmark.kt
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-package androidx.ui.input
+package androidx.compose.ui.text.input
import androidx.benchmark.junit4.BenchmarkRule
import androidx.benchmark.junit4.measureRepeated
import androidx.test.filters.LargeTest
import androidx.ui.integration.test.RandomTextGenerator
-import androidx.ui.text.InternalTextApi
+import androidx.compose.ui.text.InternalTextApi
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/ui/integration-tests/benchmark/src/androidTest/java/androidx/ui/intl/LocaleListBenchmark.kt b/ui/integration-tests/benchmark/src/androidTest/java/androidx/compose/ui/text/intl/LocaleListBenchmark.kt
similarity index 97%
rename from ui/integration-tests/benchmark/src/androidTest/java/androidx/ui/intl/LocaleListBenchmark.kt
rename to ui/integration-tests/benchmark/src/androidTest/java/androidx/compose/ui/text/intl/LocaleListBenchmark.kt
index 666256b..124d23b 100644
--- a/ui/integration-tests/benchmark/src/androidTest/java/androidx/ui/intl/LocaleListBenchmark.kt
+++ b/ui/integration-tests/benchmark/src/androidTest/java/androidx/compose/ui/text/intl/LocaleListBenchmark.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.intl
+package androidx.compose.ui.text.intl
import androidx.benchmark.junit4.BenchmarkRule
import androidx.benchmark.junit4.measureRepeated
diff --git a/ui/integration-tests/demos/src/main/java/androidx/ui/demos/DemoApp.kt b/ui/integration-tests/demos/src/main/java/androidx/ui/demos/DemoApp.kt
index c1113bc..cc5425e 100644
--- a/ui/integration-tests/demos/src/main/java/androidx/ui/demos/DemoApp.kt
+++ b/ui/integration-tests/demos/src/main/java/androidx/ui/demos/DemoApp.kt
@@ -33,7 +33,7 @@
import androidx.compose.foundation.Icon
import androidx.compose.foundation.ScrollableColumn
import androidx.compose.foundation.Text
-import androidx.ui.input.TextFieldValue
+import androidx.compose.ui.text.input.TextFieldValue
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.preferredHeight
diff --git a/ui/integration-tests/demos/src/main/java/androidx/ui/demos/DemoFilter.kt b/ui/integration-tests/demos/src/main/java/androidx/ui/demos/DemoFilter.kt
index 2331cd4..db237b8 100644
--- a/ui/integration-tests/demos/src/main/java/androidx/ui/demos/DemoFilter.kt
+++ b/ui/integration-tests/demos/src/main/java/androidx/ui/demos/DemoFilter.kt
@@ -29,7 +29,7 @@
import androidx.compose.foundation.BaseTextField
import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.ui.graphics.compositeOver
-import androidx.ui.input.TextFieldValue
+import androidx.compose.ui.text.input.TextFieldValue
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.preferredHeight
import androidx.compose.foundation.layout.wrapContentSize
@@ -39,9 +39,9 @@
import androidx.ui.material.TopAppBar
import androidx.ui.material.icons.Icons
import androidx.ui.material.icons.filled.Close
-import androidx.ui.text.SpanStyle
-import androidx.ui.text.annotatedString
-import androidx.ui.text.withStyle
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.annotatedString
+import androidx.compose.ui.text.withStyle
import androidx.ui.unit.dp
/**
diff --git a/ui/integration-tests/src/main/java/androidx/ui/integration/test/TextBenchmarkHelper.kt b/ui/integration-tests/src/main/java/androidx/ui/integration/test/TextBenchmarkHelper.kt
index 231ad05..1eb21df 100644
--- a/ui/integration-tests/src/main/java/androidx/ui/integration/test/TextBenchmarkHelper.kt
+++ b/ui/integration-tests/src/main/java/androidx/ui/integration/test/TextBenchmarkHelper.kt
@@ -24,15 +24,15 @@
import androidx.ui.graphics.Canvas
import androidx.ui.graphics.Color
import androidx.ui.graphics.Shadow
-import androidx.ui.text.AnnotatedString
-import androidx.ui.intl.LocaleList
-import androidx.ui.text.SpanStyle
-import androidx.ui.text.TextStyle
-import androidx.ui.text.font.FontStyle
-import androidx.ui.text.font.FontWeight
-import androidx.ui.text.style.BaselineShift
-import androidx.ui.text.style.TextDecoration
-import androidx.ui.text.style.TextGeometricTransform
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.intl.LocaleList
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.BaselineShift
+import androidx.compose.ui.text.style.TextDecoration
+import androidx.compose.ui.text.style.TextGeometricTransform
import androidx.ui.unit.em
import androidx.ui.unit.sp
import kotlin.math.ceil
diff --git a/ui/integration-tests/src/main/java/androidx/ui/integration/test/core/text/TextMultiStyleTestCase.kt b/ui/integration-tests/src/main/java/androidx/ui/integration/test/core/text/TextMultiStyleTestCase.kt
index b633296..28ffbc7 100644
--- a/ui/integration-tests/src/main/java/androidx/ui/integration/test/core/text/TextMultiStyleTestCase.kt
+++ b/ui/integration-tests/src/main/java/androidx/ui/integration/test/core/text/TextMultiStyleTestCase.kt
@@ -25,8 +25,8 @@
import androidx.compose.foundation.layout.preferredWidth
import androidx.compose.foundation.layout.wrapContentSize
import androidx.ui.test.ComposeTestCase
-import androidx.ui.text.AnnotatedString
-import androidx.ui.text.TextStyle
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.TextStyle
import androidx.ui.unit.Dp
import androidx.ui.unit.TextUnit
diff --git a/ui/integration-tests/src/main/java/androidx/ui/integration/test/foundation/TextInColumnTestCase.kt b/ui/integration-tests/src/main/java/androidx/ui/integration/test/foundation/TextInColumnTestCase.kt
index 19d7185..83efb00 100644
--- a/ui/integration-tests/src/main/java/androidx/ui/integration/test/foundation/TextInColumnTestCase.kt
+++ b/ui/integration-tests/src/main/java/androidx/ui/integration/test/foundation/TextInColumnTestCase.kt
@@ -24,7 +24,7 @@
import androidx.ui.material.MaterialTheme
import androidx.ui.material.Surface
import androidx.ui.test.ComposeTestCase
-import androidx.ui.text.TextStyle
+import androidx.compose.ui.text.TextStyle
import androidx.ui.unit.sp
/**
diff --git a/ui/ui-animation/integration-tests/animation-demos/src/main/java/androidx/compose/animation/demos/RepeatedRotationDemo.kt b/ui/ui-animation/integration-tests/animation-demos/src/main/java/androidx/compose/animation/demos/RepeatedRotationDemo.kt
index 680ad70..e617771 100644
--- a/ui/ui-animation/integration-tests/animation-demos/src/main/java/androidx/compose/animation/demos/RepeatedRotationDemo.kt
+++ b/ui/ui-animation/integration-tests/animation-demos/src/main/java/androidx/compose/animation/demos/RepeatedRotationDemo.kt
@@ -36,7 +36,7 @@
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.preferredSize
import androidx.compose.foundation.layout.wrapContentSize
-import androidx.ui.text.TextStyle
+import androidx.compose.ui.text.TextStyle
import androidx.ui.unit.dp
import androidx.ui.unit.sp
diff --git a/ui/ui-core/api/0.1.0-dev16.txt b/ui/ui-core/api/0.1.0-dev16.txt
index a3c819d..18c76b6 100644
--- a/ui/ui-core/api/0.1.0-dev16.txt
+++ b/ui/ui-core/api/0.1.0-dev16.txt
@@ -1,4 +1,14 @@
// Signature format: 3.0
+package androidx.compose.ui.text.input {
+
+ public final class InputStateKt {
+ }
+
+ public final class RecordingInputConnectionKt {
+ }
+
+}
+
package androidx.ui.autofill {
public final class AndroidAutofillDebugUtilsKt {
@@ -178,7 +188,7 @@
method public static androidx.compose.ProvidableAmbient<androidx.ui.core.clipboard.ClipboardManager> getClipboardManagerAmbient();
method public static androidx.compose.ProvidableAmbient<androidx.ui.unit.Density> getDensityAmbient();
method public static androidx.compose.ProvidableAmbient<androidx.ui.core.hapticfeedback.HapticFeedback> getHapticFeedBackAmbient();
- method public static androidx.compose.ProvidableAmbient<androidx.ui.input.TextInputService> getTextInputServiceAmbient();
+ method public static androidx.compose.ProvidableAmbient<androidx.compose.ui.text.input.TextInputService> getTextInputServiceAmbient();
method public static androidx.compose.ProvidableAmbient<androidx.ui.core.texttoolbar.TextToolbar> getTextToolbarAmbient();
method public static androidx.compose.ProvidableAmbient<androidx.ui.platform.UriHandler> getUriHandlerAmbient();
}
@@ -658,14 +668,14 @@
method public androidx.ui.autofill.AutofillTree getAutofillTree();
method public androidx.ui.core.clipboard.ClipboardManager getClipboardManager();
method public androidx.ui.unit.Density getDensity();
- method public androidx.ui.text.font.Font.ResourceLoader getFontLoader();
+ method public androidx.compose.ui.text.font.Font.ResourceLoader getFontLoader();
method public androidx.ui.core.hapticfeedback.HapticFeedback getHapticFeedBack();
method public long getMeasureIteration();
method public androidx.ui.core.LayoutNode getRoot();
method public androidx.compose.runtime.savedinstancestate.UiSavedStateRegistry? getSavedStateRegistry();
method public androidx.ui.core.semantics.SemanticsOwner getSemanticsOwner();
method public boolean getShowLayoutBounds();
- method public androidx.ui.input.TextInputService getTextInputService();
+ method public androidx.compose.ui.text.input.TextInputService getTextInputService();
method public androidx.ui.core.texttoolbar.TextToolbar getTextToolbar();
method public void measureAndLayout();
method public void observeLayoutModelReads(androidx.ui.core.LayoutNode node, kotlin.jvm.functions.Function0<kotlin.Unit> block);
@@ -685,14 +695,14 @@
property public abstract androidx.ui.autofill.AutofillTree autofillTree;
property public abstract androidx.ui.core.clipboard.ClipboardManager clipboardManager;
property public abstract androidx.ui.unit.Density density;
- property public abstract androidx.ui.text.font.Font.ResourceLoader fontLoader;
+ property public abstract androidx.compose.ui.text.font.Font.ResourceLoader fontLoader;
property public abstract androidx.ui.core.hapticfeedback.HapticFeedback hapticFeedBack;
property public abstract long measureIteration;
property public abstract androidx.ui.core.LayoutNode root;
property public abstract androidx.compose.runtime.savedinstancestate.UiSavedStateRegistry? savedStateRegistry;
property public abstract androidx.ui.core.semantics.SemanticsOwner semanticsOwner;
property public abstract boolean showLayoutBounds;
- property public abstract androidx.ui.input.TextInputService textInputService;
+ property public abstract androidx.compose.ui.text.input.TextInputService textInputService;
property public abstract androidx.ui.core.texttoolbar.TextToolbar textToolbar;
field public static final androidx.ui.core.Owner.Companion Companion;
}
@@ -924,8 +934,8 @@
}
public interface ClipboardManager {
- method public androidx.ui.text.AnnotatedString? getText();
- method public void setText(androidx.ui.text.AnnotatedString annotatedString);
+ method public androidx.compose.ui.text.AnnotatedString? getText();
+ method public void setText(androidx.compose.ui.text.AnnotatedString annotatedString);
}
}
@@ -1897,7 +1907,7 @@
method public androidx.ui.geometry.Offset getHandlePosition(androidx.ui.core.selection.Selection selection, boolean isStartHandle);
method public androidx.ui.core.LayoutCoordinates? getLayoutCoordinates();
method public androidx.ui.core.selection.Selection? getSelection(androidx.ui.geometry.Offset startPosition, androidx.ui.geometry.Offset endPosition, androidx.ui.core.LayoutCoordinates containerLayoutCoordinates, boolean longPress, androidx.ui.core.selection.Selection? previousSelection = null, boolean isStartHandle = true);
- method public androidx.ui.text.AnnotatedString getText();
+ method public androidx.compose.ui.text.AnnotatedString getText();
}
@androidx.compose.Immutable public final class Selection {
@@ -1910,16 +1920,16 @@
method public boolean getHandlesCrossed();
method public androidx.ui.core.selection.Selection.AnchorInfo getStart();
method public androidx.ui.core.selection.Selection merge(androidx.ui.core.selection.Selection? other);
- method public androidx.ui.text.TextRange toTextRange();
+ method public androidx.compose.ui.text.TextRange toTextRange();
}
@androidx.compose.Immutable public static final class Selection.AnchorInfo {
- ctor public Selection.AnchorInfo(androidx.ui.text.style.ResolvedTextDirection direction, int offset, androidx.ui.core.selection.Selectable selectable);
- method public androidx.ui.text.style.ResolvedTextDirection component1();
+ ctor public Selection.AnchorInfo(androidx.compose.ui.text.style.ResolvedTextDirection direction, int offset, androidx.ui.core.selection.Selectable selectable);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection component1();
method public int component2();
method public androidx.ui.core.selection.Selectable component3();
- method @androidx.compose.Immutable public androidx.ui.core.selection.Selection.AnchorInfo copy(androidx.ui.text.style.ResolvedTextDirection direction, int offset, androidx.ui.core.selection.Selectable selectable);
- method public androidx.ui.text.style.ResolvedTextDirection getDirection();
+ method @androidx.compose.Immutable public androidx.ui.core.selection.Selection.AnchorInfo copy(androidx.compose.ui.text.style.ResolvedTextDirection direction, int offset, androidx.ui.core.selection.Selectable selectable);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getDirection();
method public int getOffset();
method public androidx.ui.core.selection.Selectable getSelectable();
}
@@ -2197,16 +2207,6 @@
}
-package androidx.ui.input {
-
- public final class InputStateKt {
- }
-
- public final class RecordingInputConnectionKt {
- }
-
-}
-
package androidx.ui.node {
public final class PointerInteropFilterKt {
@@ -2262,9 +2262,9 @@
}
public final class FontResourcesKt {
- method @androidx.compose.Composable public static androidx.ui.text.Typeface fontResource(androidx.ui.text.font.FontFamily fontFamily);
- method @androidx.compose.Composable public static androidx.ui.res.DeferredResource<androidx.ui.text.Typeface> loadFontResource(androidx.ui.text.font.FontFamily fontFamily, androidx.ui.text.font.FontFamily? pendingFontFamily = null, androidx.ui.text.font.FontFamily? failedFontFamily = null);
- method @androidx.compose.Composable public static androidx.ui.res.DeferredResource<androidx.ui.text.Typeface> loadFontResource(androidx.ui.text.font.FontFamily fontFamily, androidx.ui.text.Typeface? pendingTypeface = null, androidx.ui.text.Typeface? failedTypeface = null);
+ method @androidx.compose.Composable public static androidx.compose.ui.text.Typeface fontResource(androidx.compose.ui.text.font.FontFamily fontFamily);
+ method @androidx.compose.Composable public static androidx.ui.res.DeferredResource<androidx.compose.ui.text.Typeface> loadFontResource(androidx.compose.ui.text.font.FontFamily fontFamily, androidx.compose.ui.text.font.FontFamily? pendingFontFamily = null, androidx.compose.ui.text.font.FontFamily? failedFontFamily = null);
+ method @androidx.compose.Composable public static androidx.ui.res.DeferredResource<androidx.compose.ui.text.Typeface> loadFontResource(androidx.compose.ui.text.font.FontFamily fontFamily, androidx.compose.ui.text.Typeface? pendingTypeface = null, androidx.compose.ui.text.Typeface? failedTypeface = null);
}
public final class ImageResourcesKt {
@@ -2338,23 +2338,23 @@
public final class SemanticsActions {
method public androidx.ui.semantics.SemanticsPropertyKey<java.util.List<androidx.ui.semantics.CustomAccessibilityAction>> getCustomActions();
- method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.util.List<androidx.ui.text.TextLayoutResult>,java.lang.Boolean>>> getGetTextLayoutResult();
+ method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.util.List<androidx.compose.ui.text.TextLayoutResult>,java.lang.Boolean>>> getGetTextLayoutResult();
method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getOnClick();
method @Deprecated public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getScrollBackward();
method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function2<java.lang.Float,java.lang.Float,java.lang.Boolean>>> getScrollBy();
method @Deprecated public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getScrollForward();
method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.lang.Float,java.lang.Boolean>>> getSetProgress();
method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function3<java.lang.Integer,java.lang.Integer,java.lang.Boolean,java.lang.Boolean>>> getSetSelection();
- method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<androidx.ui.text.AnnotatedString,java.lang.Boolean>>> getSetText();
+ method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<androidx.compose.ui.text.AnnotatedString,java.lang.Boolean>>> getSetText();
property public final androidx.ui.semantics.SemanticsPropertyKey<java.util.List<androidx.ui.semantics.CustomAccessibilityAction>> CustomActions;
- property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.util.List<androidx.ui.text.TextLayoutResult>,java.lang.Boolean>>> GetTextLayoutResult;
+ property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.util.List<androidx.compose.ui.text.TextLayoutResult>,java.lang.Boolean>>> GetTextLayoutResult;
property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> OnClick;
property @Deprecated public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> ScrollBackward;
property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function2<java.lang.Float,java.lang.Float,java.lang.Boolean>>> ScrollBy;
property @Deprecated public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> ScrollForward;
property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.lang.Float,java.lang.Boolean>>> SetProgress;
property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function3<java.lang.Integer,java.lang.Integer,java.lang.Boolean,java.lang.Boolean>>> SetSelection;
- property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<androidx.ui.text.AnnotatedString,java.lang.Boolean>>> SetText;
+ property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<androidx.compose.ui.text.AnnotatedString,java.lang.Boolean>>> SetText;
field public static final androidx.ui.semantics.SemanticsActions INSTANCE;
}
@@ -2367,8 +2367,8 @@
method public androidx.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getHidden();
method public androidx.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getIsPopup();
method public androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> getTestTag();
- method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.text.AnnotatedString> getText();
- method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.text.TextRange> getTextSelectionRange();
+ method public androidx.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.AnnotatedString> getText();
+ method public androidx.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.TextRange> getTextSelectionRange();
property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> AccessibilityLabel;
property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityRangeInfo> AccessibilityRangeInfo;
property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> AccessibilityValue;
@@ -2377,8 +2377,8 @@
property public final androidx.ui.semantics.SemanticsPropertyKey<kotlin.Unit> Hidden;
property public final androidx.ui.semantics.SemanticsPropertyKey<kotlin.Unit> IsPopup;
property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> TestTag;
- property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.text.AnnotatedString> Text;
- property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.text.TextRange> TextSelectionRange;
+ property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.AnnotatedString> Text;
+ property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.TextRange> TextSelectionRange;
field public static final androidx.ui.semantics.SemanticsProperties INSTANCE;
}
@@ -2390,9 +2390,9 @@
method public static java.util.List<androidx.ui.semantics.CustomAccessibilityAction> getCustomActions(androidx.ui.semantics.SemanticsPropertyReceiver);
method public static boolean getFocused(androidx.ui.semantics.SemanticsPropertyReceiver);
method public static String getTestTag(androidx.ui.semantics.SemanticsPropertyReceiver);
- method public static androidx.ui.text.AnnotatedString getText(androidx.ui.semantics.SemanticsPropertyReceiver);
- method public static void getTextLayoutResult(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function1<? super java.util.List<androidx.ui.text.TextLayoutResult>,java.lang.Boolean> action);
- method public static androidx.ui.text.TextRange getTextSelectionRange(androidx.ui.semantics.SemanticsPropertyReceiver);
+ method public static androidx.compose.ui.text.AnnotatedString getText(androidx.ui.semantics.SemanticsPropertyReceiver);
+ method public static void getTextLayoutResult(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function1<? super java.util.List<androidx.compose.ui.text.TextLayoutResult>,java.lang.Boolean> action);
+ method public static androidx.compose.ui.text.TextRange getTextSelectionRange(androidx.ui.semantics.SemanticsPropertyReceiver);
method public static void hidden(androidx.ui.semantics.SemanticsPropertyReceiver);
method public static void onClick(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function0<java.lang.Boolean> action);
method public static void popup(androidx.ui.semantics.SemanticsPropertyReceiver);
@@ -2407,9 +2407,9 @@
method public static void setProgress(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Boolean> action);
method public static void setSelection(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function3<? super java.lang.Integer,? super java.lang.Integer,? super java.lang.Boolean,java.lang.Boolean> action);
method public static void setTestTag(androidx.ui.semantics.SemanticsPropertyReceiver, String p);
- method public static void setText(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.ui.text.AnnotatedString p);
- method public static void setText(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function1<? super androidx.ui.text.AnnotatedString,java.lang.Boolean> action);
- method public static void setTextSelectionRange(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.ui.text.TextRange p);
+ method public static void setText(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.text.AnnotatedString p);
+ method public static void setText(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.AnnotatedString,java.lang.Boolean> action);
+ method public static void setTextSelectionRange(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.text.TextRange p);
}
public final class SemanticsPropertyKey<T> {
diff --git a/ui/ui-core/api/current.txt b/ui/ui-core/api/current.txt
index a3c819d..18c76b6 100644
--- a/ui/ui-core/api/current.txt
+++ b/ui/ui-core/api/current.txt
@@ -1,4 +1,14 @@
// Signature format: 3.0
+package androidx.compose.ui.text.input {
+
+ public final class InputStateKt {
+ }
+
+ public final class RecordingInputConnectionKt {
+ }
+
+}
+
package androidx.ui.autofill {
public final class AndroidAutofillDebugUtilsKt {
@@ -178,7 +188,7 @@
method public static androidx.compose.ProvidableAmbient<androidx.ui.core.clipboard.ClipboardManager> getClipboardManagerAmbient();
method public static androidx.compose.ProvidableAmbient<androidx.ui.unit.Density> getDensityAmbient();
method public static androidx.compose.ProvidableAmbient<androidx.ui.core.hapticfeedback.HapticFeedback> getHapticFeedBackAmbient();
- method public static androidx.compose.ProvidableAmbient<androidx.ui.input.TextInputService> getTextInputServiceAmbient();
+ method public static androidx.compose.ProvidableAmbient<androidx.compose.ui.text.input.TextInputService> getTextInputServiceAmbient();
method public static androidx.compose.ProvidableAmbient<androidx.ui.core.texttoolbar.TextToolbar> getTextToolbarAmbient();
method public static androidx.compose.ProvidableAmbient<androidx.ui.platform.UriHandler> getUriHandlerAmbient();
}
@@ -658,14 +668,14 @@
method public androidx.ui.autofill.AutofillTree getAutofillTree();
method public androidx.ui.core.clipboard.ClipboardManager getClipboardManager();
method public androidx.ui.unit.Density getDensity();
- method public androidx.ui.text.font.Font.ResourceLoader getFontLoader();
+ method public androidx.compose.ui.text.font.Font.ResourceLoader getFontLoader();
method public androidx.ui.core.hapticfeedback.HapticFeedback getHapticFeedBack();
method public long getMeasureIteration();
method public androidx.ui.core.LayoutNode getRoot();
method public androidx.compose.runtime.savedinstancestate.UiSavedStateRegistry? getSavedStateRegistry();
method public androidx.ui.core.semantics.SemanticsOwner getSemanticsOwner();
method public boolean getShowLayoutBounds();
- method public androidx.ui.input.TextInputService getTextInputService();
+ method public androidx.compose.ui.text.input.TextInputService getTextInputService();
method public androidx.ui.core.texttoolbar.TextToolbar getTextToolbar();
method public void measureAndLayout();
method public void observeLayoutModelReads(androidx.ui.core.LayoutNode node, kotlin.jvm.functions.Function0<kotlin.Unit> block);
@@ -685,14 +695,14 @@
property public abstract androidx.ui.autofill.AutofillTree autofillTree;
property public abstract androidx.ui.core.clipboard.ClipboardManager clipboardManager;
property public abstract androidx.ui.unit.Density density;
- property public abstract androidx.ui.text.font.Font.ResourceLoader fontLoader;
+ property public abstract androidx.compose.ui.text.font.Font.ResourceLoader fontLoader;
property public abstract androidx.ui.core.hapticfeedback.HapticFeedback hapticFeedBack;
property public abstract long measureIteration;
property public abstract androidx.ui.core.LayoutNode root;
property public abstract androidx.compose.runtime.savedinstancestate.UiSavedStateRegistry? savedStateRegistry;
property public abstract androidx.ui.core.semantics.SemanticsOwner semanticsOwner;
property public abstract boolean showLayoutBounds;
- property public abstract androidx.ui.input.TextInputService textInputService;
+ property public abstract androidx.compose.ui.text.input.TextInputService textInputService;
property public abstract androidx.ui.core.texttoolbar.TextToolbar textToolbar;
field public static final androidx.ui.core.Owner.Companion Companion;
}
@@ -924,8 +934,8 @@
}
public interface ClipboardManager {
- method public androidx.ui.text.AnnotatedString? getText();
- method public void setText(androidx.ui.text.AnnotatedString annotatedString);
+ method public androidx.compose.ui.text.AnnotatedString? getText();
+ method public void setText(androidx.compose.ui.text.AnnotatedString annotatedString);
}
}
@@ -1897,7 +1907,7 @@
method public androidx.ui.geometry.Offset getHandlePosition(androidx.ui.core.selection.Selection selection, boolean isStartHandle);
method public androidx.ui.core.LayoutCoordinates? getLayoutCoordinates();
method public androidx.ui.core.selection.Selection? getSelection(androidx.ui.geometry.Offset startPosition, androidx.ui.geometry.Offset endPosition, androidx.ui.core.LayoutCoordinates containerLayoutCoordinates, boolean longPress, androidx.ui.core.selection.Selection? previousSelection = null, boolean isStartHandle = true);
- method public androidx.ui.text.AnnotatedString getText();
+ method public androidx.compose.ui.text.AnnotatedString getText();
}
@androidx.compose.Immutable public final class Selection {
@@ -1910,16 +1920,16 @@
method public boolean getHandlesCrossed();
method public androidx.ui.core.selection.Selection.AnchorInfo getStart();
method public androidx.ui.core.selection.Selection merge(androidx.ui.core.selection.Selection? other);
- method public androidx.ui.text.TextRange toTextRange();
+ method public androidx.compose.ui.text.TextRange toTextRange();
}
@androidx.compose.Immutable public static final class Selection.AnchorInfo {
- ctor public Selection.AnchorInfo(androidx.ui.text.style.ResolvedTextDirection direction, int offset, androidx.ui.core.selection.Selectable selectable);
- method public androidx.ui.text.style.ResolvedTextDirection component1();
+ ctor public Selection.AnchorInfo(androidx.compose.ui.text.style.ResolvedTextDirection direction, int offset, androidx.ui.core.selection.Selectable selectable);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection component1();
method public int component2();
method public androidx.ui.core.selection.Selectable component3();
- method @androidx.compose.Immutable public androidx.ui.core.selection.Selection.AnchorInfo copy(androidx.ui.text.style.ResolvedTextDirection direction, int offset, androidx.ui.core.selection.Selectable selectable);
- method public androidx.ui.text.style.ResolvedTextDirection getDirection();
+ method @androidx.compose.Immutable public androidx.ui.core.selection.Selection.AnchorInfo copy(androidx.compose.ui.text.style.ResolvedTextDirection direction, int offset, androidx.ui.core.selection.Selectable selectable);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getDirection();
method public int getOffset();
method public androidx.ui.core.selection.Selectable getSelectable();
}
@@ -2197,16 +2207,6 @@
}
-package androidx.ui.input {
-
- public final class InputStateKt {
- }
-
- public final class RecordingInputConnectionKt {
- }
-
-}
-
package androidx.ui.node {
public final class PointerInteropFilterKt {
@@ -2262,9 +2262,9 @@
}
public final class FontResourcesKt {
- method @androidx.compose.Composable public static androidx.ui.text.Typeface fontResource(androidx.ui.text.font.FontFamily fontFamily);
- method @androidx.compose.Composable public static androidx.ui.res.DeferredResource<androidx.ui.text.Typeface> loadFontResource(androidx.ui.text.font.FontFamily fontFamily, androidx.ui.text.font.FontFamily? pendingFontFamily = null, androidx.ui.text.font.FontFamily? failedFontFamily = null);
- method @androidx.compose.Composable public static androidx.ui.res.DeferredResource<androidx.ui.text.Typeface> loadFontResource(androidx.ui.text.font.FontFamily fontFamily, androidx.ui.text.Typeface? pendingTypeface = null, androidx.ui.text.Typeface? failedTypeface = null);
+ method @androidx.compose.Composable public static androidx.compose.ui.text.Typeface fontResource(androidx.compose.ui.text.font.FontFamily fontFamily);
+ method @androidx.compose.Composable public static androidx.ui.res.DeferredResource<androidx.compose.ui.text.Typeface> loadFontResource(androidx.compose.ui.text.font.FontFamily fontFamily, androidx.compose.ui.text.font.FontFamily? pendingFontFamily = null, androidx.compose.ui.text.font.FontFamily? failedFontFamily = null);
+ method @androidx.compose.Composable public static androidx.ui.res.DeferredResource<androidx.compose.ui.text.Typeface> loadFontResource(androidx.compose.ui.text.font.FontFamily fontFamily, androidx.compose.ui.text.Typeface? pendingTypeface = null, androidx.compose.ui.text.Typeface? failedTypeface = null);
}
public final class ImageResourcesKt {
@@ -2338,23 +2338,23 @@
public final class SemanticsActions {
method public androidx.ui.semantics.SemanticsPropertyKey<java.util.List<androidx.ui.semantics.CustomAccessibilityAction>> getCustomActions();
- method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.util.List<androidx.ui.text.TextLayoutResult>,java.lang.Boolean>>> getGetTextLayoutResult();
+ method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.util.List<androidx.compose.ui.text.TextLayoutResult>,java.lang.Boolean>>> getGetTextLayoutResult();
method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getOnClick();
method @Deprecated public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getScrollBackward();
method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function2<java.lang.Float,java.lang.Float,java.lang.Boolean>>> getScrollBy();
method @Deprecated public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getScrollForward();
method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.lang.Float,java.lang.Boolean>>> getSetProgress();
method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function3<java.lang.Integer,java.lang.Integer,java.lang.Boolean,java.lang.Boolean>>> getSetSelection();
- method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<androidx.ui.text.AnnotatedString,java.lang.Boolean>>> getSetText();
+ method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<androidx.compose.ui.text.AnnotatedString,java.lang.Boolean>>> getSetText();
property public final androidx.ui.semantics.SemanticsPropertyKey<java.util.List<androidx.ui.semantics.CustomAccessibilityAction>> CustomActions;
- property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.util.List<androidx.ui.text.TextLayoutResult>,java.lang.Boolean>>> GetTextLayoutResult;
+ property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.util.List<androidx.compose.ui.text.TextLayoutResult>,java.lang.Boolean>>> GetTextLayoutResult;
property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> OnClick;
property @Deprecated public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> ScrollBackward;
property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function2<java.lang.Float,java.lang.Float,java.lang.Boolean>>> ScrollBy;
property @Deprecated public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> ScrollForward;
property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.lang.Float,java.lang.Boolean>>> SetProgress;
property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function3<java.lang.Integer,java.lang.Integer,java.lang.Boolean,java.lang.Boolean>>> SetSelection;
- property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<androidx.ui.text.AnnotatedString,java.lang.Boolean>>> SetText;
+ property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<androidx.compose.ui.text.AnnotatedString,java.lang.Boolean>>> SetText;
field public static final androidx.ui.semantics.SemanticsActions INSTANCE;
}
@@ -2367,8 +2367,8 @@
method public androidx.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getHidden();
method public androidx.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getIsPopup();
method public androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> getTestTag();
- method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.text.AnnotatedString> getText();
- method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.text.TextRange> getTextSelectionRange();
+ method public androidx.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.AnnotatedString> getText();
+ method public androidx.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.TextRange> getTextSelectionRange();
property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> AccessibilityLabel;
property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityRangeInfo> AccessibilityRangeInfo;
property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> AccessibilityValue;
@@ -2377,8 +2377,8 @@
property public final androidx.ui.semantics.SemanticsPropertyKey<kotlin.Unit> Hidden;
property public final androidx.ui.semantics.SemanticsPropertyKey<kotlin.Unit> IsPopup;
property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> TestTag;
- property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.text.AnnotatedString> Text;
- property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.text.TextRange> TextSelectionRange;
+ property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.AnnotatedString> Text;
+ property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.TextRange> TextSelectionRange;
field public static final androidx.ui.semantics.SemanticsProperties INSTANCE;
}
@@ -2390,9 +2390,9 @@
method public static java.util.List<androidx.ui.semantics.CustomAccessibilityAction> getCustomActions(androidx.ui.semantics.SemanticsPropertyReceiver);
method public static boolean getFocused(androidx.ui.semantics.SemanticsPropertyReceiver);
method public static String getTestTag(androidx.ui.semantics.SemanticsPropertyReceiver);
- method public static androidx.ui.text.AnnotatedString getText(androidx.ui.semantics.SemanticsPropertyReceiver);
- method public static void getTextLayoutResult(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function1<? super java.util.List<androidx.ui.text.TextLayoutResult>,java.lang.Boolean> action);
- method public static androidx.ui.text.TextRange getTextSelectionRange(androidx.ui.semantics.SemanticsPropertyReceiver);
+ method public static androidx.compose.ui.text.AnnotatedString getText(androidx.ui.semantics.SemanticsPropertyReceiver);
+ method public static void getTextLayoutResult(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function1<? super java.util.List<androidx.compose.ui.text.TextLayoutResult>,java.lang.Boolean> action);
+ method public static androidx.compose.ui.text.TextRange getTextSelectionRange(androidx.ui.semantics.SemanticsPropertyReceiver);
method public static void hidden(androidx.ui.semantics.SemanticsPropertyReceiver);
method public static void onClick(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function0<java.lang.Boolean> action);
method public static void popup(androidx.ui.semantics.SemanticsPropertyReceiver);
@@ -2407,9 +2407,9 @@
method public static void setProgress(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Boolean> action);
method public static void setSelection(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function3<? super java.lang.Integer,? super java.lang.Integer,? super java.lang.Boolean,java.lang.Boolean> action);
method public static void setTestTag(androidx.ui.semantics.SemanticsPropertyReceiver, String p);
- method public static void setText(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.ui.text.AnnotatedString p);
- method public static void setText(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function1<? super androidx.ui.text.AnnotatedString,java.lang.Boolean> action);
- method public static void setTextSelectionRange(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.ui.text.TextRange p);
+ method public static void setText(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.text.AnnotatedString p);
+ method public static void setText(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.AnnotatedString,java.lang.Boolean> action);
+ method public static void setTextSelectionRange(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.text.TextRange p);
}
public final class SemanticsPropertyKey<T> {
diff --git a/ui/ui-core/api/public_plus_experimental_0.1.0-dev16.txt b/ui/ui-core/api/public_plus_experimental_0.1.0-dev16.txt
index a3c819d..18c76b6 100644
--- a/ui/ui-core/api/public_plus_experimental_0.1.0-dev16.txt
+++ b/ui/ui-core/api/public_plus_experimental_0.1.0-dev16.txt
@@ -1,4 +1,14 @@
// Signature format: 3.0
+package androidx.compose.ui.text.input {
+
+ public final class InputStateKt {
+ }
+
+ public final class RecordingInputConnectionKt {
+ }
+
+}
+
package androidx.ui.autofill {
public final class AndroidAutofillDebugUtilsKt {
@@ -178,7 +188,7 @@
method public static androidx.compose.ProvidableAmbient<androidx.ui.core.clipboard.ClipboardManager> getClipboardManagerAmbient();
method public static androidx.compose.ProvidableAmbient<androidx.ui.unit.Density> getDensityAmbient();
method public static androidx.compose.ProvidableAmbient<androidx.ui.core.hapticfeedback.HapticFeedback> getHapticFeedBackAmbient();
- method public static androidx.compose.ProvidableAmbient<androidx.ui.input.TextInputService> getTextInputServiceAmbient();
+ method public static androidx.compose.ProvidableAmbient<androidx.compose.ui.text.input.TextInputService> getTextInputServiceAmbient();
method public static androidx.compose.ProvidableAmbient<androidx.ui.core.texttoolbar.TextToolbar> getTextToolbarAmbient();
method public static androidx.compose.ProvidableAmbient<androidx.ui.platform.UriHandler> getUriHandlerAmbient();
}
@@ -658,14 +668,14 @@
method public androidx.ui.autofill.AutofillTree getAutofillTree();
method public androidx.ui.core.clipboard.ClipboardManager getClipboardManager();
method public androidx.ui.unit.Density getDensity();
- method public androidx.ui.text.font.Font.ResourceLoader getFontLoader();
+ method public androidx.compose.ui.text.font.Font.ResourceLoader getFontLoader();
method public androidx.ui.core.hapticfeedback.HapticFeedback getHapticFeedBack();
method public long getMeasureIteration();
method public androidx.ui.core.LayoutNode getRoot();
method public androidx.compose.runtime.savedinstancestate.UiSavedStateRegistry? getSavedStateRegistry();
method public androidx.ui.core.semantics.SemanticsOwner getSemanticsOwner();
method public boolean getShowLayoutBounds();
- method public androidx.ui.input.TextInputService getTextInputService();
+ method public androidx.compose.ui.text.input.TextInputService getTextInputService();
method public androidx.ui.core.texttoolbar.TextToolbar getTextToolbar();
method public void measureAndLayout();
method public void observeLayoutModelReads(androidx.ui.core.LayoutNode node, kotlin.jvm.functions.Function0<kotlin.Unit> block);
@@ -685,14 +695,14 @@
property public abstract androidx.ui.autofill.AutofillTree autofillTree;
property public abstract androidx.ui.core.clipboard.ClipboardManager clipboardManager;
property public abstract androidx.ui.unit.Density density;
- property public abstract androidx.ui.text.font.Font.ResourceLoader fontLoader;
+ property public abstract androidx.compose.ui.text.font.Font.ResourceLoader fontLoader;
property public abstract androidx.ui.core.hapticfeedback.HapticFeedback hapticFeedBack;
property public abstract long measureIteration;
property public abstract androidx.ui.core.LayoutNode root;
property public abstract androidx.compose.runtime.savedinstancestate.UiSavedStateRegistry? savedStateRegistry;
property public abstract androidx.ui.core.semantics.SemanticsOwner semanticsOwner;
property public abstract boolean showLayoutBounds;
- property public abstract androidx.ui.input.TextInputService textInputService;
+ property public abstract androidx.compose.ui.text.input.TextInputService textInputService;
property public abstract androidx.ui.core.texttoolbar.TextToolbar textToolbar;
field public static final androidx.ui.core.Owner.Companion Companion;
}
@@ -924,8 +934,8 @@
}
public interface ClipboardManager {
- method public androidx.ui.text.AnnotatedString? getText();
- method public void setText(androidx.ui.text.AnnotatedString annotatedString);
+ method public androidx.compose.ui.text.AnnotatedString? getText();
+ method public void setText(androidx.compose.ui.text.AnnotatedString annotatedString);
}
}
@@ -1897,7 +1907,7 @@
method public androidx.ui.geometry.Offset getHandlePosition(androidx.ui.core.selection.Selection selection, boolean isStartHandle);
method public androidx.ui.core.LayoutCoordinates? getLayoutCoordinates();
method public androidx.ui.core.selection.Selection? getSelection(androidx.ui.geometry.Offset startPosition, androidx.ui.geometry.Offset endPosition, androidx.ui.core.LayoutCoordinates containerLayoutCoordinates, boolean longPress, androidx.ui.core.selection.Selection? previousSelection = null, boolean isStartHandle = true);
- method public androidx.ui.text.AnnotatedString getText();
+ method public androidx.compose.ui.text.AnnotatedString getText();
}
@androidx.compose.Immutable public final class Selection {
@@ -1910,16 +1920,16 @@
method public boolean getHandlesCrossed();
method public androidx.ui.core.selection.Selection.AnchorInfo getStart();
method public androidx.ui.core.selection.Selection merge(androidx.ui.core.selection.Selection? other);
- method public androidx.ui.text.TextRange toTextRange();
+ method public androidx.compose.ui.text.TextRange toTextRange();
}
@androidx.compose.Immutable public static final class Selection.AnchorInfo {
- ctor public Selection.AnchorInfo(androidx.ui.text.style.ResolvedTextDirection direction, int offset, androidx.ui.core.selection.Selectable selectable);
- method public androidx.ui.text.style.ResolvedTextDirection component1();
+ ctor public Selection.AnchorInfo(androidx.compose.ui.text.style.ResolvedTextDirection direction, int offset, androidx.ui.core.selection.Selectable selectable);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection component1();
method public int component2();
method public androidx.ui.core.selection.Selectable component3();
- method @androidx.compose.Immutable public androidx.ui.core.selection.Selection.AnchorInfo copy(androidx.ui.text.style.ResolvedTextDirection direction, int offset, androidx.ui.core.selection.Selectable selectable);
- method public androidx.ui.text.style.ResolvedTextDirection getDirection();
+ method @androidx.compose.Immutable public androidx.ui.core.selection.Selection.AnchorInfo copy(androidx.compose.ui.text.style.ResolvedTextDirection direction, int offset, androidx.ui.core.selection.Selectable selectable);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getDirection();
method public int getOffset();
method public androidx.ui.core.selection.Selectable getSelectable();
}
@@ -2197,16 +2207,6 @@
}
-package androidx.ui.input {
-
- public final class InputStateKt {
- }
-
- public final class RecordingInputConnectionKt {
- }
-
-}
-
package androidx.ui.node {
public final class PointerInteropFilterKt {
@@ -2262,9 +2262,9 @@
}
public final class FontResourcesKt {
- method @androidx.compose.Composable public static androidx.ui.text.Typeface fontResource(androidx.ui.text.font.FontFamily fontFamily);
- method @androidx.compose.Composable public static androidx.ui.res.DeferredResource<androidx.ui.text.Typeface> loadFontResource(androidx.ui.text.font.FontFamily fontFamily, androidx.ui.text.font.FontFamily? pendingFontFamily = null, androidx.ui.text.font.FontFamily? failedFontFamily = null);
- method @androidx.compose.Composable public static androidx.ui.res.DeferredResource<androidx.ui.text.Typeface> loadFontResource(androidx.ui.text.font.FontFamily fontFamily, androidx.ui.text.Typeface? pendingTypeface = null, androidx.ui.text.Typeface? failedTypeface = null);
+ method @androidx.compose.Composable public static androidx.compose.ui.text.Typeface fontResource(androidx.compose.ui.text.font.FontFamily fontFamily);
+ method @androidx.compose.Composable public static androidx.ui.res.DeferredResource<androidx.compose.ui.text.Typeface> loadFontResource(androidx.compose.ui.text.font.FontFamily fontFamily, androidx.compose.ui.text.font.FontFamily? pendingFontFamily = null, androidx.compose.ui.text.font.FontFamily? failedFontFamily = null);
+ method @androidx.compose.Composable public static androidx.ui.res.DeferredResource<androidx.compose.ui.text.Typeface> loadFontResource(androidx.compose.ui.text.font.FontFamily fontFamily, androidx.compose.ui.text.Typeface? pendingTypeface = null, androidx.compose.ui.text.Typeface? failedTypeface = null);
}
public final class ImageResourcesKt {
@@ -2338,23 +2338,23 @@
public final class SemanticsActions {
method public androidx.ui.semantics.SemanticsPropertyKey<java.util.List<androidx.ui.semantics.CustomAccessibilityAction>> getCustomActions();
- method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.util.List<androidx.ui.text.TextLayoutResult>,java.lang.Boolean>>> getGetTextLayoutResult();
+ method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.util.List<androidx.compose.ui.text.TextLayoutResult>,java.lang.Boolean>>> getGetTextLayoutResult();
method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getOnClick();
method @Deprecated public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getScrollBackward();
method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function2<java.lang.Float,java.lang.Float,java.lang.Boolean>>> getScrollBy();
method @Deprecated public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getScrollForward();
method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.lang.Float,java.lang.Boolean>>> getSetProgress();
method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function3<java.lang.Integer,java.lang.Integer,java.lang.Boolean,java.lang.Boolean>>> getSetSelection();
- method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<androidx.ui.text.AnnotatedString,java.lang.Boolean>>> getSetText();
+ method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<androidx.compose.ui.text.AnnotatedString,java.lang.Boolean>>> getSetText();
property public final androidx.ui.semantics.SemanticsPropertyKey<java.util.List<androidx.ui.semantics.CustomAccessibilityAction>> CustomActions;
- property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.util.List<androidx.ui.text.TextLayoutResult>,java.lang.Boolean>>> GetTextLayoutResult;
+ property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.util.List<androidx.compose.ui.text.TextLayoutResult>,java.lang.Boolean>>> GetTextLayoutResult;
property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> OnClick;
property @Deprecated public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> ScrollBackward;
property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function2<java.lang.Float,java.lang.Float,java.lang.Boolean>>> ScrollBy;
property @Deprecated public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> ScrollForward;
property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.lang.Float,java.lang.Boolean>>> SetProgress;
property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function3<java.lang.Integer,java.lang.Integer,java.lang.Boolean,java.lang.Boolean>>> SetSelection;
- property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<androidx.ui.text.AnnotatedString,java.lang.Boolean>>> SetText;
+ property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<androidx.compose.ui.text.AnnotatedString,java.lang.Boolean>>> SetText;
field public static final androidx.ui.semantics.SemanticsActions INSTANCE;
}
@@ -2367,8 +2367,8 @@
method public androidx.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getHidden();
method public androidx.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getIsPopup();
method public androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> getTestTag();
- method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.text.AnnotatedString> getText();
- method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.text.TextRange> getTextSelectionRange();
+ method public androidx.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.AnnotatedString> getText();
+ method public androidx.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.TextRange> getTextSelectionRange();
property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> AccessibilityLabel;
property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityRangeInfo> AccessibilityRangeInfo;
property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> AccessibilityValue;
@@ -2377,8 +2377,8 @@
property public final androidx.ui.semantics.SemanticsPropertyKey<kotlin.Unit> Hidden;
property public final androidx.ui.semantics.SemanticsPropertyKey<kotlin.Unit> IsPopup;
property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> TestTag;
- property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.text.AnnotatedString> Text;
- property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.text.TextRange> TextSelectionRange;
+ property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.AnnotatedString> Text;
+ property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.TextRange> TextSelectionRange;
field public static final androidx.ui.semantics.SemanticsProperties INSTANCE;
}
@@ -2390,9 +2390,9 @@
method public static java.util.List<androidx.ui.semantics.CustomAccessibilityAction> getCustomActions(androidx.ui.semantics.SemanticsPropertyReceiver);
method public static boolean getFocused(androidx.ui.semantics.SemanticsPropertyReceiver);
method public static String getTestTag(androidx.ui.semantics.SemanticsPropertyReceiver);
- method public static androidx.ui.text.AnnotatedString getText(androidx.ui.semantics.SemanticsPropertyReceiver);
- method public static void getTextLayoutResult(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function1<? super java.util.List<androidx.ui.text.TextLayoutResult>,java.lang.Boolean> action);
- method public static androidx.ui.text.TextRange getTextSelectionRange(androidx.ui.semantics.SemanticsPropertyReceiver);
+ method public static androidx.compose.ui.text.AnnotatedString getText(androidx.ui.semantics.SemanticsPropertyReceiver);
+ method public static void getTextLayoutResult(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function1<? super java.util.List<androidx.compose.ui.text.TextLayoutResult>,java.lang.Boolean> action);
+ method public static androidx.compose.ui.text.TextRange getTextSelectionRange(androidx.ui.semantics.SemanticsPropertyReceiver);
method public static void hidden(androidx.ui.semantics.SemanticsPropertyReceiver);
method public static void onClick(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function0<java.lang.Boolean> action);
method public static void popup(androidx.ui.semantics.SemanticsPropertyReceiver);
@@ -2407,9 +2407,9 @@
method public static void setProgress(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Boolean> action);
method public static void setSelection(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function3<? super java.lang.Integer,? super java.lang.Integer,? super java.lang.Boolean,java.lang.Boolean> action);
method public static void setTestTag(androidx.ui.semantics.SemanticsPropertyReceiver, String p);
- method public static void setText(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.ui.text.AnnotatedString p);
- method public static void setText(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function1<? super androidx.ui.text.AnnotatedString,java.lang.Boolean> action);
- method public static void setTextSelectionRange(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.ui.text.TextRange p);
+ method public static void setText(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.text.AnnotatedString p);
+ method public static void setText(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.AnnotatedString,java.lang.Boolean> action);
+ method public static void setTextSelectionRange(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.text.TextRange p);
}
public final class SemanticsPropertyKey<T> {
diff --git a/ui/ui-core/api/public_plus_experimental_current.txt b/ui/ui-core/api/public_plus_experimental_current.txt
index a3c819d..18c76b6 100644
--- a/ui/ui-core/api/public_plus_experimental_current.txt
+++ b/ui/ui-core/api/public_plus_experimental_current.txt
@@ -1,4 +1,14 @@
// Signature format: 3.0
+package androidx.compose.ui.text.input {
+
+ public final class InputStateKt {
+ }
+
+ public final class RecordingInputConnectionKt {
+ }
+
+}
+
package androidx.ui.autofill {
public final class AndroidAutofillDebugUtilsKt {
@@ -178,7 +188,7 @@
method public static androidx.compose.ProvidableAmbient<androidx.ui.core.clipboard.ClipboardManager> getClipboardManagerAmbient();
method public static androidx.compose.ProvidableAmbient<androidx.ui.unit.Density> getDensityAmbient();
method public static androidx.compose.ProvidableAmbient<androidx.ui.core.hapticfeedback.HapticFeedback> getHapticFeedBackAmbient();
- method public static androidx.compose.ProvidableAmbient<androidx.ui.input.TextInputService> getTextInputServiceAmbient();
+ method public static androidx.compose.ProvidableAmbient<androidx.compose.ui.text.input.TextInputService> getTextInputServiceAmbient();
method public static androidx.compose.ProvidableAmbient<androidx.ui.core.texttoolbar.TextToolbar> getTextToolbarAmbient();
method public static androidx.compose.ProvidableAmbient<androidx.ui.platform.UriHandler> getUriHandlerAmbient();
}
@@ -658,14 +668,14 @@
method public androidx.ui.autofill.AutofillTree getAutofillTree();
method public androidx.ui.core.clipboard.ClipboardManager getClipboardManager();
method public androidx.ui.unit.Density getDensity();
- method public androidx.ui.text.font.Font.ResourceLoader getFontLoader();
+ method public androidx.compose.ui.text.font.Font.ResourceLoader getFontLoader();
method public androidx.ui.core.hapticfeedback.HapticFeedback getHapticFeedBack();
method public long getMeasureIteration();
method public androidx.ui.core.LayoutNode getRoot();
method public androidx.compose.runtime.savedinstancestate.UiSavedStateRegistry? getSavedStateRegistry();
method public androidx.ui.core.semantics.SemanticsOwner getSemanticsOwner();
method public boolean getShowLayoutBounds();
- method public androidx.ui.input.TextInputService getTextInputService();
+ method public androidx.compose.ui.text.input.TextInputService getTextInputService();
method public androidx.ui.core.texttoolbar.TextToolbar getTextToolbar();
method public void measureAndLayout();
method public void observeLayoutModelReads(androidx.ui.core.LayoutNode node, kotlin.jvm.functions.Function0<kotlin.Unit> block);
@@ -685,14 +695,14 @@
property public abstract androidx.ui.autofill.AutofillTree autofillTree;
property public abstract androidx.ui.core.clipboard.ClipboardManager clipboardManager;
property public abstract androidx.ui.unit.Density density;
- property public abstract androidx.ui.text.font.Font.ResourceLoader fontLoader;
+ property public abstract androidx.compose.ui.text.font.Font.ResourceLoader fontLoader;
property public abstract androidx.ui.core.hapticfeedback.HapticFeedback hapticFeedBack;
property public abstract long measureIteration;
property public abstract androidx.ui.core.LayoutNode root;
property public abstract androidx.compose.runtime.savedinstancestate.UiSavedStateRegistry? savedStateRegistry;
property public abstract androidx.ui.core.semantics.SemanticsOwner semanticsOwner;
property public abstract boolean showLayoutBounds;
- property public abstract androidx.ui.input.TextInputService textInputService;
+ property public abstract androidx.compose.ui.text.input.TextInputService textInputService;
property public abstract androidx.ui.core.texttoolbar.TextToolbar textToolbar;
field public static final androidx.ui.core.Owner.Companion Companion;
}
@@ -924,8 +934,8 @@
}
public interface ClipboardManager {
- method public androidx.ui.text.AnnotatedString? getText();
- method public void setText(androidx.ui.text.AnnotatedString annotatedString);
+ method public androidx.compose.ui.text.AnnotatedString? getText();
+ method public void setText(androidx.compose.ui.text.AnnotatedString annotatedString);
}
}
@@ -1897,7 +1907,7 @@
method public androidx.ui.geometry.Offset getHandlePosition(androidx.ui.core.selection.Selection selection, boolean isStartHandle);
method public androidx.ui.core.LayoutCoordinates? getLayoutCoordinates();
method public androidx.ui.core.selection.Selection? getSelection(androidx.ui.geometry.Offset startPosition, androidx.ui.geometry.Offset endPosition, androidx.ui.core.LayoutCoordinates containerLayoutCoordinates, boolean longPress, androidx.ui.core.selection.Selection? previousSelection = null, boolean isStartHandle = true);
- method public androidx.ui.text.AnnotatedString getText();
+ method public androidx.compose.ui.text.AnnotatedString getText();
}
@androidx.compose.Immutable public final class Selection {
@@ -1910,16 +1920,16 @@
method public boolean getHandlesCrossed();
method public androidx.ui.core.selection.Selection.AnchorInfo getStart();
method public androidx.ui.core.selection.Selection merge(androidx.ui.core.selection.Selection? other);
- method public androidx.ui.text.TextRange toTextRange();
+ method public androidx.compose.ui.text.TextRange toTextRange();
}
@androidx.compose.Immutable public static final class Selection.AnchorInfo {
- ctor public Selection.AnchorInfo(androidx.ui.text.style.ResolvedTextDirection direction, int offset, androidx.ui.core.selection.Selectable selectable);
- method public androidx.ui.text.style.ResolvedTextDirection component1();
+ ctor public Selection.AnchorInfo(androidx.compose.ui.text.style.ResolvedTextDirection direction, int offset, androidx.ui.core.selection.Selectable selectable);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection component1();
method public int component2();
method public androidx.ui.core.selection.Selectable component3();
- method @androidx.compose.Immutable public androidx.ui.core.selection.Selection.AnchorInfo copy(androidx.ui.text.style.ResolvedTextDirection direction, int offset, androidx.ui.core.selection.Selectable selectable);
- method public androidx.ui.text.style.ResolvedTextDirection getDirection();
+ method @androidx.compose.Immutable public androidx.ui.core.selection.Selection.AnchorInfo copy(androidx.compose.ui.text.style.ResolvedTextDirection direction, int offset, androidx.ui.core.selection.Selectable selectable);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getDirection();
method public int getOffset();
method public androidx.ui.core.selection.Selectable getSelectable();
}
@@ -2197,16 +2207,6 @@
}
-package androidx.ui.input {
-
- public final class InputStateKt {
- }
-
- public final class RecordingInputConnectionKt {
- }
-
-}
-
package androidx.ui.node {
public final class PointerInteropFilterKt {
@@ -2262,9 +2262,9 @@
}
public final class FontResourcesKt {
- method @androidx.compose.Composable public static androidx.ui.text.Typeface fontResource(androidx.ui.text.font.FontFamily fontFamily);
- method @androidx.compose.Composable public static androidx.ui.res.DeferredResource<androidx.ui.text.Typeface> loadFontResource(androidx.ui.text.font.FontFamily fontFamily, androidx.ui.text.font.FontFamily? pendingFontFamily = null, androidx.ui.text.font.FontFamily? failedFontFamily = null);
- method @androidx.compose.Composable public static androidx.ui.res.DeferredResource<androidx.ui.text.Typeface> loadFontResource(androidx.ui.text.font.FontFamily fontFamily, androidx.ui.text.Typeface? pendingTypeface = null, androidx.ui.text.Typeface? failedTypeface = null);
+ method @androidx.compose.Composable public static androidx.compose.ui.text.Typeface fontResource(androidx.compose.ui.text.font.FontFamily fontFamily);
+ method @androidx.compose.Composable public static androidx.ui.res.DeferredResource<androidx.compose.ui.text.Typeface> loadFontResource(androidx.compose.ui.text.font.FontFamily fontFamily, androidx.compose.ui.text.font.FontFamily? pendingFontFamily = null, androidx.compose.ui.text.font.FontFamily? failedFontFamily = null);
+ method @androidx.compose.Composable public static androidx.ui.res.DeferredResource<androidx.compose.ui.text.Typeface> loadFontResource(androidx.compose.ui.text.font.FontFamily fontFamily, androidx.compose.ui.text.Typeface? pendingTypeface = null, androidx.compose.ui.text.Typeface? failedTypeface = null);
}
public final class ImageResourcesKt {
@@ -2338,23 +2338,23 @@
public final class SemanticsActions {
method public androidx.ui.semantics.SemanticsPropertyKey<java.util.List<androidx.ui.semantics.CustomAccessibilityAction>> getCustomActions();
- method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.util.List<androidx.ui.text.TextLayoutResult>,java.lang.Boolean>>> getGetTextLayoutResult();
+ method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.util.List<androidx.compose.ui.text.TextLayoutResult>,java.lang.Boolean>>> getGetTextLayoutResult();
method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getOnClick();
method @Deprecated public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getScrollBackward();
method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function2<java.lang.Float,java.lang.Float,java.lang.Boolean>>> getScrollBy();
method @Deprecated public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getScrollForward();
method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.lang.Float,java.lang.Boolean>>> getSetProgress();
method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function3<java.lang.Integer,java.lang.Integer,java.lang.Boolean,java.lang.Boolean>>> getSetSelection();
- method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<androidx.ui.text.AnnotatedString,java.lang.Boolean>>> getSetText();
+ method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<androidx.compose.ui.text.AnnotatedString,java.lang.Boolean>>> getSetText();
property public final androidx.ui.semantics.SemanticsPropertyKey<java.util.List<androidx.ui.semantics.CustomAccessibilityAction>> CustomActions;
- property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.util.List<androidx.ui.text.TextLayoutResult>,java.lang.Boolean>>> GetTextLayoutResult;
+ property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.util.List<androidx.compose.ui.text.TextLayoutResult>,java.lang.Boolean>>> GetTextLayoutResult;
property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> OnClick;
property @Deprecated public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> ScrollBackward;
property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function2<java.lang.Float,java.lang.Float,java.lang.Boolean>>> ScrollBy;
property @Deprecated public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> ScrollForward;
property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.lang.Float,java.lang.Boolean>>> SetProgress;
property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function3<java.lang.Integer,java.lang.Integer,java.lang.Boolean,java.lang.Boolean>>> SetSelection;
- property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<androidx.ui.text.AnnotatedString,java.lang.Boolean>>> SetText;
+ property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<androidx.compose.ui.text.AnnotatedString,java.lang.Boolean>>> SetText;
field public static final androidx.ui.semantics.SemanticsActions INSTANCE;
}
@@ -2367,8 +2367,8 @@
method public androidx.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getHidden();
method public androidx.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getIsPopup();
method public androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> getTestTag();
- method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.text.AnnotatedString> getText();
- method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.text.TextRange> getTextSelectionRange();
+ method public androidx.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.AnnotatedString> getText();
+ method public androidx.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.TextRange> getTextSelectionRange();
property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> AccessibilityLabel;
property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityRangeInfo> AccessibilityRangeInfo;
property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> AccessibilityValue;
@@ -2377,8 +2377,8 @@
property public final androidx.ui.semantics.SemanticsPropertyKey<kotlin.Unit> Hidden;
property public final androidx.ui.semantics.SemanticsPropertyKey<kotlin.Unit> IsPopup;
property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> TestTag;
- property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.text.AnnotatedString> Text;
- property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.text.TextRange> TextSelectionRange;
+ property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.AnnotatedString> Text;
+ property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.TextRange> TextSelectionRange;
field public static final androidx.ui.semantics.SemanticsProperties INSTANCE;
}
@@ -2390,9 +2390,9 @@
method public static java.util.List<androidx.ui.semantics.CustomAccessibilityAction> getCustomActions(androidx.ui.semantics.SemanticsPropertyReceiver);
method public static boolean getFocused(androidx.ui.semantics.SemanticsPropertyReceiver);
method public static String getTestTag(androidx.ui.semantics.SemanticsPropertyReceiver);
- method public static androidx.ui.text.AnnotatedString getText(androidx.ui.semantics.SemanticsPropertyReceiver);
- method public static void getTextLayoutResult(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function1<? super java.util.List<androidx.ui.text.TextLayoutResult>,java.lang.Boolean> action);
- method public static androidx.ui.text.TextRange getTextSelectionRange(androidx.ui.semantics.SemanticsPropertyReceiver);
+ method public static androidx.compose.ui.text.AnnotatedString getText(androidx.ui.semantics.SemanticsPropertyReceiver);
+ method public static void getTextLayoutResult(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function1<? super java.util.List<androidx.compose.ui.text.TextLayoutResult>,java.lang.Boolean> action);
+ method public static androidx.compose.ui.text.TextRange getTextSelectionRange(androidx.ui.semantics.SemanticsPropertyReceiver);
method public static void hidden(androidx.ui.semantics.SemanticsPropertyReceiver);
method public static void onClick(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function0<java.lang.Boolean> action);
method public static void popup(androidx.ui.semantics.SemanticsPropertyReceiver);
@@ -2407,9 +2407,9 @@
method public static void setProgress(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Boolean> action);
method public static void setSelection(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function3<? super java.lang.Integer,? super java.lang.Integer,? super java.lang.Boolean,java.lang.Boolean> action);
method public static void setTestTag(androidx.ui.semantics.SemanticsPropertyReceiver, String p);
- method public static void setText(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.ui.text.AnnotatedString p);
- method public static void setText(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function1<? super androidx.ui.text.AnnotatedString,java.lang.Boolean> action);
- method public static void setTextSelectionRange(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.ui.text.TextRange p);
+ method public static void setText(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.text.AnnotatedString p);
+ method public static void setText(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.AnnotatedString,java.lang.Boolean> action);
+ method public static void setTextSelectionRange(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.text.TextRange p);
}
public final class SemanticsPropertyKey<T> {
diff --git a/ui/ui-core/api/restricted_0.1.0-dev16.txt b/ui/ui-core/api/restricted_0.1.0-dev16.txt
index 4c18808..5eb7dc8 100644
--- a/ui/ui-core/api/restricted_0.1.0-dev16.txt
+++ b/ui/ui-core/api/restricted_0.1.0-dev16.txt
@@ -1,4 +1,14 @@
// Signature format: 3.0
+package androidx.compose.ui.text.input {
+
+ public final class InputStateKt {
+ }
+
+ public final class RecordingInputConnectionKt {
+ }
+
+}
+
package androidx.ui.autofill {
public final class AndroidAutofillDebugUtilsKt {
@@ -178,7 +188,7 @@
method public static androidx.compose.ProvidableAmbient<androidx.ui.core.clipboard.ClipboardManager> getClipboardManagerAmbient();
method public static androidx.compose.ProvidableAmbient<androidx.ui.unit.Density> getDensityAmbient();
method public static androidx.compose.ProvidableAmbient<androidx.ui.core.hapticfeedback.HapticFeedback> getHapticFeedBackAmbient();
- method public static androidx.compose.ProvidableAmbient<androidx.ui.input.TextInputService> getTextInputServiceAmbient();
+ method public static androidx.compose.ProvidableAmbient<androidx.compose.ui.text.input.TextInputService> getTextInputServiceAmbient();
method public static androidx.compose.ProvidableAmbient<androidx.ui.core.texttoolbar.TextToolbar> getTextToolbarAmbient();
method public static androidx.compose.ProvidableAmbient<androidx.ui.platform.UriHandler> getUriHandlerAmbient();
}
@@ -721,14 +731,14 @@
method public androidx.ui.autofill.AutofillTree getAutofillTree();
method public androidx.ui.core.clipboard.ClipboardManager getClipboardManager();
method public androidx.ui.unit.Density getDensity();
- method public androidx.ui.text.font.Font.ResourceLoader getFontLoader();
+ method public androidx.compose.ui.text.font.Font.ResourceLoader getFontLoader();
method public androidx.ui.core.hapticfeedback.HapticFeedback getHapticFeedBack();
method public long getMeasureIteration();
method public androidx.ui.core.LayoutNode getRoot();
method public androidx.compose.runtime.savedinstancestate.UiSavedStateRegistry? getSavedStateRegistry();
method public androidx.ui.core.semantics.SemanticsOwner getSemanticsOwner();
method public boolean getShowLayoutBounds();
- method public androidx.ui.input.TextInputService getTextInputService();
+ method public androidx.compose.ui.text.input.TextInputService getTextInputService();
method public androidx.ui.core.texttoolbar.TextToolbar getTextToolbar();
method public void measureAndLayout();
method public void observeLayoutModelReads(androidx.ui.core.LayoutNode node, kotlin.jvm.functions.Function0<kotlin.Unit> block);
@@ -748,14 +758,14 @@
property public abstract androidx.ui.autofill.AutofillTree autofillTree;
property public abstract androidx.ui.core.clipboard.ClipboardManager clipboardManager;
property public abstract androidx.ui.unit.Density density;
- property public abstract androidx.ui.text.font.Font.ResourceLoader fontLoader;
+ property public abstract androidx.compose.ui.text.font.Font.ResourceLoader fontLoader;
property public abstract androidx.ui.core.hapticfeedback.HapticFeedback hapticFeedBack;
property public abstract long measureIteration;
property public abstract androidx.ui.core.LayoutNode root;
property public abstract androidx.compose.runtime.savedinstancestate.UiSavedStateRegistry? savedStateRegistry;
property public abstract androidx.ui.core.semantics.SemanticsOwner semanticsOwner;
property public abstract boolean showLayoutBounds;
- property public abstract androidx.ui.input.TextInputService textInputService;
+ property public abstract androidx.compose.ui.text.input.TextInputService textInputService;
property public abstract androidx.ui.core.texttoolbar.TextToolbar textToolbar;
field public static final androidx.ui.core.Owner.Companion Companion;
}
@@ -987,8 +997,8 @@
}
public interface ClipboardManager {
- method public androidx.ui.text.AnnotatedString? getText();
- method public void setText(androidx.ui.text.AnnotatedString annotatedString);
+ method public androidx.compose.ui.text.AnnotatedString? getText();
+ method public void setText(androidx.compose.ui.text.AnnotatedString annotatedString);
}
}
@@ -1960,7 +1970,7 @@
method public androidx.ui.geometry.Offset getHandlePosition(androidx.ui.core.selection.Selection selection, boolean isStartHandle);
method public androidx.ui.core.LayoutCoordinates? getLayoutCoordinates();
method public androidx.ui.core.selection.Selection? getSelection(androidx.ui.geometry.Offset startPosition, androidx.ui.geometry.Offset endPosition, androidx.ui.core.LayoutCoordinates containerLayoutCoordinates, boolean longPress, androidx.ui.core.selection.Selection? previousSelection = null, boolean isStartHandle = true);
- method public androidx.ui.text.AnnotatedString getText();
+ method public androidx.compose.ui.text.AnnotatedString getText();
}
@androidx.compose.Immutable public final class Selection {
@@ -1973,16 +1983,16 @@
method public boolean getHandlesCrossed();
method public androidx.ui.core.selection.Selection.AnchorInfo getStart();
method public androidx.ui.core.selection.Selection merge(androidx.ui.core.selection.Selection? other);
- method public androidx.ui.text.TextRange toTextRange();
+ method public androidx.compose.ui.text.TextRange toTextRange();
}
@androidx.compose.Immutable public static final class Selection.AnchorInfo {
- ctor public Selection.AnchorInfo(androidx.ui.text.style.ResolvedTextDirection direction, int offset, androidx.ui.core.selection.Selectable selectable);
- method public androidx.ui.text.style.ResolvedTextDirection component1();
+ ctor public Selection.AnchorInfo(androidx.compose.ui.text.style.ResolvedTextDirection direction, int offset, androidx.ui.core.selection.Selectable selectable);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection component1();
method public int component2();
method public androidx.ui.core.selection.Selectable component3();
- method @androidx.compose.Immutable public androidx.ui.core.selection.Selection.AnchorInfo copy(androidx.ui.text.style.ResolvedTextDirection direction, int offset, androidx.ui.core.selection.Selectable selectable);
- method public androidx.ui.text.style.ResolvedTextDirection getDirection();
+ method @androidx.compose.Immutable public androidx.ui.core.selection.Selection.AnchorInfo copy(androidx.compose.ui.text.style.ResolvedTextDirection direction, int offset, androidx.ui.core.selection.Selectable selectable);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getDirection();
method public int getOffset();
method public androidx.ui.core.selection.Selectable getSelectable();
}
@@ -2260,16 +2270,6 @@
}
-package androidx.ui.input {
-
- public final class InputStateKt {
- }
-
- public final class RecordingInputConnectionKt {
- }
-
-}
-
package androidx.ui.node {
public final class PointerInteropFilterKt {
@@ -2334,9 +2334,9 @@
}
public final class FontResourcesKt {
- method @androidx.compose.Composable public static androidx.ui.text.Typeface fontResource(androidx.ui.text.font.FontFamily fontFamily);
- method @androidx.compose.Composable public static androidx.ui.res.DeferredResource<androidx.ui.text.Typeface> loadFontResource(androidx.ui.text.font.FontFamily fontFamily, androidx.ui.text.font.FontFamily? pendingFontFamily = null, androidx.ui.text.font.FontFamily? failedFontFamily = null);
- method @androidx.compose.Composable public static androidx.ui.res.DeferredResource<androidx.ui.text.Typeface> loadFontResource(androidx.ui.text.font.FontFamily fontFamily, androidx.ui.text.Typeface? pendingTypeface = null, androidx.ui.text.Typeface? failedTypeface = null);
+ method @androidx.compose.Composable public static androidx.compose.ui.text.Typeface fontResource(androidx.compose.ui.text.font.FontFamily fontFamily);
+ method @androidx.compose.Composable public static androidx.ui.res.DeferredResource<androidx.compose.ui.text.Typeface> loadFontResource(androidx.compose.ui.text.font.FontFamily fontFamily, androidx.compose.ui.text.font.FontFamily? pendingFontFamily = null, androidx.compose.ui.text.font.FontFamily? failedFontFamily = null);
+ method @androidx.compose.Composable public static androidx.ui.res.DeferredResource<androidx.compose.ui.text.Typeface> loadFontResource(androidx.compose.ui.text.font.FontFamily fontFamily, androidx.compose.ui.text.Typeface? pendingTypeface = null, androidx.compose.ui.text.Typeface? failedTypeface = null);
}
public final class ImageResourcesKt {
@@ -2410,23 +2410,23 @@
public final class SemanticsActions {
method public androidx.ui.semantics.SemanticsPropertyKey<java.util.List<androidx.ui.semantics.CustomAccessibilityAction>> getCustomActions();
- method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.util.List<androidx.ui.text.TextLayoutResult>,java.lang.Boolean>>> getGetTextLayoutResult();
+ method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.util.List<androidx.compose.ui.text.TextLayoutResult>,java.lang.Boolean>>> getGetTextLayoutResult();
method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getOnClick();
method @Deprecated public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getScrollBackward();
method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function2<java.lang.Float,java.lang.Float,java.lang.Boolean>>> getScrollBy();
method @Deprecated public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getScrollForward();
method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.lang.Float,java.lang.Boolean>>> getSetProgress();
method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function3<java.lang.Integer,java.lang.Integer,java.lang.Boolean,java.lang.Boolean>>> getSetSelection();
- method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<androidx.ui.text.AnnotatedString,java.lang.Boolean>>> getSetText();
+ method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<androidx.compose.ui.text.AnnotatedString,java.lang.Boolean>>> getSetText();
property public final androidx.ui.semantics.SemanticsPropertyKey<java.util.List<androidx.ui.semantics.CustomAccessibilityAction>> CustomActions;
- property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.util.List<androidx.ui.text.TextLayoutResult>,java.lang.Boolean>>> GetTextLayoutResult;
+ property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.util.List<androidx.compose.ui.text.TextLayoutResult>,java.lang.Boolean>>> GetTextLayoutResult;
property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> OnClick;
property @Deprecated public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> ScrollBackward;
property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function2<java.lang.Float,java.lang.Float,java.lang.Boolean>>> ScrollBy;
property @Deprecated public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> ScrollForward;
property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.lang.Float,java.lang.Boolean>>> SetProgress;
property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function3<java.lang.Integer,java.lang.Integer,java.lang.Boolean,java.lang.Boolean>>> SetSelection;
- property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<androidx.ui.text.AnnotatedString,java.lang.Boolean>>> SetText;
+ property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<androidx.compose.ui.text.AnnotatedString,java.lang.Boolean>>> SetText;
field public static final androidx.ui.semantics.SemanticsActions INSTANCE;
}
@@ -2439,8 +2439,8 @@
method public androidx.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getHidden();
method public androidx.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getIsPopup();
method public androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> getTestTag();
- method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.text.AnnotatedString> getText();
- method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.text.TextRange> getTextSelectionRange();
+ method public androidx.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.AnnotatedString> getText();
+ method public androidx.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.TextRange> getTextSelectionRange();
property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> AccessibilityLabel;
property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityRangeInfo> AccessibilityRangeInfo;
property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> AccessibilityValue;
@@ -2449,8 +2449,8 @@
property public final androidx.ui.semantics.SemanticsPropertyKey<kotlin.Unit> Hidden;
property public final androidx.ui.semantics.SemanticsPropertyKey<kotlin.Unit> IsPopup;
property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> TestTag;
- property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.text.AnnotatedString> Text;
- property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.text.TextRange> TextSelectionRange;
+ property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.AnnotatedString> Text;
+ property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.TextRange> TextSelectionRange;
field public static final androidx.ui.semantics.SemanticsProperties INSTANCE;
}
@@ -2462,9 +2462,9 @@
method public static java.util.List<androidx.ui.semantics.CustomAccessibilityAction> getCustomActions(androidx.ui.semantics.SemanticsPropertyReceiver);
method public static boolean getFocused(androidx.ui.semantics.SemanticsPropertyReceiver);
method public static String getTestTag(androidx.ui.semantics.SemanticsPropertyReceiver);
- method public static androidx.ui.text.AnnotatedString getText(androidx.ui.semantics.SemanticsPropertyReceiver);
- method public static void getTextLayoutResult(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function1<? super java.util.List<androidx.ui.text.TextLayoutResult>,java.lang.Boolean> action);
- method public static androidx.ui.text.TextRange getTextSelectionRange(androidx.ui.semantics.SemanticsPropertyReceiver);
+ method public static androidx.compose.ui.text.AnnotatedString getText(androidx.ui.semantics.SemanticsPropertyReceiver);
+ method public static void getTextLayoutResult(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function1<? super java.util.List<androidx.compose.ui.text.TextLayoutResult>,java.lang.Boolean> action);
+ method public static androidx.compose.ui.text.TextRange getTextSelectionRange(androidx.ui.semantics.SemanticsPropertyReceiver);
method public static void hidden(androidx.ui.semantics.SemanticsPropertyReceiver);
method public static void onClick(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function0<java.lang.Boolean> action);
method public static void popup(androidx.ui.semantics.SemanticsPropertyReceiver);
@@ -2479,9 +2479,9 @@
method public static void setProgress(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Boolean> action);
method public static void setSelection(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function3<? super java.lang.Integer,? super java.lang.Integer,? super java.lang.Boolean,java.lang.Boolean> action);
method public static void setTestTag(androidx.ui.semantics.SemanticsPropertyReceiver, String p);
- method public static void setText(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.ui.text.AnnotatedString p);
- method public static void setText(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function1<? super androidx.ui.text.AnnotatedString,java.lang.Boolean> action);
- method public static void setTextSelectionRange(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.ui.text.TextRange p);
+ method public static void setText(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.text.AnnotatedString p);
+ method public static void setText(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.AnnotatedString,java.lang.Boolean> action);
+ method public static void setTextSelectionRange(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.text.TextRange p);
}
public final class SemanticsPropertyKey<T> {
diff --git a/ui/ui-core/api/restricted_current.txt b/ui/ui-core/api/restricted_current.txt
index 4c18808..5eb7dc8 100644
--- a/ui/ui-core/api/restricted_current.txt
+++ b/ui/ui-core/api/restricted_current.txt
@@ -1,4 +1,14 @@
// Signature format: 3.0
+package androidx.compose.ui.text.input {
+
+ public final class InputStateKt {
+ }
+
+ public final class RecordingInputConnectionKt {
+ }
+
+}
+
package androidx.ui.autofill {
public final class AndroidAutofillDebugUtilsKt {
@@ -178,7 +188,7 @@
method public static androidx.compose.ProvidableAmbient<androidx.ui.core.clipboard.ClipboardManager> getClipboardManagerAmbient();
method public static androidx.compose.ProvidableAmbient<androidx.ui.unit.Density> getDensityAmbient();
method public static androidx.compose.ProvidableAmbient<androidx.ui.core.hapticfeedback.HapticFeedback> getHapticFeedBackAmbient();
- method public static androidx.compose.ProvidableAmbient<androidx.ui.input.TextInputService> getTextInputServiceAmbient();
+ method public static androidx.compose.ProvidableAmbient<androidx.compose.ui.text.input.TextInputService> getTextInputServiceAmbient();
method public static androidx.compose.ProvidableAmbient<androidx.ui.core.texttoolbar.TextToolbar> getTextToolbarAmbient();
method public static androidx.compose.ProvidableAmbient<androidx.ui.platform.UriHandler> getUriHandlerAmbient();
}
@@ -721,14 +731,14 @@
method public androidx.ui.autofill.AutofillTree getAutofillTree();
method public androidx.ui.core.clipboard.ClipboardManager getClipboardManager();
method public androidx.ui.unit.Density getDensity();
- method public androidx.ui.text.font.Font.ResourceLoader getFontLoader();
+ method public androidx.compose.ui.text.font.Font.ResourceLoader getFontLoader();
method public androidx.ui.core.hapticfeedback.HapticFeedback getHapticFeedBack();
method public long getMeasureIteration();
method public androidx.ui.core.LayoutNode getRoot();
method public androidx.compose.runtime.savedinstancestate.UiSavedStateRegistry? getSavedStateRegistry();
method public androidx.ui.core.semantics.SemanticsOwner getSemanticsOwner();
method public boolean getShowLayoutBounds();
- method public androidx.ui.input.TextInputService getTextInputService();
+ method public androidx.compose.ui.text.input.TextInputService getTextInputService();
method public androidx.ui.core.texttoolbar.TextToolbar getTextToolbar();
method public void measureAndLayout();
method public void observeLayoutModelReads(androidx.ui.core.LayoutNode node, kotlin.jvm.functions.Function0<kotlin.Unit> block);
@@ -748,14 +758,14 @@
property public abstract androidx.ui.autofill.AutofillTree autofillTree;
property public abstract androidx.ui.core.clipboard.ClipboardManager clipboardManager;
property public abstract androidx.ui.unit.Density density;
- property public abstract androidx.ui.text.font.Font.ResourceLoader fontLoader;
+ property public abstract androidx.compose.ui.text.font.Font.ResourceLoader fontLoader;
property public abstract androidx.ui.core.hapticfeedback.HapticFeedback hapticFeedBack;
property public abstract long measureIteration;
property public abstract androidx.ui.core.LayoutNode root;
property public abstract androidx.compose.runtime.savedinstancestate.UiSavedStateRegistry? savedStateRegistry;
property public abstract androidx.ui.core.semantics.SemanticsOwner semanticsOwner;
property public abstract boolean showLayoutBounds;
- property public abstract androidx.ui.input.TextInputService textInputService;
+ property public abstract androidx.compose.ui.text.input.TextInputService textInputService;
property public abstract androidx.ui.core.texttoolbar.TextToolbar textToolbar;
field public static final androidx.ui.core.Owner.Companion Companion;
}
@@ -987,8 +997,8 @@
}
public interface ClipboardManager {
- method public androidx.ui.text.AnnotatedString? getText();
- method public void setText(androidx.ui.text.AnnotatedString annotatedString);
+ method public androidx.compose.ui.text.AnnotatedString? getText();
+ method public void setText(androidx.compose.ui.text.AnnotatedString annotatedString);
}
}
@@ -1960,7 +1970,7 @@
method public androidx.ui.geometry.Offset getHandlePosition(androidx.ui.core.selection.Selection selection, boolean isStartHandle);
method public androidx.ui.core.LayoutCoordinates? getLayoutCoordinates();
method public androidx.ui.core.selection.Selection? getSelection(androidx.ui.geometry.Offset startPosition, androidx.ui.geometry.Offset endPosition, androidx.ui.core.LayoutCoordinates containerLayoutCoordinates, boolean longPress, androidx.ui.core.selection.Selection? previousSelection = null, boolean isStartHandle = true);
- method public androidx.ui.text.AnnotatedString getText();
+ method public androidx.compose.ui.text.AnnotatedString getText();
}
@androidx.compose.Immutable public final class Selection {
@@ -1973,16 +1983,16 @@
method public boolean getHandlesCrossed();
method public androidx.ui.core.selection.Selection.AnchorInfo getStart();
method public androidx.ui.core.selection.Selection merge(androidx.ui.core.selection.Selection? other);
- method public androidx.ui.text.TextRange toTextRange();
+ method public androidx.compose.ui.text.TextRange toTextRange();
}
@androidx.compose.Immutable public static final class Selection.AnchorInfo {
- ctor public Selection.AnchorInfo(androidx.ui.text.style.ResolvedTextDirection direction, int offset, androidx.ui.core.selection.Selectable selectable);
- method public androidx.ui.text.style.ResolvedTextDirection component1();
+ ctor public Selection.AnchorInfo(androidx.compose.ui.text.style.ResolvedTextDirection direction, int offset, androidx.ui.core.selection.Selectable selectable);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection component1();
method public int component2();
method public androidx.ui.core.selection.Selectable component3();
- method @androidx.compose.Immutable public androidx.ui.core.selection.Selection.AnchorInfo copy(androidx.ui.text.style.ResolvedTextDirection direction, int offset, androidx.ui.core.selection.Selectable selectable);
- method public androidx.ui.text.style.ResolvedTextDirection getDirection();
+ method @androidx.compose.Immutable public androidx.ui.core.selection.Selection.AnchorInfo copy(androidx.compose.ui.text.style.ResolvedTextDirection direction, int offset, androidx.ui.core.selection.Selectable selectable);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getDirection();
method public int getOffset();
method public androidx.ui.core.selection.Selectable getSelectable();
}
@@ -2260,16 +2270,6 @@
}
-package androidx.ui.input {
-
- public final class InputStateKt {
- }
-
- public final class RecordingInputConnectionKt {
- }
-
-}
-
package androidx.ui.node {
public final class PointerInteropFilterKt {
@@ -2334,9 +2334,9 @@
}
public final class FontResourcesKt {
- method @androidx.compose.Composable public static androidx.ui.text.Typeface fontResource(androidx.ui.text.font.FontFamily fontFamily);
- method @androidx.compose.Composable public static androidx.ui.res.DeferredResource<androidx.ui.text.Typeface> loadFontResource(androidx.ui.text.font.FontFamily fontFamily, androidx.ui.text.font.FontFamily? pendingFontFamily = null, androidx.ui.text.font.FontFamily? failedFontFamily = null);
- method @androidx.compose.Composable public static androidx.ui.res.DeferredResource<androidx.ui.text.Typeface> loadFontResource(androidx.ui.text.font.FontFamily fontFamily, androidx.ui.text.Typeface? pendingTypeface = null, androidx.ui.text.Typeface? failedTypeface = null);
+ method @androidx.compose.Composable public static androidx.compose.ui.text.Typeface fontResource(androidx.compose.ui.text.font.FontFamily fontFamily);
+ method @androidx.compose.Composable public static androidx.ui.res.DeferredResource<androidx.compose.ui.text.Typeface> loadFontResource(androidx.compose.ui.text.font.FontFamily fontFamily, androidx.compose.ui.text.font.FontFamily? pendingFontFamily = null, androidx.compose.ui.text.font.FontFamily? failedFontFamily = null);
+ method @androidx.compose.Composable public static androidx.ui.res.DeferredResource<androidx.compose.ui.text.Typeface> loadFontResource(androidx.compose.ui.text.font.FontFamily fontFamily, androidx.compose.ui.text.Typeface? pendingTypeface = null, androidx.compose.ui.text.Typeface? failedTypeface = null);
}
public final class ImageResourcesKt {
@@ -2410,23 +2410,23 @@
public final class SemanticsActions {
method public androidx.ui.semantics.SemanticsPropertyKey<java.util.List<androidx.ui.semantics.CustomAccessibilityAction>> getCustomActions();
- method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.util.List<androidx.ui.text.TextLayoutResult>,java.lang.Boolean>>> getGetTextLayoutResult();
+ method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.util.List<androidx.compose.ui.text.TextLayoutResult>,java.lang.Boolean>>> getGetTextLayoutResult();
method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getOnClick();
method @Deprecated public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getScrollBackward();
method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function2<java.lang.Float,java.lang.Float,java.lang.Boolean>>> getScrollBy();
method @Deprecated public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> getScrollForward();
method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.lang.Float,java.lang.Boolean>>> getSetProgress();
method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function3<java.lang.Integer,java.lang.Integer,java.lang.Boolean,java.lang.Boolean>>> getSetSelection();
- method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<androidx.ui.text.AnnotatedString,java.lang.Boolean>>> getSetText();
+ method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<androidx.compose.ui.text.AnnotatedString,java.lang.Boolean>>> getSetText();
property public final androidx.ui.semantics.SemanticsPropertyKey<java.util.List<androidx.ui.semantics.CustomAccessibilityAction>> CustomActions;
- property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.util.List<androidx.ui.text.TextLayoutResult>,java.lang.Boolean>>> GetTextLayoutResult;
+ property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.util.List<androidx.compose.ui.text.TextLayoutResult>,java.lang.Boolean>>> GetTextLayoutResult;
property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> OnClick;
property @Deprecated public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> ScrollBackward;
property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function2<java.lang.Float,java.lang.Float,java.lang.Boolean>>> ScrollBy;
property @Deprecated public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> ScrollForward;
property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.lang.Float,java.lang.Boolean>>> SetProgress;
property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function3<java.lang.Integer,java.lang.Integer,java.lang.Boolean,java.lang.Boolean>>> SetSelection;
- property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<androidx.ui.text.AnnotatedString,java.lang.Boolean>>> SetText;
+ property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<androidx.compose.ui.text.AnnotatedString,java.lang.Boolean>>> SetText;
field public static final androidx.ui.semantics.SemanticsActions INSTANCE;
}
@@ -2439,8 +2439,8 @@
method public androidx.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getHidden();
method public androidx.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getIsPopup();
method public androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> getTestTag();
- method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.text.AnnotatedString> getText();
- method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.text.TextRange> getTextSelectionRange();
+ method public androidx.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.AnnotatedString> getText();
+ method public androidx.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.TextRange> getTextSelectionRange();
property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> AccessibilityLabel;
property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityRangeInfo> AccessibilityRangeInfo;
property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> AccessibilityValue;
@@ -2449,8 +2449,8 @@
property public final androidx.ui.semantics.SemanticsPropertyKey<kotlin.Unit> Hidden;
property public final androidx.ui.semantics.SemanticsPropertyKey<kotlin.Unit> IsPopup;
property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> TestTag;
- property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.text.AnnotatedString> Text;
- property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.text.TextRange> TextSelectionRange;
+ property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.AnnotatedString> Text;
+ property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.TextRange> TextSelectionRange;
field public static final androidx.ui.semantics.SemanticsProperties INSTANCE;
}
@@ -2462,9 +2462,9 @@
method public static java.util.List<androidx.ui.semantics.CustomAccessibilityAction> getCustomActions(androidx.ui.semantics.SemanticsPropertyReceiver);
method public static boolean getFocused(androidx.ui.semantics.SemanticsPropertyReceiver);
method public static String getTestTag(androidx.ui.semantics.SemanticsPropertyReceiver);
- method public static androidx.ui.text.AnnotatedString getText(androidx.ui.semantics.SemanticsPropertyReceiver);
- method public static void getTextLayoutResult(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function1<? super java.util.List<androidx.ui.text.TextLayoutResult>,java.lang.Boolean> action);
- method public static androidx.ui.text.TextRange getTextSelectionRange(androidx.ui.semantics.SemanticsPropertyReceiver);
+ method public static androidx.compose.ui.text.AnnotatedString getText(androidx.ui.semantics.SemanticsPropertyReceiver);
+ method public static void getTextLayoutResult(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function1<? super java.util.List<androidx.compose.ui.text.TextLayoutResult>,java.lang.Boolean> action);
+ method public static androidx.compose.ui.text.TextRange getTextSelectionRange(androidx.ui.semantics.SemanticsPropertyReceiver);
method public static void hidden(androidx.ui.semantics.SemanticsPropertyReceiver);
method public static void onClick(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function0<java.lang.Boolean> action);
method public static void popup(androidx.ui.semantics.SemanticsPropertyReceiver);
@@ -2479,9 +2479,9 @@
method public static void setProgress(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function1<? super java.lang.Float,java.lang.Boolean> action);
method public static void setSelection(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function3<? super java.lang.Integer,? super java.lang.Integer,? super java.lang.Boolean,java.lang.Boolean> action);
method public static void setTestTag(androidx.ui.semantics.SemanticsPropertyReceiver, String p);
- method public static void setText(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.ui.text.AnnotatedString p);
- method public static void setText(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function1<? super androidx.ui.text.AnnotatedString,java.lang.Boolean> action);
- method public static void setTextSelectionRange(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.ui.text.TextRange p);
+ method public static void setText(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.text.AnnotatedString p);
+ method public static void setText(androidx.ui.semantics.SemanticsPropertyReceiver, String? label = null, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.AnnotatedString,java.lang.Boolean> action);
+ method public static void setTextSelectionRange(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.text.TextRange p);
}
public final class SemanticsPropertyKey<T> {
diff --git a/ui/ui-core/integration-tests/ui-core-demos/src/main/java/androidx/ui/core/demos/PopupDemo.kt b/ui/ui-core/integration-tests/ui-core-demos/src/main/java/androidx/ui/core/demos/PopupDemo.kt
index 5f296da..23a3264 100644
--- a/ui/ui-core/integration-tests/ui-core-demos/src/main/java/androidx/ui/core/demos/PopupDemo.kt
+++ b/ui/ui-core/integration-tests/ui-core-demos/src/main/java/androidx/ui/core/demos/PopupDemo.kt
@@ -41,10 +41,10 @@
import androidx.ui.core.Modifier
import androidx.ui.core.Popup
import androidx.ui.graphics.Color
-import androidx.ui.input.ImeAction
-import androidx.ui.input.KeyboardType
-import androidx.ui.input.TextFieldValue
-import androidx.ui.text.style.TextAlign
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.text.style.TextAlign
import androidx.ui.unit.Dp
import androidx.ui.unit.dp
diff --git a/ui/ui-core/integration-tests/ui-core-demos/src/main/java/androidx/ui/core/demos/autofill/ExplicitAutofillTypesDemo.kt b/ui/ui-core/integration-tests/ui-core-demos/src/main/java/androidx/ui/core/demos/autofill/ExplicitAutofillTypesDemo.kt
index e8b062b..1e959f9 100644
--- a/ui/ui-core/integration-tests/ui-core-demos/src/main/java/androidx/ui/core/demos/autofill/ExplicitAutofillTypesDemo.kt
+++ b/ui/ui-core/integration-tests/ui-core-demos/src/main/java/androidx/ui/core/demos/autofill/ExplicitAutofillTypesDemo.kt
@@ -32,9 +32,9 @@
import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.Text
import androidx.ui.geometry.Offset
-import androidx.ui.input.ImeAction
-import androidx.ui.input.KeyboardType
-import androidx.ui.input.TextFieldValue
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.text.input.TextFieldValue
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.preferredHeight
diff --git a/ui/ui-core/integration-tests/ui-core-demos/src/main/java/androidx/ui/core/demos/gestures/PopupDragDemo.kt b/ui/ui-core/integration-tests/ui-core-demos/src/main/java/androidx/ui/core/demos/gestures/PopupDragDemo.kt
index d504157..1d1519c 100644
--- a/ui/ui-core/integration-tests/ui-core-demos/src/main/java/androidx/ui/core/demos/gestures/PopupDragDemo.kt
+++ b/ui/ui-core/integration-tests/ui-core-demos/src/main/java/androidx/ui/core/demos/gestures/PopupDragDemo.kt
@@ -32,7 +32,7 @@
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Stack
import androidx.compose.foundation.layout.preferredSize
-import androidx.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextAlign
import androidx.ui.geometry.Offset
import androidx.ui.unit.dp
import androidx.ui.unit.round
diff --git a/ui/ui-core/samples/src/main/java/androidx/ui/core/samples/FontResourcesSample.kt b/ui/ui-core/samples/src/main/java/androidx/ui/core/samples/FontResourcesSample.kt
index d3b9466..d840068 100644
--- a/ui/ui-core/samples/src/main/java/androidx/ui/core/samples/FontResourcesSample.kt
+++ b/ui/ui-core/samples/src/main/java/androidx/ui/core/samples/FontResourcesSample.kt
@@ -21,8 +21,8 @@
import androidx.compose.foundation.Text
import androidx.ui.res.fontResource
import androidx.ui.res.loadFontResource
-import androidx.ui.text.font.FontFamily
-import androidx.ui.text.font.LoadedFontFamily
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.LoadedFontFamily
@Sampled
@Composable
diff --git a/ui/ui-core/src/androidAndroidTest/kotlin/androidx/ui/input/RecordingInputConnectionTest.kt b/ui/ui-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/input/RecordingInputConnectionTest.kt
similarity index 99%
rename from ui/ui-core/src/androidAndroidTest/kotlin/androidx/ui/input/RecordingInputConnectionTest.kt
rename to ui/ui-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/input/RecordingInputConnectionTest.kt
index 3822762..228b2ae 100644
--- a/ui/ui-core/src/androidAndroidTest/kotlin/androidx/ui/input/RecordingInputConnectionTest.kt
+++ b/ui/ui-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/input/RecordingInputConnectionTest.kt
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package androidx.ui.input
+package androidx.compose.ui.text.input
import android.view.KeyEvent
import androidx.test.filters.SmallTest
-import androidx.ui.text.TextRange
+import androidx.compose.ui.text.TextRange
import com.nhaarman.mockitokotlin2.any
import com.nhaarman.mockitokotlin2.argumentCaptor
import com.nhaarman.mockitokotlin2.mock
diff --git a/ui/ui-core/src/androidAndroidTest/kotlin/androidx/ui/core/selection/SelectionHandlesTest.kt b/ui/ui-core/src/androidAndroidTest/kotlin/androidx/ui/core/selection/SelectionHandlesTest.kt
index 41b9fbd..6d812c3 100644
--- a/ui/ui-core/src/androidAndroidTest/kotlin/androidx/ui/core/selection/SelectionHandlesTest.kt
+++ b/ui/ui-core/src/androidAndroidTest/kotlin/androidx/ui/core/selection/SelectionHandlesTest.kt
@@ -26,8 +26,8 @@
import androidx.ui.framework.test.TestActivity
import androidx.ui.graphics.Color
import androidx.ui.graphics.toArgb
-import androidx.ui.text.InternalTextApi
-import androidx.ui.text.style.ResolvedTextDirection
+import androidx.compose.ui.text.InternalTextApi
+import androidx.compose.ui.text.style.ResolvedTextDirection
import com.google.common.truth.Truth.assertThat
import com.nhaarman.mockitokotlin2.mock
import org.junit.Before
diff --git a/ui/ui-core/src/androidAndroidTest/kotlin/androidx/ui/res/FontResourcesTest.kt b/ui/ui-core/src/androidAndroidTest/kotlin/androidx/ui/res/FontResourcesTest.kt
index 153318d..64511fb 100644
--- a/ui/ui-core/src/androidAndroidTest/kotlin/androidx/ui/res/FontResourcesTest.kt
+++ b/ui/ui-core/src/androidAndroidTest/kotlin/androidx/ui/res/FontResourcesTest.kt
@@ -22,13 +22,13 @@
import androidx.ui.core.ContextAmbient
import androidx.ui.test.createComposeRule
import androidx.ui.test.runOnIdle
-import androidx.ui.text.Typeface
-import androidx.ui.text.font.FontFamily
-import androidx.ui.text.font.FontWeight
-import androidx.ui.text.font.asFontFamily
-import androidx.ui.text.font.font
-import androidx.ui.text.font.fontFamily
-import androidx.ui.text.font.test.R
+import androidx.compose.ui.text.Typeface
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.font.asFontFamily
+import androidx.compose.ui.text.font.font
+import androidx.compose.ui.text.font.fontFamily
+import androidx.compose.ui.text.font.test.R
import com.google.common.truth.Truth.assertThat
import org.junit.Rule
import org.junit.Test
diff --git a/ui/ui-core/src/androidMain/kotlin/androidx/ui/input/InputState.kt b/ui/ui-core/src/androidMain/kotlin/androidx/compose/ui/text/input/InputState.kt
similarity index 96%
rename from ui/ui-core/src/androidMain/kotlin/androidx/ui/input/InputState.kt
rename to ui/ui-core/src/androidMain/kotlin/androidx/compose/ui/text/input/InputState.kt
index 64469cf..e8fc13b 100644
--- a/ui/ui-core/src/androidMain/kotlin/androidx/ui/input/InputState.kt
+++ b/ui/ui-core/src/androidMain/kotlin/androidx/compose/ui/text/input/InputState.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.input
+package androidx.compose.ui.text.input
import android.view.inputmethod.ExtractedText
diff --git a/ui/ui-core/src/androidMain/kotlin/androidx/ui/input/RecordingInputConnection.kt b/ui/ui-core/src/androidMain/kotlin/androidx/compose/ui/text/input/RecordingInputConnection.kt
similarity index 99%
rename from ui/ui-core/src/androidMain/kotlin/androidx/ui/input/RecordingInputConnection.kt
rename to ui/ui-core/src/androidMain/kotlin/androidx/compose/ui/text/input/RecordingInputConnection.kt
index b067b86..eebdad6 100644
--- a/ui/ui-core/src/androidMain/kotlin/androidx/ui/input/RecordingInputConnection.kt
+++ b/ui/ui-core/src/androidMain/kotlin/androidx/compose/ui/text/input/RecordingInputConnection.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.input
+package androidx.compose.ui.text.input
import android.os.Bundle
import android.os.Handler
diff --git a/ui/ui-core/src/androidMain/kotlin/androidx/ui/input/TextInputServiceAndroid.kt b/ui/ui-core/src/androidMain/kotlin/androidx/compose/ui/text/input/TextInputServiceAndroid.kt
similarity index 98%
rename from ui/ui-core/src/androidMain/kotlin/androidx/ui/input/TextInputServiceAndroid.kt
rename to ui/ui-core/src/androidMain/kotlin/androidx/compose/ui/text/input/TextInputServiceAndroid.kt
index 8ce0ef6b..172194a 100644
--- a/ui/ui-core/src/androidMain/kotlin/androidx/ui/input/TextInputServiceAndroid.kt
+++ b/ui/ui-core/src/androidMain/kotlin/androidx/compose/ui/text/input/TextInputServiceAndroid.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.input
+package androidx.compose.ui.text.input
import android.content.Context
import android.text.InputType
@@ -24,7 +24,7 @@
import android.view.inputmethod.InputConnection
import android.view.inputmethod.InputMethodManager
import androidx.ui.geometry.Rect
-import androidx.ui.text.TextRange
+import androidx.compose.ui.text.TextRange
import kotlin.math.roundToInt
/**
diff --git a/ui/ui-core/src/androidMain/kotlin/androidx/ui/core/AndroidComposeView.kt b/ui/ui-core/src/androidMain/kotlin/androidx/ui/core/AndroidComposeView.kt
index 77f4b83..b532bff 100644
--- a/ui/ui-core/src/androidMain/kotlin/androidx/ui/core/AndroidComposeView.kt
+++ b/ui/ui-core/src/androidMain/kotlin/androidx/ui/core/AndroidComposeView.kt
@@ -81,11 +81,11 @@
import androidx.ui.core.texttoolbar.TextToolbar
import androidx.ui.graphics.Canvas
import androidx.ui.graphics.CanvasHolder
-import androidx.ui.input.TextInputServiceAndroid
-import androidx.ui.input.textInputServiceFactory
+import androidx.compose.ui.text.input.TextInputServiceAndroid
+import androidx.compose.ui.text.input.textInputServiceFactory
import androidx.compose.runtime.savedinstancestate.UiSavedStateRegistry
import androidx.ui.core.LayoutNode.UsageByParent
-import androidx.ui.text.font.Font
+import androidx.compose.ui.text.font.Font
import androidx.ui.unit.Density
import androidx.ui.unit.IntOffset
import androidx.ui.util.fastForEach
diff --git a/ui/ui-core/src/androidMain/kotlin/androidx/ui/core/AndroidComposeViewAccessibilityDelegateCompat.kt b/ui/ui-core/src/androidMain/kotlin/androidx/ui/core/AndroidComposeViewAccessibilityDelegateCompat.kt
index f23f474..8598acf 100644
--- a/ui/ui-core/src/androidMain/kotlin/androidx/ui/core/AndroidComposeViewAccessibilityDelegateCompat.kt
+++ b/ui/ui-core/src/androidMain/kotlin/androidx/ui/core/AndroidComposeViewAccessibilityDelegateCompat.kt
@@ -48,9 +48,9 @@
import androidx.ui.semantics.SemanticsActions
import androidx.ui.semantics.SemanticsActions.CustomActions
import androidx.ui.semantics.SemanticsProperties
-import androidx.ui.text.AnnotatedString
-import androidx.ui.text.TextLayoutResult
-import androidx.ui.text.length
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.TextLayoutResult
+import androidx.compose.ui.text.length
import androidx.ui.unit.toRect
import androidx.ui.util.fastForEach
diff --git a/ui/ui-core/src/androidMain/kotlin/androidx/ui/core/clipboard/AndroidClipboardManager.kt b/ui/ui-core/src/androidMain/kotlin/androidx/ui/core/clipboard/AndroidClipboardManager.kt
index add5b41..18e9905 100644
--- a/ui/ui-core/src/androidMain/kotlin/androidx/ui/core/clipboard/AndroidClipboardManager.kt
+++ b/ui/ui-core/src/androidMain/kotlin/androidx/ui/core/clipboard/AndroidClipboardManager.kt
@@ -18,7 +18,7 @@
import android.content.ClipData
import android.content.Context
-import androidx.ui.text.AnnotatedString
+import androidx.compose.ui.text.AnnotatedString
private const val PLAIN_TEXT_LABEL = "plain text"
diff --git a/ui/ui-core/src/androidMain/kotlin/androidx/ui/core/text/AndroidFontResourceLoader.kt b/ui/ui-core/src/androidMain/kotlin/androidx/ui/core/text/AndroidFontResourceLoader.kt
index 8796454..ea89e8d 100644
--- a/ui/ui-core/src/androidMain/kotlin/androidx/ui/core/text/AndroidFontResourceLoader.kt
+++ b/ui/ui-core/src/androidMain/kotlin/androidx/ui/core/text/AndroidFontResourceLoader.kt
@@ -19,8 +19,8 @@
import android.content.Context
import android.graphics.Typeface
import androidx.core.content.res.ResourcesCompat
-import androidx.ui.text.font.Font
-import androidx.ui.text.font.ResourceFont
+import androidx.compose.ui.text.font.Font
+import androidx.compose.ui.text.font.ResourceFont
/**
* Android implementation for [Font.ResourceLoader]
diff --git a/ui/ui-core/src/androidMain/kotlin/androidx/ui/res/FontResources.kt b/ui/ui-core/src/androidMain/kotlin/androidx/ui/res/FontResources.kt
index 029768f..0320fc9 100644
--- a/ui/ui-core/src/androidMain/kotlin/androidx/ui/res/FontResources.kt
+++ b/ui/ui-core/src/androidMain/kotlin/androidx/ui/res/FontResources.kt
@@ -21,13 +21,13 @@
import androidx.annotation.GuardedBy
import androidx.compose.Composable
import androidx.ui.core.ContextAmbient
-import androidx.ui.text.Typeface
-import androidx.ui.text.font.FontFamily
-import androidx.ui.text.font.FontListFontFamily
-import androidx.ui.text.font.LoadedFontFamily
-import androidx.ui.text.font.ResourceFont
-import androidx.ui.text.font.SystemFontFamily
-import androidx.ui.text.platform.typefaceFromFontFamily
+import androidx.compose.ui.text.Typeface
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontListFontFamily
+import androidx.compose.ui.text.font.LoadedFontFamily
+import androidx.compose.ui.text.font.ResourceFont
+import androidx.compose.ui.text.font.SystemFontFamily
+import androidx.compose.ui.text.platform.typefaceFromFontFamily
import androidx.ui.util.fastForEach
private val cacheLock = Object()
diff --git a/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/Ambients.kt b/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/Ambients.kt
index 039bdf3..a61ddab 100644
--- a/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/Ambients.kt
+++ b/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/Ambients.kt
@@ -24,9 +24,9 @@
import androidx.ui.core.clipboard.ClipboardManager
import androidx.ui.core.hapticfeedback.HapticFeedback
import androidx.ui.core.texttoolbar.TextToolbar
-import androidx.ui.input.TextInputService
+import androidx.compose.ui.text.input.TextInputService
import androidx.ui.platform.UriHandler
-import androidx.ui.text.font.Font
+import androidx.compose.ui.text.font.Font
import androidx.ui.unit.Density
import kotlin.coroutines.CoroutineContext
diff --git a/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/Owner.kt b/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/Owner.kt
index b9d76cc..4c7ab3c 100644
--- a/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/Owner.kt
+++ b/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/Owner.kt
@@ -24,9 +24,9 @@
import androidx.ui.core.semantics.SemanticsOwner
import androidx.ui.core.texttoolbar.TextToolbar
import androidx.ui.graphics.Canvas
-import androidx.ui.input.TextInputService
+import androidx.compose.ui.text.input.TextInputService
import androidx.compose.runtime.savedinstancestate.UiSavedStateRegistry
-import androidx.ui.text.font.Font
+import androidx.compose.ui.text.font.Font
import androidx.ui.unit.Density
import androidx.ui.unit.IntOffset
diff --git a/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/clipboard/ClipboardManager.kt b/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/clipboard/ClipboardManager.kt
index 7608444..63414ae 100644
--- a/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/clipboard/ClipboardManager.kt
+++ b/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/clipboard/ClipboardManager.kt
@@ -16,7 +16,7 @@
package androidx.ui.core.clipboard
-import androidx.ui.text.AnnotatedString
+import androidx.compose.ui.text.AnnotatedString
/**
* Interface for managing the Clipboard.
diff --git a/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/selection/Selectable.kt b/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/selection/Selectable.kt
index f585a98..98bbf1c1 100644
--- a/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/selection/Selectable.kt
+++ b/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/selection/Selectable.kt
@@ -18,7 +18,7 @@
import androidx.ui.core.LayoutCoordinates
import androidx.ui.geometry.Rect
-import androidx.ui.text.AnnotatedString
+import androidx.compose.ui.text.AnnotatedString
import androidx.ui.geometry.Offset
/**
diff --git a/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/selection/Selection.kt b/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/selection/Selection.kt
index 860b854..0e1c3be 100644
--- a/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/selection/Selection.kt
+++ b/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/selection/Selection.kt
@@ -17,8 +17,8 @@
package androidx.ui.core.selection
import androidx.compose.Immutable
-import androidx.ui.text.TextRange
-import androidx.ui.text.style.ResolvedTextDirection
+import androidx.compose.ui.text.TextRange
+import androidx.compose.ui.text.style.ResolvedTextDirection
/**
* Information about the current Selection.
diff --git a/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/selection/SelectionContainer.kt b/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/selection/SelectionContainer.kt
index ec1898b..d36932f 100644
--- a/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/selection/SelectionContainer.kt
+++ b/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/selection/SelectionContainer.kt
@@ -28,7 +28,7 @@
import androidx.ui.core.gesture.longPressDragGestureFilter
import androidx.ui.core.gesture.tapGestureFilter
import androidx.ui.core.onPositioned
-import androidx.ui.text.InternalTextApi
+import androidx.compose.ui.text.InternalTextApi
/**
* Default SelectionContainer to be used in order to make composables selectable by default.
diff --git a/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/selection/SelectionHandles.kt b/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/selection/SelectionHandles.kt
index d61fd6a..fe1b48f 100644
--- a/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/selection/SelectionHandles.kt
+++ b/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/selection/SelectionHandles.kt
@@ -26,8 +26,8 @@
import androidx.ui.graphics.Color
import androidx.ui.graphics.Path
import androidx.ui.graphics.drawscope.DrawScope
-import androidx.ui.text.InternalTextApi
-import androidx.ui.text.style.ResolvedTextDirection
+import androidx.compose.ui.text.InternalTextApi
+import androidx.compose.ui.text.style.ResolvedTextDirection
import androidx.ui.unit.Density
import androidx.ui.unit.Dp
import androidx.ui.unit.dp
diff --git a/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/selection/SelectionLayout.kt b/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/selection/SelectionLayout.kt
index 2a40746..16058a1 100644
--- a/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/selection/SelectionLayout.kt
+++ b/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/selection/SelectionLayout.kt
@@ -31,8 +31,8 @@
import androidx.ui.core.hasFixedHeight
import androidx.ui.core.hasFixedWidth
import androidx.ui.geometry.Offset
-import androidx.ui.text.InternalTextApi
-import androidx.ui.text.style.ResolvedTextDirection
+import androidx.compose.ui.text.InternalTextApi
+import androidx.compose.ui.text.style.ResolvedTextDirection
import androidx.ui.unit.Dp
import androidx.ui.unit.IntOffset
import androidx.ui.unit.IntSize
diff --git a/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/selection/SelectionManager.kt b/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/selection/SelectionManager.kt
index 51f5a9e..7d54b9f 100644
--- a/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/selection/SelectionManager.kt
+++ b/ui/ui-core/src/commonMain/kotlin/androidx/ui/core/selection/SelectionManager.kt
@@ -30,11 +30,11 @@
import androidx.ui.core.texttoolbar.TextToolbar
import androidx.ui.core.texttoolbar.TextToolbarStatus
import androidx.ui.geometry.Rect
-import androidx.ui.text.AnnotatedString
-import androidx.ui.text.length
-import androidx.ui.text.subSequence
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.length
+import androidx.compose.ui.text.subSequence
import androidx.ui.geometry.Offset
-import androidx.ui.text.InternalTextApi
+import androidx.compose.ui.text.InternalTextApi
import kotlin.math.max
import kotlin.math.min
diff --git a/ui/ui-core/src/commonMain/kotlin/androidx/ui/semantics/SemanticsProperties.kt b/ui/ui-core/src/commonMain/kotlin/androidx/ui/semantics/SemanticsProperties.kt
index 98c1c85..2b9abb5 100644
--- a/ui/ui-core/src/commonMain/kotlin/androidx/ui/semantics/SemanticsProperties.kt
+++ b/ui/ui-core/src/commonMain/kotlin/androidx/ui/semantics/SemanticsProperties.kt
@@ -16,9 +16,9 @@
package androidx.ui.semantics
-import androidx.ui.text.AnnotatedString
-import androidx.ui.text.TextLayoutResult
-import androidx.ui.text.TextRange
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.TextLayoutResult
+import androidx.compose.ui.text.TextRange
import kotlin.reflect.KProperty
/**
diff --git a/ui/ui-core/src/test/kotlin/androidx/ui/input/RecordingInputConnectionUpdateTextFieldValueTest.kt b/ui/ui-core/src/test/kotlin/androidx/compose/ui/text/input/RecordingInputConnectionUpdateTextFieldValueTest.kt
similarity index 97%
rename from ui/ui-core/src/test/kotlin/androidx/ui/input/RecordingInputConnectionUpdateTextFieldValueTest.kt
rename to ui/ui-core/src/test/kotlin/androidx/compose/ui/text/input/RecordingInputConnectionUpdateTextFieldValueTest.kt
index 9962e57..481b8c2 100644
--- a/ui/ui-core/src/test/kotlin/androidx/ui/input/RecordingInputConnectionUpdateTextFieldValueTest.kt
+++ b/ui/ui-core/src/test/kotlin/androidx/compose/ui/text/input/RecordingInputConnectionUpdateTextFieldValueTest.kt
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package androidx.ui.input
+package androidx.compose.ui.text.input
import android.view.View
import android.view.inputmethod.ExtractedText
import android.view.inputmethod.InputConnection
import android.view.inputmethod.InputMethodManager
import androidx.test.filters.SmallTest
-import androidx.ui.text.TextRange
+import androidx.compose.ui.text.TextRange
import com.nhaarman.mockitokotlin2.any
import com.nhaarman.mockitokotlin2.argumentCaptor
import com.nhaarman.mockitokotlin2.eq
diff --git a/ui/ui-core/src/test/kotlin/androidx/ui/input/TextInputServiceAndroidTest.kt b/ui/ui-core/src/test/kotlin/androidx/compose/ui/text/input/TextInputServiceAndroidTest.kt
similarity index 99%
rename from ui/ui-core/src/test/kotlin/androidx/ui/input/TextInputServiceAndroidTest.kt
rename to ui/ui-core/src/test/kotlin/androidx/compose/ui/text/input/TextInputServiceAndroidTest.kt
index 200bf5b..b004c8c 100644
--- a/ui/ui-core/src/test/kotlin/androidx/ui/input/TextInputServiceAndroidTest.kt
+++ b/ui/ui-core/src/test/kotlin/androidx/compose/ui/text/input/TextInputServiceAndroidTest.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.input
+package androidx.compose.ui.text.input
import android.content.Context
import android.text.InputType
diff --git a/ui/ui-core/src/test/kotlin/androidx/ui/core/selection/SelectionManagerDragTest.kt b/ui/ui-core/src/test/kotlin/androidx/ui/core/selection/SelectionManagerDragTest.kt
index 7b54831..83fedf9 100644
--- a/ui/ui-core/src/test/kotlin/androidx/ui/core/selection/SelectionManagerDragTest.kt
+++ b/ui/ui-core/src/test/kotlin/androidx/ui/core/selection/SelectionManagerDragTest.kt
@@ -18,7 +18,7 @@
import androidx.test.filters.SmallTest
import androidx.ui.core.LayoutCoordinates
-import androidx.ui.text.style.ResolvedTextDirection
+import androidx.compose.ui.text.style.ResolvedTextDirection
import androidx.ui.geometry.Offset
import com.google.common.truth.Truth.assertThat
import com.nhaarman.mockitokotlin2.any
diff --git a/ui/ui-core/src/test/kotlin/androidx/ui/core/selection/SelectionManagerLongPressDragTest.kt b/ui/ui-core/src/test/kotlin/androidx/ui/core/selection/SelectionManagerLongPressDragTest.kt
index 0cc31cb..473a7ce 100644
--- a/ui/ui-core/src/test/kotlin/androidx/ui/core/selection/SelectionManagerLongPressDragTest.kt
+++ b/ui/ui-core/src/test/kotlin/androidx/ui/core/selection/SelectionManagerLongPressDragTest.kt
@@ -18,7 +18,7 @@
import androidx.test.filters.SmallTest
import androidx.ui.core.LayoutCoordinates
-import androidx.ui.text.style.ResolvedTextDirection
+import androidx.compose.ui.text.style.ResolvedTextDirection
import androidx.ui.geometry.Offset
import com.google.common.truth.Truth.assertThat
import com.nhaarman.mockitokotlin2.any
diff --git a/ui/ui-core/src/test/kotlin/androidx/ui/core/selection/SelectionManagerTest.kt b/ui/ui-core/src/test/kotlin/androidx/ui/core/selection/SelectionManagerTest.kt
index f5a33f9..cf282f9 100644
--- a/ui/ui-core/src/test/kotlin/androidx/ui/core/selection/SelectionManagerTest.kt
+++ b/ui/ui-core/src/test/kotlin/androidx/ui/core/selection/SelectionManagerTest.kt
@@ -23,10 +23,10 @@
import androidx.ui.core.hapticfeedback.HapticFeedbackType
import androidx.ui.core.texttoolbar.TextToolbar
import androidx.ui.geometry.Rect
-import androidx.ui.text.AnnotatedString
-import androidx.ui.text.length
-import androidx.ui.text.style.ResolvedTextDirection
-import androidx.ui.text.subSequence
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.length
+import androidx.compose.ui.text.style.ResolvedTextDirection
+import androidx.compose.ui.text.subSequence
import androidx.ui.geometry.Offset
import com.google.common.truth.Truth.assertThat
import com.nhaarman.mockitokotlin2.any
diff --git a/ui/ui-core/src/test/kotlin/androidx/ui/core/selection/SelectionTest.kt b/ui/ui-core/src/test/kotlin/androidx/ui/core/selection/SelectionTest.kt
index 00f0ac4..42d966e 100644
--- a/ui/ui-core/src/test/kotlin/androidx/ui/core/selection/SelectionTest.kt
+++ b/ui/ui-core/src/test/kotlin/androidx/ui/core/selection/SelectionTest.kt
@@ -17,8 +17,8 @@
package androidx.ui.core.selection
import androidx.test.filters.SmallTest
-import androidx.ui.text.TextRange
-import androidx.ui.text.style.ResolvedTextDirection
+import androidx.compose.ui.text.TextRange
+import androidx.compose.ui.text.style.ResolvedTextDirection
import com.google.common.truth.Truth.assertThat
import com.nhaarman.mockitokotlin2.mock
import org.junit.Test
diff --git a/ui/ui-desktop/samples/src/jvmMain/kotlin/androidx/ui/desktop/examples/example1/Main.kt b/ui/ui-desktop/samples/src/jvmMain/kotlin/androidx/ui/desktop/examples/example1/Main.kt
index 66577e8..654d3da 100644
--- a/ui/ui-desktop/samples/src/jvmMain/kotlin/androidx/ui/desktop/examples/example1/Main.kt
+++ b/ui/ui-desktop/samples/src/jvmMain/kotlin/androidx/ui/desktop/examples/example1/Main.kt
@@ -39,11 +39,11 @@
import androidx.ui.material.Scaffold
import androidx.ui.material.Slider
import androidx.ui.material.TopAppBar
-import androidx.ui.text.AnnotatedString
-import androidx.ui.text.SpanStyle
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.SpanStyle
import androidx.ui.unit.dp
import androidx.ui.unit.sp
-import androidx.ui.text.font.fontFamily
+import androidx.compose.ui.text.font.fontFamily
import androidx.ui.desktop.font
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.background
diff --git a/ui/ui-desktop/src/jvmMain/kotlin/androidx/ui/desktop/ComposeInit.kt b/ui/ui-desktop/src/jvmMain/kotlin/androidx/ui/desktop/ComposeInit.kt
index 01c1d31..466c594 100644
--- a/ui/ui-desktop/src/jvmMain/kotlin/androidx/ui/desktop/ComposeInit.kt
+++ b/ui/ui-desktop/src/jvmMain/kotlin/androidx/ui/desktop/ComposeInit.kt
@@ -29,8 +29,8 @@
import androidx.ui.graphics.DesktopPath
import androidx.ui.graphics.DesktopRadialGradientShader
import androidx.ui.graphics.GraphicsFactory
-import androidx.ui.text.platform.paragraphActualFactory
-import androidx.ui.text.platform.paragraphIntrinsicsActualFactory
+import androidx.compose.ui.text.platform.paragraphActualFactory
+import androidx.compose.ui.text.platform.paragraphIntrinsicsActualFactory
import org.jetbrains.skija.Library
/**
diff --git a/ui/ui-desktop/src/jvmMain/kotlin/androidx/ui/desktop/DesktopFont.kt b/ui/ui-desktop/src/jvmMain/kotlin/androidx/ui/desktop/DesktopFont.kt
index 96973d6..4aca644 100644
--- a/ui/ui-desktop/src/jvmMain/kotlin/androidx/ui/desktop/DesktopFont.kt
+++ b/ui/ui-desktop/src/jvmMain/kotlin/androidx/ui/desktop/DesktopFont.kt
@@ -15,11 +15,11 @@
*/
package androidx.ui.desktop
-import androidx.ui.text.font.Font as uiFont
-import androidx.ui.text.font.FontWeight
-import androidx.ui.text.font.FontStyle
-import androidx.ui.text.font.FontFamily
-import androidx.ui.text.font.FontListFontFamily
+import androidx.compose.ui.text.font.Font as uiFont
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontListFontFamily
import org.jetbrains.skija.FontMgr
import org.jetbrains.skija.Typeface
import org.jetbrains.skija.paragraph.FontCollection
diff --git a/ui/ui-desktop/src/jvmMain/kotlin/androidx/ui/desktop/DesktopParagraph.kt b/ui/ui-desktop/src/jvmMain/kotlin/androidx/ui/desktop/DesktopParagraph.kt
index 16b1710..b3f7aad 100644
--- a/ui/ui-desktop/src/jvmMain/kotlin/androidx/ui/desktop/DesktopParagraph.kt
+++ b/ui/ui-desktop/src/jvmMain/kotlin/androidx/ui/desktop/DesktopParagraph.kt
@@ -21,11 +21,11 @@
import androidx.ui.graphics.DesktopPath
import androidx.ui.graphics.Path
import androidx.ui.graphics.toAndroidX
-import androidx.ui.text.Paragraph
-import androidx.ui.text.ParagraphConstraints
-import androidx.ui.text.ParagraphIntrinsics
-import androidx.ui.text.TextRange
-import androidx.ui.text.style.ResolvedTextDirection
+import androidx.compose.ui.text.Paragraph
+import androidx.compose.ui.text.ParagraphConstraints
+import androidx.compose.ui.text.ParagraphIntrinsics
+import androidx.compose.ui.text.TextRange
+import androidx.compose.ui.text.style.ResolvedTextDirection
import org.jetbrains.skija.paragraph.LineMetrics
import org.jetbrains.skija.paragraph.RectHeightMode
import org.jetbrains.skija.paragraph.RectWidthMode
diff --git a/ui/ui-desktop/src/jvmMain/kotlin/androidx/ui/desktop/DesktopParagraphIntrinsics.kt b/ui/ui-desktop/src/jvmMain/kotlin/androidx/ui/desktop/DesktopParagraphIntrinsics.kt
index a17b297..6c69c12 100644
--- a/ui/ui-desktop/src/jvmMain/kotlin/androidx/ui/desktop/DesktopParagraphIntrinsics.kt
+++ b/ui/ui-desktop/src/jvmMain/kotlin/androidx/ui/desktop/DesktopParagraphIntrinsics.kt
@@ -17,13 +17,13 @@
import androidx.ui.graphics.Color
import androidx.ui.graphics.toArgb
-import androidx.ui.text.AnnotatedString
-import androidx.ui.text.ParagraphIntrinsics
-import androidx.ui.text.Placeholder
-import androidx.ui.text.SpanStyle
-import androidx.ui.text.SpanStyleRange
-import androidx.ui.text.TextStyle
-import androidx.ui.text.font.Font
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.ParagraphIntrinsics
+import androidx.compose.ui.text.Placeholder
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.SpanStyleRange
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.Font
import androidx.ui.unit.Density
import androidx.ui.unit.TextUnit
import kotlin.math.ceil
diff --git a/ui/ui-desktop/src/jvmMain/kotlin/androidx/ui/desktop/DesktopPlatformInput.kt b/ui/ui-desktop/src/jvmMain/kotlin/androidx/ui/desktop/DesktopPlatformInput.kt
index 7d717dc..73d6efb 100644
--- a/ui/ui-desktop/src/jvmMain/kotlin/androidx/ui/desktop/DesktopPlatformInput.kt
+++ b/ui/ui-desktop/src/jvmMain/kotlin/androidx/ui/desktop/DesktopPlatformInput.kt
@@ -15,14 +15,14 @@
*/
package androidx.ui.desktop
-import androidx.ui.input.BackspaceKeyEditOp
-import androidx.ui.input.CommitTextEditOp
-import androidx.ui.input.EditOperation
-import androidx.ui.input.TextFieldValue
-import androidx.ui.input.ImeAction
-import androidx.ui.input.KeyboardType
-import androidx.ui.input.MoveCursorEditOp
-import androidx.ui.input.PlatformTextInputService
+import androidx.compose.ui.text.input.BackspaceKeyEditOp
+import androidx.compose.ui.text.input.CommitTextEditOp
+import androidx.compose.ui.text.input.EditOperation
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.text.input.MoveCursorEditOp
+import androidx.compose.ui.text.input.PlatformTextInputService
import androidx.ui.geometry.Rect
import java.awt.event.KeyEvent
diff --git a/ui/ui-desktop/src/jvmMain/kotlin/androidx/ui/desktop/SkiaWindow.kt b/ui/ui-desktop/src/jvmMain/kotlin/androidx/ui/desktop/SkiaWindow.kt
index 85803438..babe747 100644
--- a/ui/ui-desktop/src/jvmMain/kotlin/androidx/ui/desktop/SkiaWindow.kt
+++ b/ui/ui-desktop/src/jvmMain/kotlin/androidx/ui/desktop/SkiaWindow.kt
@@ -17,8 +17,8 @@
import androidx.compose.animation.core.AnimationClockObserver
import androidx.compose.runtime.dispatch.DesktopUiDispatcher
-import androidx.ui.text.platform.paragraphActualFactory
-import androidx.ui.text.platform.paragraphIntrinsicsActualFactory
+import androidx.compose.ui.text.platform.paragraphActualFactory
+import androidx.compose.ui.text.platform.paragraphIntrinsicsActualFactory
import com.jogamp.opengl.GL
import com.jogamp.opengl.GLAutoDrawable
import com.jogamp.opengl.GLCapabilities
diff --git a/ui/ui-desktop/src/jvmMain/kotlin/androidx/ui/desktop/test/TestSkiaWindow.kt b/ui/ui-desktop/src/jvmMain/kotlin/androidx/ui/desktop/test/TestSkiaWindow.kt
index 6898f08..cacd0b8 100644
--- a/ui/ui-desktop/src/jvmMain/kotlin/androidx/ui/desktop/test/TestSkiaWindow.kt
+++ b/ui/ui-desktop/src/jvmMain/kotlin/androidx/ui/desktop/test/TestSkiaWindow.kt
@@ -34,7 +34,7 @@
import androidx.ui.desktop.DesktopPlatformInput
import androidx.ui.desktop.FontLoader
import androidx.ui.desktop.initCompose
-import androidx.ui.input.TextInputService
+import androidx.compose.ui.text.input.TextInputService
import org.jetbrains.skija.Canvas
import org.jetbrains.skija.Surface
diff --git a/ui/ui-desktop/src/jvmMain/kotlin/androidx/ui/view/LayoutScope.kt b/ui/ui-desktop/src/jvmMain/kotlin/androidx/ui/view/LayoutScope.kt
index bcdc970..8b25fec 100644
--- a/ui/ui-desktop/src/jvmMain/kotlin/androidx/ui/view/LayoutScope.kt
+++ b/ui/ui-desktop/src/jvmMain/kotlin/androidx/ui/view/LayoutScope.kt
@@ -37,7 +37,7 @@
import androidx.ui.desktop.DesktopSelectionContainer
import androidx.ui.desktop.FontLoader
import androidx.ui.desktop.LayoutScopeGlobal
-import androidx.ui.input.TextInputService
+import androidx.compose.ui.text.input.TextInputService
import androidx.ui.unit.IntOffset
import com.jogamp.opengl.awt.GLCanvas
import org.jetbrains.skija.Canvas
diff --git a/ui/ui-desktop/src/jvmTest/kotlin/androidx/ui/desktop/ParagraphTest.kt b/ui/ui-desktop/src/jvmTest/kotlin/androidx/ui/desktop/ParagraphTest.kt
index ec6154c..6049651 100644
--- a/ui/ui-desktop/src/jvmTest/kotlin/androidx/ui/desktop/ParagraphTest.kt
+++ b/ui/ui-desktop/src/jvmTest/kotlin/androidx/ui/desktop/ParagraphTest.kt
@@ -30,9 +30,9 @@
import androidx.compose.foundation.layout.wrapContentSize
import androidx.ui.material.Scaffold
import androidx.ui.material.TopAppBar
-import androidx.ui.text.AnnotatedString
-import androidx.ui.text.SpanStyle
-import androidx.ui.text.font.fontFamily
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.font.fontFamily
import androidx.ui.unit.dp
import androidx.ui.unit.sp
import org.junit.Rule
diff --git a/ui/ui-foundation/api/0.1.0-dev16.txt b/ui/ui-foundation/api/0.1.0-dev16.txt
index d023b01..2e4af4f 100644
--- a/ui/ui-foundation/api/0.1.0-dev16.txt
+++ b/ui/ui-foundation/api/0.1.0-dev16.txt
@@ -13,7 +13,7 @@
}
public final class BaseTextFieldKt {
- method @androidx.compose.Composable @androidx.compose.foundation.ExperimentalFoundationApi public static void BaseTextField-63P0bO0(androidx.ui.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.ui.input.TextFieldValue,kotlin.Unit> onValueChange, androidx.ui.core.Modifier modifier = Modifier, long textColor = Color.Unset, androidx.ui.text.TextStyle textStyle = currentTextStyle(), androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function1<? super androidx.ui.input.ImeAction,kotlin.Unit> kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> androidx.ui.input.VisualTransformation visualTransformation = VisualTransformation.None, kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> long cursorColor = contentColor());
+ method @androidx.compose.Composable @androidx.compose.foundation.ExperimentalFoundationApi public static void BaseTextField-hrKMqGY(androidx.compose.ui.text.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.TextFieldValue,kotlin.Unit> onValueChange, androidx.ui.core.Modifier modifier = Modifier, long textColor = Color.Unset, androidx.compose.ui.text.TextStyle textStyle = currentTextStyle(), androidx.compose.ui.text.input.KeyboardType keyboardType = KeyboardType.Text, androidx.compose.ui.text.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.ImeAction,kotlin.Unit> kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> androidx.compose.ui.text.input.VisualTransformation visualTransformation = VisualTransformation.None, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> long cursorColor = contentColor());
}
@androidx.compose.Immutable public final class Border {
@@ -46,7 +46,7 @@
}
public final class ClickableTextKt {
- method @androidx.compose.Composable public static void ClickableText(androidx.ui.text.AnnotatedString text, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.text.TextStyle style = TextStyle.Default, boolean softWrap = true, androidx.ui.text.style.TextOverflow overflow = TextOverflow.Clip, int maxLines = 2147483647, kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> kotlin.jvm.functions.Function1<? super java.lang.Integer,kotlin.Unit> onClick);
+ method @androidx.compose.Composable public static void ClickableText(androidx.compose.ui.text.AnnotatedString text, androidx.ui.core.Modifier modifier = Modifier, androidx.compose.ui.text.TextStyle style = TextStyle.Default, boolean softWrap = true, androidx.compose.ui.text.style.TextOverflow overflow = TextOverflow.Clip, int maxLines = 2147483647, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> kotlin.jvm.functions.Function1<? super java.lang.Integer,kotlin.Unit> onClick);
}
public final class ContentColorKt {
@@ -197,10 +197,10 @@
}
public final class TextKt {
- method @androidx.compose.Composable public static void ProvideTextStyle(androidx.ui.text.TextStyle value, kotlin.jvm.functions.Function0<kotlin.Unit> children);
- method @androidx.compose.Composable public static void Text-0VOI5ok(String text, androidx.ui.core.Modifier modifier = Modifier, long color = Color.Unset, long fontSize = TextUnit.Inherit, androidx.ui.text.font.FontStyle? fontStyle = null, androidx.ui.text.font.FontWeight? fontWeight = null, androidx.ui.text.font.FontFamily? fontFamily = null, long letterSpacing = TextUnit.Inherit, androidx.ui.text.style.TextDecoration? textDecoration = null, androidx.ui.text.style.TextAlign? textAlign = null, long lineHeight = TextUnit.Inherit, androidx.ui.text.style.TextOverflow overflow = TextOverflow.Clip, boolean softWrap = true, int maxLines = 2147483647, java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent = mapOf(), kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> androidx.ui.text.TextStyle style = currentTextStyle());
- method @androidx.compose.Composable public static void Text-GyNEQHM(androidx.ui.text.AnnotatedString text, androidx.ui.core.Modifier modifier = Modifier, long color = Color.Unset, long fontSize = TextUnit.Inherit, androidx.ui.text.font.FontStyle? fontStyle = null, androidx.ui.text.font.FontWeight? fontWeight = null, androidx.ui.text.font.FontFamily? fontFamily = null, long letterSpacing = TextUnit.Inherit, androidx.ui.text.style.TextDecoration? textDecoration = null, androidx.ui.text.style.TextAlign? textAlign = null, long lineHeight = TextUnit.Inherit, androidx.ui.text.style.TextOverflow overflow = TextOverflow.Clip, boolean softWrap = true, int maxLines = 2147483647, java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent = mapOf(), kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> androidx.ui.text.TextStyle style = currentTextStyle());
- method @androidx.compose.Composable public static androidx.ui.text.TextStyle currentTextStyle();
+ method @androidx.compose.Composable public static void ProvideTextStyle(androidx.compose.ui.text.TextStyle value, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+ method @androidx.compose.Composable public static void Text-TzwKYGo(androidx.compose.ui.text.AnnotatedString text, androidx.ui.core.Modifier modifier = Modifier, long color = Color.Unset, long fontSize = TextUnit.Inherit, androidx.compose.ui.text.font.FontStyle? fontStyle = null, androidx.compose.ui.text.font.FontWeight? fontWeight = null, androidx.compose.ui.text.font.FontFamily? fontFamily = null, long letterSpacing = TextUnit.Inherit, androidx.compose.ui.text.style.TextDecoration? textDecoration = null, androidx.compose.ui.text.style.TextAlign? textAlign = null, long lineHeight = TextUnit.Inherit, androidx.compose.ui.text.style.TextOverflow overflow = TextOverflow.Clip, boolean softWrap = true, int maxLines = 2147483647, java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent = mapOf(), kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> androidx.compose.ui.text.TextStyle style = currentTextStyle());
+ method @androidx.compose.Composable public static void Text-ofH8Il4(String text, androidx.ui.core.Modifier modifier = Modifier, long color = Color.Unset, long fontSize = TextUnit.Inherit, androidx.compose.ui.text.font.FontStyle? fontStyle = null, androidx.compose.ui.text.font.FontWeight? fontWeight = null, androidx.compose.ui.text.font.FontFamily? fontFamily = null, long letterSpacing = TextUnit.Inherit, androidx.compose.ui.text.style.TextDecoration? textDecoration = null, androidx.compose.ui.text.style.TextAlign? textAlign = null, long lineHeight = TextUnit.Inherit, androidx.compose.ui.text.style.TextOverflow overflow = TextOverflow.Clip, boolean softWrap = true, int maxLines = 2147483647, java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent = mapOf(), kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> androidx.compose.ui.text.TextStyle style = currentTextStyle());
+ method @androidx.compose.Composable public static androidx.compose.ui.text.TextStyle currentTextStyle();
}
}
diff --git a/ui/ui-foundation/api/current.txt b/ui/ui-foundation/api/current.txt
index d023b01..2e4af4f 100644
--- a/ui/ui-foundation/api/current.txt
+++ b/ui/ui-foundation/api/current.txt
@@ -13,7 +13,7 @@
}
public final class BaseTextFieldKt {
- method @androidx.compose.Composable @androidx.compose.foundation.ExperimentalFoundationApi public static void BaseTextField-63P0bO0(androidx.ui.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.ui.input.TextFieldValue,kotlin.Unit> onValueChange, androidx.ui.core.Modifier modifier = Modifier, long textColor = Color.Unset, androidx.ui.text.TextStyle textStyle = currentTextStyle(), androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function1<? super androidx.ui.input.ImeAction,kotlin.Unit> kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> androidx.ui.input.VisualTransformation visualTransformation = VisualTransformation.None, kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> long cursorColor = contentColor());
+ method @androidx.compose.Composable @androidx.compose.foundation.ExperimentalFoundationApi public static void BaseTextField-hrKMqGY(androidx.compose.ui.text.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.TextFieldValue,kotlin.Unit> onValueChange, androidx.ui.core.Modifier modifier = Modifier, long textColor = Color.Unset, androidx.compose.ui.text.TextStyle textStyle = currentTextStyle(), androidx.compose.ui.text.input.KeyboardType keyboardType = KeyboardType.Text, androidx.compose.ui.text.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.ImeAction,kotlin.Unit> kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> androidx.compose.ui.text.input.VisualTransformation visualTransformation = VisualTransformation.None, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> long cursorColor = contentColor());
}
@androidx.compose.Immutable public final class Border {
@@ -46,7 +46,7 @@
}
public final class ClickableTextKt {
- method @androidx.compose.Composable public static void ClickableText(androidx.ui.text.AnnotatedString text, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.text.TextStyle style = TextStyle.Default, boolean softWrap = true, androidx.ui.text.style.TextOverflow overflow = TextOverflow.Clip, int maxLines = 2147483647, kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> kotlin.jvm.functions.Function1<? super java.lang.Integer,kotlin.Unit> onClick);
+ method @androidx.compose.Composable public static void ClickableText(androidx.compose.ui.text.AnnotatedString text, androidx.ui.core.Modifier modifier = Modifier, androidx.compose.ui.text.TextStyle style = TextStyle.Default, boolean softWrap = true, androidx.compose.ui.text.style.TextOverflow overflow = TextOverflow.Clip, int maxLines = 2147483647, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> kotlin.jvm.functions.Function1<? super java.lang.Integer,kotlin.Unit> onClick);
}
public final class ContentColorKt {
@@ -197,10 +197,10 @@
}
public final class TextKt {
- method @androidx.compose.Composable public static void ProvideTextStyle(androidx.ui.text.TextStyle value, kotlin.jvm.functions.Function0<kotlin.Unit> children);
- method @androidx.compose.Composable public static void Text-0VOI5ok(String text, androidx.ui.core.Modifier modifier = Modifier, long color = Color.Unset, long fontSize = TextUnit.Inherit, androidx.ui.text.font.FontStyle? fontStyle = null, androidx.ui.text.font.FontWeight? fontWeight = null, androidx.ui.text.font.FontFamily? fontFamily = null, long letterSpacing = TextUnit.Inherit, androidx.ui.text.style.TextDecoration? textDecoration = null, androidx.ui.text.style.TextAlign? textAlign = null, long lineHeight = TextUnit.Inherit, androidx.ui.text.style.TextOverflow overflow = TextOverflow.Clip, boolean softWrap = true, int maxLines = 2147483647, java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent = mapOf(), kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> androidx.ui.text.TextStyle style = currentTextStyle());
- method @androidx.compose.Composable public static void Text-GyNEQHM(androidx.ui.text.AnnotatedString text, androidx.ui.core.Modifier modifier = Modifier, long color = Color.Unset, long fontSize = TextUnit.Inherit, androidx.ui.text.font.FontStyle? fontStyle = null, androidx.ui.text.font.FontWeight? fontWeight = null, androidx.ui.text.font.FontFamily? fontFamily = null, long letterSpacing = TextUnit.Inherit, androidx.ui.text.style.TextDecoration? textDecoration = null, androidx.ui.text.style.TextAlign? textAlign = null, long lineHeight = TextUnit.Inherit, androidx.ui.text.style.TextOverflow overflow = TextOverflow.Clip, boolean softWrap = true, int maxLines = 2147483647, java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent = mapOf(), kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> androidx.ui.text.TextStyle style = currentTextStyle());
- method @androidx.compose.Composable public static androidx.ui.text.TextStyle currentTextStyle();
+ method @androidx.compose.Composable public static void ProvideTextStyle(androidx.compose.ui.text.TextStyle value, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+ method @androidx.compose.Composable public static void Text-TzwKYGo(androidx.compose.ui.text.AnnotatedString text, androidx.ui.core.Modifier modifier = Modifier, long color = Color.Unset, long fontSize = TextUnit.Inherit, androidx.compose.ui.text.font.FontStyle? fontStyle = null, androidx.compose.ui.text.font.FontWeight? fontWeight = null, androidx.compose.ui.text.font.FontFamily? fontFamily = null, long letterSpacing = TextUnit.Inherit, androidx.compose.ui.text.style.TextDecoration? textDecoration = null, androidx.compose.ui.text.style.TextAlign? textAlign = null, long lineHeight = TextUnit.Inherit, androidx.compose.ui.text.style.TextOverflow overflow = TextOverflow.Clip, boolean softWrap = true, int maxLines = 2147483647, java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent = mapOf(), kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> androidx.compose.ui.text.TextStyle style = currentTextStyle());
+ method @androidx.compose.Composable public static void Text-ofH8Il4(String text, androidx.ui.core.Modifier modifier = Modifier, long color = Color.Unset, long fontSize = TextUnit.Inherit, androidx.compose.ui.text.font.FontStyle? fontStyle = null, androidx.compose.ui.text.font.FontWeight? fontWeight = null, androidx.compose.ui.text.font.FontFamily? fontFamily = null, long letterSpacing = TextUnit.Inherit, androidx.compose.ui.text.style.TextDecoration? textDecoration = null, androidx.compose.ui.text.style.TextAlign? textAlign = null, long lineHeight = TextUnit.Inherit, androidx.compose.ui.text.style.TextOverflow overflow = TextOverflow.Clip, boolean softWrap = true, int maxLines = 2147483647, java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent = mapOf(), kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> androidx.compose.ui.text.TextStyle style = currentTextStyle());
+ method @androidx.compose.Composable public static androidx.compose.ui.text.TextStyle currentTextStyle();
}
}
diff --git a/ui/ui-foundation/api/public_plus_experimental_0.1.0-dev16.txt b/ui/ui-foundation/api/public_plus_experimental_0.1.0-dev16.txt
index d023b01..2e4af4f 100644
--- a/ui/ui-foundation/api/public_plus_experimental_0.1.0-dev16.txt
+++ b/ui/ui-foundation/api/public_plus_experimental_0.1.0-dev16.txt
@@ -13,7 +13,7 @@
}
public final class BaseTextFieldKt {
- method @androidx.compose.Composable @androidx.compose.foundation.ExperimentalFoundationApi public static void BaseTextField-63P0bO0(androidx.ui.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.ui.input.TextFieldValue,kotlin.Unit> onValueChange, androidx.ui.core.Modifier modifier = Modifier, long textColor = Color.Unset, androidx.ui.text.TextStyle textStyle = currentTextStyle(), androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function1<? super androidx.ui.input.ImeAction,kotlin.Unit> kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> androidx.ui.input.VisualTransformation visualTransformation = VisualTransformation.None, kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> long cursorColor = contentColor());
+ method @androidx.compose.Composable @androidx.compose.foundation.ExperimentalFoundationApi public static void BaseTextField-hrKMqGY(androidx.compose.ui.text.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.TextFieldValue,kotlin.Unit> onValueChange, androidx.ui.core.Modifier modifier = Modifier, long textColor = Color.Unset, androidx.compose.ui.text.TextStyle textStyle = currentTextStyle(), androidx.compose.ui.text.input.KeyboardType keyboardType = KeyboardType.Text, androidx.compose.ui.text.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.ImeAction,kotlin.Unit> kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> androidx.compose.ui.text.input.VisualTransformation visualTransformation = VisualTransformation.None, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> long cursorColor = contentColor());
}
@androidx.compose.Immutable public final class Border {
@@ -46,7 +46,7 @@
}
public final class ClickableTextKt {
- method @androidx.compose.Composable public static void ClickableText(androidx.ui.text.AnnotatedString text, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.text.TextStyle style = TextStyle.Default, boolean softWrap = true, androidx.ui.text.style.TextOverflow overflow = TextOverflow.Clip, int maxLines = 2147483647, kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> kotlin.jvm.functions.Function1<? super java.lang.Integer,kotlin.Unit> onClick);
+ method @androidx.compose.Composable public static void ClickableText(androidx.compose.ui.text.AnnotatedString text, androidx.ui.core.Modifier modifier = Modifier, androidx.compose.ui.text.TextStyle style = TextStyle.Default, boolean softWrap = true, androidx.compose.ui.text.style.TextOverflow overflow = TextOverflow.Clip, int maxLines = 2147483647, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> kotlin.jvm.functions.Function1<? super java.lang.Integer,kotlin.Unit> onClick);
}
public final class ContentColorKt {
@@ -197,10 +197,10 @@
}
public final class TextKt {
- method @androidx.compose.Composable public static void ProvideTextStyle(androidx.ui.text.TextStyle value, kotlin.jvm.functions.Function0<kotlin.Unit> children);
- method @androidx.compose.Composable public static void Text-0VOI5ok(String text, androidx.ui.core.Modifier modifier = Modifier, long color = Color.Unset, long fontSize = TextUnit.Inherit, androidx.ui.text.font.FontStyle? fontStyle = null, androidx.ui.text.font.FontWeight? fontWeight = null, androidx.ui.text.font.FontFamily? fontFamily = null, long letterSpacing = TextUnit.Inherit, androidx.ui.text.style.TextDecoration? textDecoration = null, androidx.ui.text.style.TextAlign? textAlign = null, long lineHeight = TextUnit.Inherit, androidx.ui.text.style.TextOverflow overflow = TextOverflow.Clip, boolean softWrap = true, int maxLines = 2147483647, java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent = mapOf(), kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> androidx.ui.text.TextStyle style = currentTextStyle());
- method @androidx.compose.Composable public static void Text-GyNEQHM(androidx.ui.text.AnnotatedString text, androidx.ui.core.Modifier modifier = Modifier, long color = Color.Unset, long fontSize = TextUnit.Inherit, androidx.ui.text.font.FontStyle? fontStyle = null, androidx.ui.text.font.FontWeight? fontWeight = null, androidx.ui.text.font.FontFamily? fontFamily = null, long letterSpacing = TextUnit.Inherit, androidx.ui.text.style.TextDecoration? textDecoration = null, androidx.ui.text.style.TextAlign? textAlign = null, long lineHeight = TextUnit.Inherit, androidx.ui.text.style.TextOverflow overflow = TextOverflow.Clip, boolean softWrap = true, int maxLines = 2147483647, java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent = mapOf(), kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> androidx.ui.text.TextStyle style = currentTextStyle());
- method @androidx.compose.Composable public static androidx.ui.text.TextStyle currentTextStyle();
+ method @androidx.compose.Composable public static void ProvideTextStyle(androidx.compose.ui.text.TextStyle value, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+ method @androidx.compose.Composable public static void Text-TzwKYGo(androidx.compose.ui.text.AnnotatedString text, androidx.ui.core.Modifier modifier = Modifier, long color = Color.Unset, long fontSize = TextUnit.Inherit, androidx.compose.ui.text.font.FontStyle? fontStyle = null, androidx.compose.ui.text.font.FontWeight? fontWeight = null, androidx.compose.ui.text.font.FontFamily? fontFamily = null, long letterSpacing = TextUnit.Inherit, androidx.compose.ui.text.style.TextDecoration? textDecoration = null, androidx.compose.ui.text.style.TextAlign? textAlign = null, long lineHeight = TextUnit.Inherit, androidx.compose.ui.text.style.TextOverflow overflow = TextOverflow.Clip, boolean softWrap = true, int maxLines = 2147483647, java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent = mapOf(), kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> androidx.compose.ui.text.TextStyle style = currentTextStyle());
+ method @androidx.compose.Composable public static void Text-ofH8Il4(String text, androidx.ui.core.Modifier modifier = Modifier, long color = Color.Unset, long fontSize = TextUnit.Inherit, androidx.compose.ui.text.font.FontStyle? fontStyle = null, androidx.compose.ui.text.font.FontWeight? fontWeight = null, androidx.compose.ui.text.font.FontFamily? fontFamily = null, long letterSpacing = TextUnit.Inherit, androidx.compose.ui.text.style.TextDecoration? textDecoration = null, androidx.compose.ui.text.style.TextAlign? textAlign = null, long lineHeight = TextUnit.Inherit, androidx.compose.ui.text.style.TextOverflow overflow = TextOverflow.Clip, boolean softWrap = true, int maxLines = 2147483647, java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent = mapOf(), kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> androidx.compose.ui.text.TextStyle style = currentTextStyle());
+ method @androidx.compose.Composable public static androidx.compose.ui.text.TextStyle currentTextStyle();
}
}
diff --git a/ui/ui-foundation/api/public_plus_experimental_current.txt b/ui/ui-foundation/api/public_plus_experimental_current.txt
index d023b01..2e4af4f 100644
--- a/ui/ui-foundation/api/public_plus_experimental_current.txt
+++ b/ui/ui-foundation/api/public_plus_experimental_current.txt
@@ -13,7 +13,7 @@
}
public final class BaseTextFieldKt {
- method @androidx.compose.Composable @androidx.compose.foundation.ExperimentalFoundationApi public static void BaseTextField-63P0bO0(androidx.ui.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.ui.input.TextFieldValue,kotlin.Unit> onValueChange, androidx.ui.core.Modifier modifier = Modifier, long textColor = Color.Unset, androidx.ui.text.TextStyle textStyle = currentTextStyle(), androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function1<? super androidx.ui.input.ImeAction,kotlin.Unit> kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> androidx.ui.input.VisualTransformation visualTransformation = VisualTransformation.None, kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> long cursorColor = contentColor());
+ method @androidx.compose.Composable @androidx.compose.foundation.ExperimentalFoundationApi public static void BaseTextField-hrKMqGY(androidx.compose.ui.text.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.TextFieldValue,kotlin.Unit> onValueChange, androidx.ui.core.Modifier modifier = Modifier, long textColor = Color.Unset, androidx.compose.ui.text.TextStyle textStyle = currentTextStyle(), androidx.compose.ui.text.input.KeyboardType keyboardType = KeyboardType.Text, androidx.compose.ui.text.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.ImeAction,kotlin.Unit> kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> androidx.compose.ui.text.input.VisualTransformation visualTransformation = VisualTransformation.None, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> long cursorColor = contentColor());
}
@androidx.compose.Immutable public final class Border {
@@ -46,7 +46,7 @@
}
public final class ClickableTextKt {
- method @androidx.compose.Composable public static void ClickableText(androidx.ui.text.AnnotatedString text, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.text.TextStyle style = TextStyle.Default, boolean softWrap = true, androidx.ui.text.style.TextOverflow overflow = TextOverflow.Clip, int maxLines = 2147483647, kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> kotlin.jvm.functions.Function1<? super java.lang.Integer,kotlin.Unit> onClick);
+ method @androidx.compose.Composable public static void ClickableText(androidx.compose.ui.text.AnnotatedString text, androidx.ui.core.Modifier modifier = Modifier, androidx.compose.ui.text.TextStyle style = TextStyle.Default, boolean softWrap = true, androidx.compose.ui.text.style.TextOverflow overflow = TextOverflow.Clip, int maxLines = 2147483647, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> kotlin.jvm.functions.Function1<? super java.lang.Integer,kotlin.Unit> onClick);
}
public final class ContentColorKt {
@@ -197,10 +197,10 @@
}
public final class TextKt {
- method @androidx.compose.Composable public static void ProvideTextStyle(androidx.ui.text.TextStyle value, kotlin.jvm.functions.Function0<kotlin.Unit> children);
- method @androidx.compose.Composable public static void Text-0VOI5ok(String text, androidx.ui.core.Modifier modifier = Modifier, long color = Color.Unset, long fontSize = TextUnit.Inherit, androidx.ui.text.font.FontStyle? fontStyle = null, androidx.ui.text.font.FontWeight? fontWeight = null, androidx.ui.text.font.FontFamily? fontFamily = null, long letterSpacing = TextUnit.Inherit, androidx.ui.text.style.TextDecoration? textDecoration = null, androidx.ui.text.style.TextAlign? textAlign = null, long lineHeight = TextUnit.Inherit, androidx.ui.text.style.TextOverflow overflow = TextOverflow.Clip, boolean softWrap = true, int maxLines = 2147483647, java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent = mapOf(), kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> androidx.ui.text.TextStyle style = currentTextStyle());
- method @androidx.compose.Composable public static void Text-GyNEQHM(androidx.ui.text.AnnotatedString text, androidx.ui.core.Modifier modifier = Modifier, long color = Color.Unset, long fontSize = TextUnit.Inherit, androidx.ui.text.font.FontStyle? fontStyle = null, androidx.ui.text.font.FontWeight? fontWeight = null, androidx.ui.text.font.FontFamily? fontFamily = null, long letterSpacing = TextUnit.Inherit, androidx.ui.text.style.TextDecoration? textDecoration = null, androidx.ui.text.style.TextAlign? textAlign = null, long lineHeight = TextUnit.Inherit, androidx.ui.text.style.TextOverflow overflow = TextOverflow.Clip, boolean softWrap = true, int maxLines = 2147483647, java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent = mapOf(), kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> androidx.ui.text.TextStyle style = currentTextStyle());
- method @androidx.compose.Composable public static androidx.ui.text.TextStyle currentTextStyle();
+ method @androidx.compose.Composable public static void ProvideTextStyle(androidx.compose.ui.text.TextStyle value, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+ method @androidx.compose.Composable public static void Text-TzwKYGo(androidx.compose.ui.text.AnnotatedString text, androidx.ui.core.Modifier modifier = Modifier, long color = Color.Unset, long fontSize = TextUnit.Inherit, androidx.compose.ui.text.font.FontStyle? fontStyle = null, androidx.compose.ui.text.font.FontWeight? fontWeight = null, androidx.compose.ui.text.font.FontFamily? fontFamily = null, long letterSpacing = TextUnit.Inherit, androidx.compose.ui.text.style.TextDecoration? textDecoration = null, androidx.compose.ui.text.style.TextAlign? textAlign = null, long lineHeight = TextUnit.Inherit, androidx.compose.ui.text.style.TextOverflow overflow = TextOverflow.Clip, boolean softWrap = true, int maxLines = 2147483647, java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent = mapOf(), kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> androidx.compose.ui.text.TextStyle style = currentTextStyle());
+ method @androidx.compose.Composable public static void Text-ofH8Il4(String text, androidx.ui.core.Modifier modifier = Modifier, long color = Color.Unset, long fontSize = TextUnit.Inherit, androidx.compose.ui.text.font.FontStyle? fontStyle = null, androidx.compose.ui.text.font.FontWeight? fontWeight = null, androidx.compose.ui.text.font.FontFamily? fontFamily = null, long letterSpacing = TextUnit.Inherit, androidx.compose.ui.text.style.TextDecoration? textDecoration = null, androidx.compose.ui.text.style.TextAlign? textAlign = null, long lineHeight = TextUnit.Inherit, androidx.compose.ui.text.style.TextOverflow overflow = TextOverflow.Clip, boolean softWrap = true, int maxLines = 2147483647, java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent = mapOf(), kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> androidx.compose.ui.text.TextStyle style = currentTextStyle());
+ method @androidx.compose.Composable public static androidx.compose.ui.text.TextStyle currentTextStyle();
}
}
diff --git a/ui/ui-foundation/api/restricted_0.1.0-dev16.txt b/ui/ui-foundation/api/restricted_0.1.0-dev16.txt
index d023b01..2e4af4f 100644
--- a/ui/ui-foundation/api/restricted_0.1.0-dev16.txt
+++ b/ui/ui-foundation/api/restricted_0.1.0-dev16.txt
@@ -13,7 +13,7 @@
}
public final class BaseTextFieldKt {
- method @androidx.compose.Composable @androidx.compose.foundation.ExperimentalFoundationApi public static void BaseTextField-63P0bO0(androidx.ui.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.ui.input.TextFieldValue,kotlin.Unit> onValueChange, androidx.ui.core.Modifier modifier = Modifier, long textColor = Color.Unset, androidx.ui.text.TextStyle textStyle = currentTextStyle(), androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function1<? super androidx.ui.input.ImeAction,kotlin.Unit> kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> androidx.ui.input.VisualTransformation visualTransformation = VisualTransformation.None, kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> long cursorColor = contentColor());
+ method @androidx.compose.Composable @androidx.compose.foundation.ExperimentalFoundationApi public static void BaseTextField-hrKMqGY(androidx.compose.ui.text.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.TextFieldValue,kotlin.Unit> onValueChange, androidx.ui.core.Modifier modifier = Modifier, long textColor = Color.Unset, androidx.compose.ui.text.TextStyle textStyle = currentTextStyle(), androidx.compose.ui.text.input.KeyboardType keyboardType = KeyboardType.Text, androidx.compose.ui.text.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.ImeAction,kotlin.Unit> kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> androidx.compose.ui.text.input.VisualTransformation visualTransformation = VisualTransformation.None, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> long cursorColor = contentColor());
}
@androidx.compose.Immutable public final class Border {
@@ -46,7 +46,7 @@
}
public final class ClickableTextKt {
- method @androidx.compose.Composable public static void ClickableText(androidx.ui.text.AnnotatedString text, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.text.TextStyle style = TextStyle.Default, boolean softWrap = true, androidx.ui.text.style.TextOverflow overflow = TextOverflow.Clip, int maxLines = 2147483647, kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> kotlin.jvm.functions.Function1<? super java.lang.Integer,kotlin.Unit> onClick);
+ method @androidx.compose.Composable public static void ClickableText(androidx.compose.ui.text.AnnotatedString text, androidx.ui.core.Modifier modifier = Modifier, androidx.compose.ui.text.TextStyle style = TextStyle.Default, boolean softWrap = true, androidx.compose.ui.text.style.TextOverflow overflow = TextOverflow.Clip, int maxLines = 2147483647, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> kotlin.jvm.functions.Function1<? super java.lang.Integer,kotlin.Unit> onClick);
}
public final class ContentColorKt {
@@ -197,10 +197,10 @@
}
public final class TextKt {
- method @androidx.compose.Composable public static void ProvideTextStyle(androidx.ui.text.TextStyle value, kotlin.jvm.functions.Function0<kotlin.Unit> children);
- method @androidx.compose.Composable public static void Text-0VOI5ok(String text, androidx.ui.core.Modifier modifier = Modifier, long color = Color.Unset, long fontSize = TextUnit.Inherit, androidx.ui.text.font.FontStyle? fontStyle = null, androidx.ui.text.font.FontWeight? fontWeight = null, androidx.ui.text.font.FontFamily? fontFamily = null, long letterSpacing = TextUnit.Inherit, androidx.ui.text.style.TextDecoration? textDecoration = null, androidx.ui.text.style.TextAlign? textAlign = null, long lineHeight = TextUnit.Inherit, androidx.ui.text.style.TextOverflow overflow = TextOverflow.Clip, boolean softWrap = true, int maxLines = 2147483647, java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent = mapOf(), kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> androidx.ui.text.TextStyle style = currentTextStyle());
- method @androidx.compose.Composable public static void Text-GyNEQHM(androidx.ui.text.AnnotatedString text, androidx.ui.core.Modifier modifier = Modifier, long color = Color.Unset, long fontSize = TextUnit.Inherit, androidx.ui.text.font.FontStyle? fontStyle = null, androidx.ui.text.font.FontWeight? fontWeight = null, androidx.ui.text.font.FontFamily? fontFamily = null, long letterSpacing = TextUnit.Inherit, androidx.ui.text.style.TextDecoration? textDecoration = null, androidx.ui.text.style.TextAlign? textAlign = null, long lineHeight = TextUnit.Inherit, androidx.ui.text.style.TextOverflow overflow = TextOverflow.Clip, boolean softWrap = true, int maxLines = 2147483647, java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent = mapOf(), kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> androidx.ui.text.TextStyle style = currentTextStyle());
- method @androidx.compose.Composable public static androidx.ui.text.TextStyle currentTextStyle();
+ method @androidx.compose.Composable public static void ProvideTextStyle(androidx.compose.ui.text.TextStyle value, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+ method @androidx.compose.Composable public static void Text-TzwKYGo(androidx.compose.ui.text.AnnotatedString text, androidx.ui.core.Modifier modifier = Modifier, long color = Color.Unset, long fontSize = TextUnit.Inherit, androidx.compose.ui.text.font.FontStyle? fontStyle = null, androidx.compose.ui.text.font.FontWeight? fontWeight = null, androidx.compose.ui.text.font.FontFamily? fontFamily = null, long letterSpacing = TextUnit.Inherit, androidx.compose.ui.text.style.TextDecoration? textDecoration = null, androidx.compose.ui.text.style.TextAlign? textAlign = null, long lineHeight = TextUnit.Inherit, androidx.compose.ui.text.style.TextOverflow overflow = TextOverflow.Clip, boolean softWrap = true, int maxLines = 2147483647, java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent = mapOf(), kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> androidx.compose.ui.text.TextStyle style = currentTextStyle());
+ method @androidx.compose.Composable public static void Text-ofH8Il4(String text, androidx.ui.core.Modifier modifier = Modifier, long color = Color.Unset, long fontSize = TextUnit.Inherit, androidx.compose.ui.text.font.FontStyle? fontStyle = null, androidx.compose.ui.text.font.FontWeight? fontWeight = null, androidx.compose.ui.text.font.FontFamily? fontFamily = null, long letterSpacing = TextUnit.Inherit, androidx.compose.ui.text.style.TextDecoration? textDecoration = null, androidx.compose.ui.text.style.TextAlign? textAlign = null, long lineHeight = TextUnit.Inherit, androidx.compose.ui.text.style.TextOverflow overflow = TextOverflow.Clip, boolean softWrap = true, int maxLines = 2147483647, java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent = mapOf(), kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> androidx.compose.ui.text.TextStyle style = currentTextStyle());
+ method @androidx.compose.Composable public static androidx.compose.ui.text.TextStyle currentTextStyle();
}
}
diff --git a/ui/ui-foundation/api/restricted_current.txt b/ui/ui-foundation/api/restricted_current.txt
index d023b01..2e4af4f 100644
--- a/ui/ui-foundation/api/restricted_current.txt
+++ b/ui/ui-foundation/api/restricted_current.txt
@@ -13,7 +13,7 @@
}
public final class BaseTextFieldKt {
- method @androidx.compose.Composable @androidx.compose.foundation.ExperimentalFoundationApi public static void BaseTextField-63P0bO0(androidx.ui.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.ui.input.TextFieldValue,kotlin.Unit> onValueChange, androidx.ui.core.Modifier modifier = Modifier, long textColor = Color.Unset, androidx.ui.text.TextStyle textStyle = currentTextStyle(), androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function1<? super androidx.ui.input.ImeAction,kotlin.Unit> kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> androidx.ui.input.VisualTransformation visualTransformation = VisualTransformation.None, kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> long cursorColor = contentColor());
+ method @androidx.compose.Composable @androidx.compose.foundation.ExperimentalFoundationApi public static void BaseTextField-hrKMqGY(androidx.compose.ui.text.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.TextFieldValue,kotlin.Unit> onValueChange, androidx.ui.core.Modifier modifier = Modifier, long textColor = Color.Unset, androidx.compose.ui.text.TextStyle textStyle = currentTextStyle(), androidx.compose.ui.text.input.KeyboardType keyboardType = KeyboardType.Text, androidx.compose.ui.text.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.ImeAction,kotlin.Unit> kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> androidx.compose.ui.text.input.VisualTransformation visualTransformation = VisualTransformation.None, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> long cursorColor = contentColor());
}
@androidx.compose.Immutable public final class Border {
@@ -46,7 +46,7 @@
}
public final class ClickableTextKt {
- method @androidx.compose.Composable public static void ClickableText(androidx.ui.text.AnnotatedString text, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.text.TextStyle style = TextStyle.Default, boolean softWrap = true, androidx.ui.text.style.TextOverflow overflow = TextOverflow.Clip, int maxLines = 2147483647, kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> kotlin.jvm.functions.Function1<? super java.lang.Integer,kotlin.Unit> onClick);
+ method @androidx.compose.Composable public static void ClickableText(androidx.compose.ui.text.AnnotatedString text, androidx.ui.core.Modifier modifier = Modifier, androidx.compose.ui.text.TextStyle style = TextStyle.Default, boolean softWrap = true, androidx.compose.ui.text.style.TextOverflow overflow = TextOverflow.Clip, int maxLines = 2147483647, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> kotlin.jvm.functions.Function1<? super java.lang.Integer,kotlin.Unit> onClick);
}
public final class ContentColorKt {
@@ -197,10 +197,10 @@
}
public final class TextKt {
- method @androidx.compose.Composable public static void ProvideTextStyle(androidx.ui.text.TextStyle value, kotlin.jvm.functions.Function0<kotlin.Unit> children);
- method @androidx.compose.Composable public static void Text-0VOI5ok(String text, androidx.ui.core.Modifier modifier = Modifier, long color = Color.Unset, long fontSize = TextUnit.Inherit, androidx.ui.text.font.FontStyle? fontStyle = null, androidx.ui.text.font.FontWeight? fontWeight = null, androidx.ui.text.font.FontFamily? fontFamily = null, long letterSpacing = TextUnit.Inherit, androidx.ui.text.style.TextDecoration? textDecoration = null, androidx.ui.text.style.TextAlign? textAlign = null, long lineHeight = TextUnit.Inherit, androidx.ui.text.style.TextOverflow overflow = TextOverflow.Clip, boolean softWrap = true, int maxLines = 2147483647, java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent = mapOf(), kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> androidx.ui.text.TextStyle style = currentTextStyle());
- method @androidx.compose.Composable public static void Text-GyNEQHM(androidx.ui.text.AnnotatedString text, androidx.ui.core.Modifier modifier = Modifier, long color = Color.Unset, long fontSize = TextUnit.Inherit, androidx.ui.text.font.FontStyle? fontStyle = null, androidx.ui.text.font.FontWeight? fontWeight = null, androidx.ui.text.font.FontFamily? fontFamily = null, long letterSpacing = TextUnit.Inherit, androidx.ui.text.style.TextDecoration? textDecoration = null, androidx.ui.text.style.TextAlign? textAlign = null, long lineHeight = TextUnit.Inherit, androidx.ui.text.style.TextOverflow overflow = TextOverflow.Clip, boolean softWrap = true, int maxLines = 2147483647, java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent = mapOf(), kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> androidx.ui.text.TextStyle style = currentTextStyle());
- method @androidx.compose.Composable public static androidx.ui.text.TextStyle currentTextStyle();
+ method @androidx.compose.Composable public static void ProvideTextStyle(androidx.compose.ui.text.TextStyle value, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+ method @androidx.compose.Composable public static void Text-TzwKYGo(androidx.compose.ui.text.AnnotatedString text, androidx.ui.core.Modifier modifier = Modifier, long color = Color.Unset, long fontSize = TextUnit.Inherit, androidx.compose.ui.text.font.FontStyle? fontStyle = null, androidx.compose.ui.text.font.FontWeight? fontWeight = null, androidx.compose.ui.text.font.FontFamily? fontFamily = null, long letterSpacing = TextUnit.Inherit, androidx.compose.ui.text.style.TextDecoration? textDecoration = null, androidx.compose.ui.text.style.TextAlign? textAlign = null, long lineHeight = TextUnit.Inherit, androidx.compose.ui.text.style.TextOverflow overflow = TextOverflow.Clip, boolean softWrap = true, int maxLines = 2147483647, java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent = mapOf(), kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> androidx.compose.ui.text.TextStyle style = currentTextStyle());
+ method @androidx.compose.Composable public static void Text-ofH8Il4(String text, androidx.ui.core.Modifier modifier = Modifier, long color = Color.Unset, long fontSize = TextUnit.Inherit, androidx.compose.ui.text.font.FontStyle? fontStyle = null, androidx.compose.ui.text.font.FontWeight? fontWeight = null, androidx.compose.ui.text.font.FontFamily? fontFamily = null, long letterSpacing = TextUnit.Inherit, androidx.compose.ui.text.style.TextDecoration? textDecoration = null, androidx.compose.ui.text.style.TextAlign? textAlign = null, long lineHeight = TextUnit.Inherit, androidx.compose.ui.text.style.TextOverflow overflow = TextOverflow.Clip, boolean softWrap = true, int maxLines = 2147483647, java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent = mapOf(), kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> androidx.compose.ui.text.TextStyle style = currentTextStyle());
+ method @androidx.compose.Composable public static androidx.compose.ui.text.TextStyle currentTextStyle();
}
}
diff --git a/ui/ui-foundation/samples/src/main/java/androidx/compose/foundation/samples/ClickableTextSample.kt b/ui/ui-foundation/samples/src/main/java/androidx/compose/foundation/samples/ClickableTextSample.kt
index af930d2..d086c85 100644
--- a/ui/ui-foundation/samples/src/main/java/androidx/compose/foundation/samples/ClickableTextSample.kt
+++ b/ui/ui-foundation/samples/src/main/java/androidx/compose/foundation/samples/ClickableTextSample.kt
@@ -24,10 +24,10 @@
import androidx.ui.core.gesture.longPressGestureFilter
import androidx.compose.foundation.ClickableText
import androidx.compose.foundation.Text
-import androidx.ui.text.AnnotatedString
-import androidx.ui.text.TextLayoutResult
-import androidx.ui.text.TextStyle
-import androidx.ui.text.style.TextOverflow
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.TextLayoutResult
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.style.TextOverflow
@Sampled
@Composable
diff --git a/ui/ui-foundation/samples/src/main/java/androidx/compose/foundation/samples/InteractionStateSample.kt b/ui/ui-foundation/samples/src/main/java/androidx/compose/foundation/samples/InteractionStateSample.kt
index ff14aa0..c7cc5fc 100644
--- a/ui/ui-foundation/samples/src/main/java/androidx/compose/foundation/samples/InteractionStateSample.kt
+++ b/ui/ui-foundation/samples/src/main/java/androidx/compose/foundation/samples/InteractionStateSample.kt
@@ -33,7 +33,7 @@
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.preferredSize
import androidx.compose.foundation.layout.wrapContentSize
-import androidx.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextAlign
import androidx.ui.unit.dp
@Sampled
diff --git a/ui/ui-foundation/samples/src/main/java/androidx/compose/foundation/samples/ScrollableSamples.kt b/ui/ui-foundation/samples/src/main/java/androidx/compose/foundation/samples/ScrollableSamples.kt
index 0e5699a..e428b8e 100644
--- a/ui/ui-foundation/samples/src/main/java/androidx/compose/foundation/samples/ScrollableSamples.kt
+++ b/ui/ui-foundation/samples/src/main/java/androidx/compose/foundation/samples/ScrollableSamples.kt
@@ -28,7 +28,7 @@
import androidx.compose.foundation.gestures.scrollable
import androidx.ui.graphics.Color
import androidx.compose.foundation.layout.preferredSize
-import androidx.ui.text.TextStyle
+import androidx.compose.ui.text.TextStyle
import androidx.ui.unit.dp
import androidx.ui.unit.sp
import kotlin.math.roundToInt
diff --git a/ui/ui-foundation/samples/src/main/java/androidx/compose/foundation/samples/TextFieldSample.kt b/ui/ui-foundation/samples/src/main/java/androidx/compose/foundation/samples/TextFieldSample.kt
index 59d6a20..4b4f1f2 100644
--- a/ui/ui-foundation/samples/src/main/java/androidx/compose/foundation/samples/TextFieldSample.kt
+++ b/ui/ui-foundation/samples/src/main/java/androidx/compose/foundation/samples/TextFieldSample.kt
@@ -23,7 +23,7 @@
import androidx.compose.foundation.BaseTextField
import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.Text
-import androidx.ui.input.TextFieldValue
+import androidx.compose.ui.text.input.TextFieldValue
import androidx.compose.foundation.layout.Stack
import androidx.compose.runtime.savedinstancestate.savedInstanceState
diff --git a/ui/ui-foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/ClickableTextTest.kt b/ui/ui-foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/ClickableTextTest.kt
index 3a3c5c2..9917cf0 100644
--- a/ui/ui-foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/ClickableTextTest.kt
+++ b/ui/ui-foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/ClickableTextTest.kt
@@ -23,7 +23,7 @@
import androidx.ui.test.performClick
import androidx.ui.test.onNodeWithTag
import androidx.ui.test.runOnIdle
-import androidx.ui.text.AnnotatedString
+import androidx.compose.ui.text.AnnotatedString
import com.nhaarman.mockitokotlin2.any
import com.nhaarman.mockitokotlin2.mock
import com.nhaarman.mockitokotlin2.times
diff --git a/ui/ui-foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/SoftwareKeyboardTest.kt b/ui/ui-foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/SoftwareKeyboardTest.kt
index 7f71bc4..4cb556f 100644
--- a/ui/ui-foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/SoftwareKeyboardTest.kt
+++ b/ui/ui-foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/SoftwareKeyboardTest.kt
@@ -21,15 +21,15 @@
import androidx.test.filters.SmallTest
import androidx.ui.core.Modifier
import androidx.ui.core.TextInputServiceAmbient
-import androidx.ui.input.TextFieldValue
-import androidx.ui.input.TextInputService
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.text.input.TextInputService
import androidx.compose.foundation.layout.fillMaxSize
import androidx.ui.test.createComposeRule
import androidx.ui.test.hasInputMethodsSupport
import androidx.ui.test.onNode
import androidx.ui.test.performClick
import androidx.ui.test.runOnIdle
-import androidx.ui.text.SoftwareKeyboardController
+import androidx.compose.ui.text.SoftwareKeyboardController
import com.nhaarman.mockitokotlin2.any
import com.nhaarman.mockitokotlin2.mock
import com.nhaarman.mockitokotlin2.times
diff --git a/ui/ui-foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/TextFieldCursorTest.kt b/ui/ui-foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/TextFieldCursorTest.kt
index 0f3a4a5..1914071 100644
--- a/ui/ui-foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/TextFieldCursorTest.kt
+++ b/ui/ui-foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/TextFieldCursorTest.kt
@@ -23,7 +23,7 @@
import androidx.ui.core.Modifier
import androidx.ui.graphics.Color
import androidx.ui.graphics.RectangleShape
-import androidx.ui.input.TextFieldValue
+import androidx.compose.ui.text.input.TextFieldValue
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.preferredSize
import androidx.ui.test.assertPixels
@@ -34,7 +34,7 @@
import androidx.ui.test.onNode
import androidx.ui.test.hasInputMethodsSupport
import androidx.ui.test.waitForIdle
-import androidx.ui.text.TextStyle
+import androidx.compose.ui.text.TextStyle
import androidx.ui.unit.Density
import androidx.ui.unit.Dp
import androidx.ui.unit.IntSize
diff --git a/ui/ui-foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/TextFieldFocusTest.kt b/ui/ui-foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/TextFieldFocusTest.kt
index eadbce51..3f06c08 100644
--- a/ui/ui-foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/TextFieldFocusTest.kt
+++ b/ui/ui-foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/TextFieldFocusTest.kt
@@ -22,7 +22,7 @@
import androidx.test.filters.LargeTest
import androidx.ui.core.Modifier
import androidx.ui.core.focus.FocusModifier
-import androidx.ui.input.TextFieldValue
+import androidx.compose.ui.text.input.TextFieldValue
import androidx.compose.foundation.layout.width
import androidx.ui.test.createComposeRule
import androidx.ui.test.runOnIdle
diff --git a/ui/ui-foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/TextFieldOnValueChangeTextFieldValueTest.kt b/ui/ui-foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/TextFieldOnValueChangeTextFieldValueTest.kt
index 8a8078b..0487fb7 100644
--- a/ui/ui-foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/TextFieldOnValueChangeTextFieldValueTest.kt
+++ b/ui/ui-foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/TextFieldOnValueChangeTextFieldValueTest.kt
@@ -21,14 +21,14 @@
import androidx.test.filters.SmallTest
import androidx.ui.core.TextInputServiceAmbient
import androidx.ui.geometry.Offset
-import androidx.ui.input.CommitTextEditOp
-import androidx.ui.input.DeleteSurroundingTextEditOp
-import androidx.ui.input.EditOperation
-import androidx.ui.input.FinishComposingTextEditOp
-import androidx.ui.input.SetComposingRegionEditOp
-import androidx.ui.input.SetComposingTextEditOp
-import androidx.ui.input.SetSelectionEditOp
-import androidx.ui.input.TextInputService
+import androidx.compose.ui.text.input.CommitTextEditOp
+import androidx.compose.ui.text.input.DeleteSurroundingTextEditOp
+import androidx.compose.ui.text.input.EditOperation
+import androidx.compose.ui.text.input.FinishComposingTextEditOp
+import androidx.compose.ui.text.input.SetComposingRegionEditOp
+import androidx.compose.ui.text.input.SetComposingTextEditOp
+import androidx.compose.ui.text.input.SetSelectionEditOp
+import androidx.compose.ui.text.input.TextInputService
import androidx.ui.test.createComposeRule
import androidx.ui.test.performGesture
import androidx.ui.test.onNode
@@ -36,7 +36,7 @@
import androidx.ui.test.runOnIdle
import androidx.ui.test.runOnUiThread
import androidx.ui.test.click
-import androidx.ui.text.TextRange
+import androidx.compose.ui.text.TextRange
import com.google.common.truth.Truth.assertThat
import com.nhaarman.mockitokotlin2.any
import com.nhaarman.mockitokotlin2.argumentCaptor
@@ -59,7 +59,7 @@
@get:Rule
val composeTestRule = createComposeRule()
- val onValueChange: (androidx.ui.input.TextFieldValue) -> Unit = mock()
+ val onValueChange: (androidx.compose.ui.text.input.TextFieldValue) -> Unit = mock()
lateinit var onEditCommandCallback: (List<EditOperation>) -> Unit
@@ -76,7 +76,7 @@
TextInputServiceAmbient provides textInputService
) {
val state = state {
- androidx.ui.input.TextFieldValue(
+ androidx.compose.ui.text.input.TextFieldValue(
"abcde",
TextRange.Zero
)
@@ -126,7 +126,7 @@
runOnIdle {
verify(onValueChange, times(1))
.invoke(eq(
- androidx.ui.input.TextFieldValue(
+ androidx.compose.ui.text.input.TextFieldValue(
"ABCDEabcde",
TextRange(5)
)
@@ -139,7 +139,8 @@
// Composition change will be reported as a change
performEditOperation(SetComposingRegionEditOp(0, 5))
runOnIdle {
- verify(onValueChange, times(1)).invoke(eq(androidx.ui.input.TextFieldValue(
+ verify(onValueChange, times(1)).invoke(eq(
+ androidx.compose.ui.text.input.TextFieldValue(
text = "abcde",
selection = TextRange.Zero,
composition = TextRange(0, 5)
@@ -154,7 +155,7 @@
runOnIdle {
verify(onValueChange, times(1))
.invoke(eq(
- androidx.ui.input.TextFieldValue(
+ androidx.compose.ui.text.input.TextFieldValue(
text = "ABCDEabcde",
selection = TextRange(5),
composition = TextRange(0, 5)
@@ -169,7 +170,7 @@
performEditOperation(SetSelectionEditOp(1, 1))
runOnIdle {
verify(onValueChange, times(1)).invoke(eq(
- androidx.ui.input.TextFieldValue(
+ androidx.compose.ui.text.input.TextFieldValue(
"abcde",
TextRange(1)
)
@@ -181,7 +182,7 @@
fun clearComposition_onValueChange_call_once() {
val composingText = "ABCDE"
performEditOperation(SetComposingTextEditOp(composingText, 1))
- val expectedTextFieldValue = androidx.ui.input.TextFieldValue(
+ val expectedTextFieldValue = androidx.compose.ui.text.input.TextFieldValue(
text = "ABCDEabcde",
selection = TextRange(5),
composition = TextRange(0, composingText.length)
@@ -205,7 +206,7 @@
performEditOperation(DeleteSurroundingTextEditOp(0, 1))
runOnIdle {
verify(onValueChange, times(1)).invoke(eq(
- androidx.ui.input.TextFieldValue(
+ androidx.compose.ui.text.input.TextFieldValue(
"bcde",
TextRange.Zero
)
diff --git a/ui/ui-foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/TextFieldTest.kt b/ui/ui-foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/TextFieldTest.kt
index b116f74e..ba28e55 100644
--- a/ui/ui-foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/TextFieldTest.kt
+++ b/ui/ui-foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/TextFieldTest.kt
@@ -35,10 +35,10 @@
import androidx.ui.core.testTag
import androidx.ui.graphics.Color
import androidx.ui.graphics.RectangleShape
-import androidx.ui.input.CommitTextEditOp
-import androidx.ui.input.EditOperation
-import androidx.ui.input.ImeAction
-import androidx.ui.input.TextInputService
+import androidx.compose.ui.text.input.CommitTextEditOp
+import androidx.compose.ui.text.input.EditOperation
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.TextInputService
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.preferredSize
@@ -55,8 +55,10 @@
import androidx.ui.test.hasImeAction
import androidx.ui.test.hasInputMethodsSupport
import androidx.ui.test.runOnIdle
-import androidx.ui.text.TextLayoutResult
-import androidx.ui.text.TextRange
+import androidx.compose.ui.text.TextLayoutResult
+import androidx.compose.ui.text.TextRange
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.text.input.TextFieldValue.Companion.Saver
import androidx.ui.unit.dp
import com.google.common.truth.Truth.assertThat
import com.nhaarman.mockitokotlin2.any
@@ -89,7 +91,7 @@
lateinit var focusModifier: FocusModifier
composeTestRule.setContent {
- val state = state { androidx.ui.input.TextFieldValue("") }
+ val state = state { TextFieldValue("") }
Providers(
TextInputServiceAmbient provides inputService
) {
@@ -112,7 +114,7 @@
@Composable
private fun TextFieldApp() {
- val state = state { androidx.ui.input.TextFieldValue("") }
+ val state = state { TextFieldValue("") }
BaseTextField(
value = state.value,
modifier = Modifier.fillMaxSize(),
@@ -171,7 +173,7 @@
}
runOnIdle {
- val stateCaptor = argumentCaptor<androidx.ui.input.TextFieldValue>()
+ val stateCaptor = argumentCaptor<TextFieldValue>()
verify(textInputService, atLeastOnce())
.onStateUpdated(eq(inputSessionToken), stateCaptor.capture())
@@ -182,7 +184,7 @@
@Composable
private fun OnlyDigitsApp() {
- val state = state { androidx.ui.input.TextFieldValue("") }
+ val state = state { TextFieldValue("") }
BaseTextField(
value = state.value,
modifier = Modifier.fillMaxSize(),
@@ -243,7 +245,7 @@
}
runOnIdle {
- val stateCaptor = argumentCaptor<androidx.ui.input.TextFieldValue>()
+ val stateCaptor = argumentCaptor<TextFieldValue>()
verify(textInputService, atLeastOnce())
.onStateUpdated(eq(inputSessionToken), stateCaptor.capture())
@@ -266,7 +268,7 @@
Providers(
TextInputServiceAmbient provides textInputService
) {
- val state = state { androidx.ui.input.TextFieldValue("") }
+ val state = state { TextFieldValue("") }
BaseTextField(
value = state.value,
modifier = Modifier.fillMaxSize(),
@@ -323,7 +325,7 @@
composeTestRule.setContent {
Box {
BaseTextField(
- value = androidx.ui.input.TextFieldValue(),
+ value = TextFieldValue(),
>
modifier = Modifier.onPositioned {
size = it.size.width
@@ -344,7 +346,7 @@
composeTestRule.setContent {
Box {
BaseTextField(
- value = androidx.ui.input.TextFieldValue(),
+ value = TextFieldValue(),
>
modifier = Modifier
.preferredWidth(textFieldWidth)
@@ -369,7 +371,7 @@
Box(Modifier.preferredSize(parentSize)) {
Row {
BaseTextField(
- value = androidx.ui.input.TextFieldValue(),
+ value = TextFieldValue(),
>
modifier = Modifier
.weight(1f)
@@ -389,17 +391,17 @@
@Test
fun textFieldValue_saverRestoresState() {
- var state: MutableState<androidx.ui.input.TextFieldValue>? = null
+ var state: MutableState<TextFieldValue>? = null
val restorationTester = StateRestorationTester(composeTestRule)
restorationTester.setContent {
- state = savedInstanceState(saver = androidx.ui.input.TextFieldValue.Saver) {
- androidx.ui.input.TextFieldValue()
+ state = savedInstanceState(saver = Saver) {
+ TextFieldValue()
}
}
runOnIdle {
- state!!.value = androidx.ui.input.TextFieldValue("test", TextRange(1, 2))
+ state!!.value = TextFieldValue("test", TextRange(1, 2))
// we null it to ensure recomposition happened
state = null
@@ -409,7 +411,7 @@
runOnIdle {
assertThat(state!!.value).isEqualTo(
- androidx.ui.input.TextFieldValue("test", TextRange(1, 2))
+ TextFieldValue("test", TextRange(1, 2))
)
}
}
@@ -419,7 +421,7 @@
fun textFieldNotFocused_cursorNotRendered() {
composeTestRule.setContent {
BaseTextField(
- value = androidx.ui.input.TextFieldValue(),
+ value = TextFieldValue(),
>
textColor = Color.White,
modifier = Modifier.preferredSize(10.dp, 20.dp).background(color = Color.White),
@@ -443,7 +445,7 @@
composeTestRule.setContent {
BaseTextField(
modifier = Modifier.testTag("textField"),
- value = androidx.ui.input.TextFieldValue(),
+ value = TextFieldValue(),
>
)
}
@@ -457,7 +459,7 @@
fun setImeAction_isReflectedInSemantics() {
composeTestRule.setContent {
BaseTextField(
- value = androidx.ui.input.TextFieldValue(),
+ value = TextFieldValue(),
imeAction = ImeAction.Search,
>
)
diff --git a/ui/ui-foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/TextTest.kt b/ui/ui-foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/TextTest.kt
index 89e4e69..73ae3ce 100644
--- a/ui/ui-foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/TextTest.kt
+++ b/ui/ui-foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/TextTest.kt
@@ -24,9 +24,9 @@
import androidx.ui.test.createComposeRule
import androidx.ui.test.onNodeWithTag
import androidx.ui.test.runOnIdle
-import androidx.ui.text.TextStyle
-import androidx.ui.text.font.FontStyle
-import androidx.ui.text.style.TextAlign
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.style.TextAlign
import androidx.ui.unit.TextUnit
import androidx.ui.unit.em
import androidx.ui.unit.sp
diff --git a/ui/ui-foundation/src/commonMain/kotlin/androidx/compose/foundation/BaseTextField.kt b/ui/ui-foundation/src/commonMain/kotlin/androidx/compose/foundation/BaseTextField.kt
index c71119bc..4e446ea 100644
--- a/ui/ui-foundation/src/commonMain/kotlin/androidx/compose/foundation/BaseTextField.kt
+++ b/ui/ui-foundation/src/commonMain/kotlin/androidx/compose/foundation/BaseTextField.kt
@@ -38,19 +38,19 @@
import androidx.ui.geometry.Rect
import androidx.ui.graphics.Color
import androidx.ui.graphics.useOrElse
-import androidx.ui.input.ImeAction
-import androidx.ui.input.KeyboardType
-import androidx.ui.input.TextFieldValue
-import androidx.ui.input.VisualTransformation
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.text.input.VisualTransformation
import androidx.compose.foundation.layout.defaultMinSizeConstraints
-import androidx.ui.text.AnnotatedString
+import androidx.compose.ui.text.AnnotatedString
import androidx.compose.foundation.text.CoreTextField
-import androidx.ui.text.InternalTextApi
-import androidx.ui.text.SoftwareKeyboardController
+import androidx.compose.ui.text.InternalTextApi
+import androidx.compose.ui.text.SoftwareKeyboardController
import androidx.compose.foundation.text.TextFieldDelegate
-import androidx.ui.text.TextLayoutResult
-import androidx.ui.text.TextStyle
-import androidx.ui.text.constrain
+import androidx.compose.ui.text.TextLayoutResult
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.constrain
import androidx.ui.unit.dp
// TODO(b/151940543): Remove this variable when we have a solution for idling animations
diff --git a/ui/ui-foundation/src/commonMain/kotlin/androidx/compose/foundation/ClickableText.kt b/ui/ui-foundation/src/commonMain/kotlin/androidx/compose/foundation/ClickableText.kt
index 5115c7b..7001b91 100644
--- a/ui/ui-foundation/src/commonMain/kotlin/androidx/compose/foundation/ClickableText.kt
+++ b/ui/ui-foundation/src/commonMain/kotlin/androidx/compose/foundation/ClickableText.kt
@@ -20,11 +20,11 @@
import androidx.ui.core.Modifier
import androidx.ui.core.gesture.pressIndicatorGestureFilter
import androidx.ui.core.gesture.tapGestureFilter
-import androidx.ui.text.AnnotatedString
-import androidx.ui.text.TextLayoutResult
-import androidx.ui.text.TextStyle
-import androidx.ui.text.style.TextAlign
-import androidx.ui.text.style.TextOverflow
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.TextLayoutResult
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
/**
* A continent version of [Text] component to be able to handle click event on the text.
diff --git a/ui/ui-foundation/src/commonMain/kotlin/androidx/compose/foundation/Text.kt b/ui/ui-foundation/src/commonMain/kotlin/androidx/compose/foundation/Text.kt
index dece8e9..b565716 100644
--- a/ui/ui-foundation/src/commonMain/kotlin/androidx/compose/foundation/Text.kt
+++ b/ui/ui-foundation/src/commonMain/kotlin/androidx/compose/foundation/Text.kt
@@ -26,18 +26,18 @@
import androidx.ui.graphics.Color
import androidx.ui.graphics.useOrElse
import androidx.ui.semantics.text
-import androidx.ui.text.AnnotatedString
+import androidx.compose.ui.text.AnnotatedString
import androidx.compose.foundation.text.CoreText
import androidx.compose.foundation.text.InlineTextContent
-import androidx.ui.text.Paragraph
-import androidx.ui.text.TextLayoutResult
-import androidx.ui.text.TextStyle
-import androidx.ui.text.font.FontFamily
-import androidx.ui.text.font.FontStyle
-import androidx.ui.text.font.FontWeight
-import androidx.ui.text.style.TextAlign
-import androidx.ui.text.style.TextDecoration
-import androidx.ui.text.style.TextOverflow
+import androidx.compose.ui.text.Paragraph
+import androidx.compose.ui.text.TextLayoutResult
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextDecoration
+import androidx.compose.ui.text.style.TextOverflow
import androidx.ui.unit.TextUnit
/**
diff --git a/ui/ui-internal-lint-checks/src/main/java/androidx/ui/lint/PackageNameMigrationDetector.kt b/ui/ui-internal-lint-checks/src/main/java/androidx/ui/lint/PackageNameMigrationDetector.kt
index d2d3a09..cc931db 100644
--- a/ui/ui-internal-lint-checks/src/main/java/androidx/ui/lint/PackageNameMigrationDetector.kt
+++ b/ui/ui-internal-lint-checks/src/main/java/androidx/ui/lint/PackageNameMigrationDetector.kt
@@ -67,7 +67,10 @@
"androidx.ui.layout" to "androidx.compose.foundation.layout",
"androidx.animation" to "androidx.compose.animation.core",
"androidx.ui.animation" to "androidx.compose.animation",
- "androidx.compose.dispatch" to "androidx.compose.runtime.dispatch"
+ "androidx.compose.dispatch" to "androidx.compose.runtime.dispatch",
+ "androidx.ui.text" to "androidx.compose.ui.text",
+ "androidx.ui.input" to "androidx.compose.ui.text.input",
+ "androidx.ui.intl" to "androidx.compose.ui.text.intl"
)
val ISSUE = Issue.create(
diff --git a/ui/ui-layout/src/androidAndroidTest/kotlin/androidx/compose/foundation/layout/TextLayoutDirectionModifierTest.kt b/ui/ui-layout/src/androidAndroidTest/kotlin/androidx/compose/foundation/layout/TextLayoutDirectionModifierTest.kt
index 11cade4..802492b 100644
--- a/ui/ui-layout/src/androidAndroidTest/kotlin/androidx/compose/foundation/layout/TextLayoutDirectionModifierTest.kt
+++ b/ui/ui-layout/src/androidAndroidTest/kotlin/androidx/compose/foundation/layout/TextLayoutDirectionModifierTest.kt
@@ -19,12 +19,12 @@
import androidx.test.filters.SmallTest
import androidx.ui.core.LayoutDirection
import androidx.ui.core.Modifier
-import androidx.ui.input.TextFieldValue
-import androidx.ui.text.AnnotatedString
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.text.AnnotatedString
import androidx.compose.foundation.text.CoreText
import androidx.compose.foundation.text.CoreTextField
-import androidx.ui.text.TextStyle
-import androidx.ui.text.style.TextOverflow
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.style.TextOverflow
import com.google.common.truth.Truth.assertThat
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/ui/ui-material/api/0.1.0-dev16.txt b/ui/ui-material/api/0.1.0-dev16.txt
index a017899..721b127 100644
--- a/ui/ui-material/api/0.1.0-dev16.txt
+++ b/ui/ui-material/api/0.1.0-dev16.txt
@@ -179,8 +179,8 @@
}
public final class OutlinedTextFieldKt {
- method @androidx.compose.Composable public static void OutlinedTextField-CVdlBpA(androidx.ui.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.ui.input.TextFieldValue,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.ui.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.ui.input.ImeAction,? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error);
- method @androidx.compose.Composable public static void OutlinedTextField-wI6llck(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.ui.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.ui.input.ImeAction,? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error);
+ method @androidx.compose.Composable public static void OutlinedTextField-Ike-ftg(androidx.compose.ui.text.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.TextFieldValue,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.compose.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.compose.ui.text.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.compose.ui.text.input.KeyboardType keyboardType = KeyboardType.Text, androidx.compose.ui.text.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.compose.ui.text.input.ImeAction,? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error);
+ method @androidx.compose.Composable public static void OutlinedTextField-YAF2Ul0(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.compose.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.compose.ui.text.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.compose.ui.text.input.KeyboardType keyboardType = KeyboardType.Text, androidx.compose.ui.text.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.compose.ui.text.input.ImeAction,? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error);
}
public final class ProgressIndicatorConstants {
@@ -207,12 +207,12 @@
public final class RadioButtonKt {
method @androidx.compose.Composable public static void RadioButton-mLaF0B0(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, boolean enabled = true, long selectedColor = MaterialTheme.colors.secondary, long unselectedColor = RadioButtonConstants.defaultUnselectedColor, long disabledColor = RadioButtonConstants.defaultDisabledColor);
method @Deprecated @androidx.compose.Composable public static void RadioGroup(kotlin.jvm.functions.Function1<? super androidx.ui.material.RadioGroupScope,kotlin.Unit> content);
- method @Deprecated @androidx.compose.Composable public static void RadioGroup-HJ2D5H4(java.util.List<java.lang.String> options, String? selectedOption, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onSelectedChange, androidx.ui.core.Modifier modifier = Modifier, long radioColor = MaterialTheme.colors.secondary, androidx.ui.text.TextStyle? textStyle = null);
+ method @Deprecated @androidx.compose.Composable public static void RadioGroup-pmj2ZzQ(java.util.List<java.lang.String> options, String? selectedOption, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onSelectedChange, androidx.ui.core.Modifier modifier = Modifier, long radioColor = MaterialTheme.colors.secondary, androidx.compose.ui.text.TextStyle? textStyle = null);
}
@Deprecated @androidx.compose.Stable public final class RadioGroupScope {
method @Deprecated @androidx.compose.Composable public void RadioGroupItem(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onSelect, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit> content);
- method @Deprecated @androidx.compose.Composable public void RadioGroupTextItem-JJAyy3w(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onSelect, String text, androidx.ui.core.Modifier modifier = Modifier, long radioColor = MaterialTheme.colors.secondary, androidx.ui.text.TextStyle? textStyle = null);
+ method @Deprecated @androidx.compose.Composable public void RadioGroupTextItem-JSFNu0c(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onSelect, String text, androidx.ui.core.Modifier modifier = Modifier, long radioColor = MaterialTheme.colors.secondary, androidx.compose.ui.text.TextStyle? textStyle = null);
}
public final class Scaffold {
@@ -316,41 +316,41 @@
}
public final class TextFieldKt {
- method @Deprecated @androidx.compose.Composable public static void FilledTextField-Vmoa5zc(androidx.ui.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.ui.input.TextFieldValue,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.ui.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.ui.input.ImeAction,? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error, long backgroundColor = MaterialTheme.colors.onSurface, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(ZeroCornerSize, ZeroCornerSize));
- method @Deprecated @androidx.compose.Composable public static void FilledTextField-o4GafH0(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.ui.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.ui.input.ImeAction,? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error, long backgroundColor = MaterialTheme.colors.onSurface, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(ZeroCornerSize, ZeroCornerSize));
- method @androidx.compose.Composable public static void TextField-Vmoa5zc(androidx.ui.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.ui.input.TextFieldValue,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.ui.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.ui.input.ImeAction,? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error, long backgroundColor = MaterialTheme.colors.onSurface, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(ZeroCornerSize, ZeroCornerSize));
- method @androidx.compose.Composable public static void TextField-o4GafH0(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.ui.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.ui.input.ImeAction,? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error, long backgroundColor = MaterialTheme.colors.onSurface, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(ZeroCornerSize, ZeroCornerSize));
+ method @Deprecated @androidx.compose.Composable public static void FilledTextField-M28u9F8(androidx.compose.ui.text.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.TextFieldValue,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.compose.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.compose.ui.text.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.compose.ui.text.input.KeyboardType keyboardType = KeyboardType.Text, androidx.compose.ui.text.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.compose.ui.text.input.ImeAction,? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error, long backgroundColor = MaterialTheme.colors.onSurface, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(ZeroCornerSize, ZeroCornerSize));
+ method @Deprecated @androidx.compose.Composable public static void FilledTextField-j88Ozi0(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.compose.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.compose.ui.text.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.compose.ui.text.input.KeyboardType keyboardType = KeyboardType.Text, androidx.compose.ui.text.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.compose.ui.text.input.ImeAction,? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error, long backgroundColor = MaterialTheme.colors.onSurface, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(ZeroCornerSize, ZeroCornerSize));
+ method @androidx.compose.Composable public static void TextField-M28u9F8(androidx.compose.ui.text.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.TextFieldValue,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.compose.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.compose.ui.text.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.compose.ui.text.input.KeyboardType keyboardType = KeyboardType.Text, androidx.compose.ui.text.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.compose.ui.text.input.ImeAction,? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error, long backgroundColor = MaterialTheme.colors.onSurface, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(ZeroCornerSize, ZeroCornerSize));
+ method @androidx.compose.Composable public static void TextField-j88Ozi0(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.compose.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.compose.ui.text.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.compose.ui.text.input.KeyboardType keyboardType = KeyboardType.Text, androidx.compose.ui.text.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.compose.ui.text.input.ImeAction,? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error, long backgroundColor = MaterialTheme.colors.onSurface, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(ZeroCornerSize, ZeroCornerSize));
}
@androidx.compose.Immutable public final class Typography {
- ctor public Typography(androidx.ui.text.font.FontFamily defaultFontFamily, androidx.ui.text.TextStyle h1, androidx.ui.text.TextStyle h2, androidx.ui.text.TextStyle h3, androidx.ui.text.TextStyle h4, androidx.ui.text.TextStyle h5, androidx.ui.text.TextStyle h6, androidx.ui.text.TextStyle subtitle1, androidx.ui.text.TextStyle subtitle2, androidx.ui.text.TextStyle body1, androidx.ui.text.TextStyle body2, androidx.ui.text.TextStyle button, androidx.ui.text.TextStyle caption, androidx.ui.text.TextStyle overline);
- method public androidx.ui.text.TextStyle component1();
- method public androidx.ui.text.TextStyle component10();
- method public androidx.ui.text.TextStyle component11();
- method public androidx.ui.text.TextStyle component12();
- method public androidx.ui.text.TextStyle component13();
- method public androidx.ui.text.TextStyle component2();
- method public androidx.ui.text.TextStyle component3();
- method public androidx.ui.text.TextStyle component4();
- method public androidx.ui.text.TextStyle component5();
- method public androidx.ui.text.TextStyle component6();
- method public androidx.ui.text.TextStyle component7();
- method public androidx.ui.text.TextStyle component8();
- method public androidx.ui.text.TextStyle component9();
- method @androidx.compose.Immutable public androidx.ui.material.Typography copy(androidx.ui.text.TextStyle h1, androidx.ui.text.TextStyle h2, androidx.ui.text.TextStyle h3, androidx.ui.text.TextStyle h4, androidx.ui.text.TextStyle h5, androidx.ui.text.TextStyle h6, androidx.ui.text.TextStyle subtitle1, androidx.ui.text.TextStyle subtitle2, androidx.ui.text.TextStyle body1, androidx.ui.text.TextStyle body2, androidx.ui.text.TextStyle button, androidx.ui.text.TextStyle caption, androidx.ui.text.TextStyle overline);
- method public androidx.ui.text.TextStyle getBody1();
- method public androidx.ui.text.TextStyle getBody2();
- method public androidx.ui.text.TextStyle getButton();
- method public androidx.ui.text.TextStyle getCaption();
- method public androidx.ui.text.TextStyle getH1();
- method public androidx.ui.text.TextStyle getH2();
- method public androidx.ui.text.TextStyle getH3();
- method public androidx.ui.text.TextStyle getH4();
- method public androidx.ui.text.TextStyle getH5();
- method public androidx.ui.text.TextStyle getH6();
- method public androidx.ui.text.TextStyle getOverline();
- method public androidx.ui.text.TextStyle getSubtitle1();
- method public androidx.ui.text.TextStyle getSubtitle2();
+ ctor public Typography(androidx.compose.ui.text.font.FontFamily defaultFontFamily, androidx.compose.ui.text.TextStyle h1, androidx.compose.ui.text.TextStyle h2, androidx.compose.ui.text.TextStyle h3, androidx.compose.ui.text.TextStyle h4, androidx.compose.ui.text.TextStyle h5, androidx.compose.ui.text.TextStyle h6, androidx.compose.ui.text.TextStyle subtitle1, androidx.compose.ui.text.TextStyle subtitle2, androidx.compose.ui.text.TextStyle body1, androidx.compose.ui.text.TextStyle body2, androidx.compose.ui.text.TextStyle button, androidx.compose.ui.text.TextStyle caption, androidx.compose.ui.text.TextStyle overline);
+ method public androidx.compose.ui.text.TextStyle component1();
+ method public androidx.compose.ui.text.TextStyle component10();
+ method public androidx.compose.ui.text.TextStyle component11();
+ method public androidx.compose.ui.text.TextStyle component12();
+ method public androidx.compose.ui.text.TextStyle component13();
+ method public androidx.compose.ui.text.TextStyle component2();
+ method public androidx.compose.ui.text.TextStyle component3();
+ method public androidx.compose.ui.text.TextStyle component4();
+ method public androidx.compose.ui.text.TextStyle component5();
+ method public androidx.compose.ui.text.TextStyle component6();
+ method public androidx.compose.ui.text.TextStyle component7();
+ method public androidx.compose.ui.text.TextStyle component8();
+ method public androidx.compose.ui.text.TextStyle component9();
+ method @androidx.compose.Immutable public androidx.ui.material.Typography copy(androidx.compose.ui.text.TextStyle h1, androidx.compose.ui.text.TextStyle h2, androidx.compose.ui.text.TextStyle h3, androidx.compose.ui.text.TextStyle h4, androidx.compose.ui.text.TextStyle h5, androidx.compose.ui.text.TextStyle h6, androidx.compose.ui.text.TextStyle subtitle1, androidx.compose.ui.text.TextStyle subtitle2, androidx.compose.ui.text.TextStyle body1, androidx.compose.ui.text.TextStyle body2, androidx.compose.ui.text.TextStyle button, androidx.compose.ui.text.TextStyle caption, androidx.compose.ui.text.TextStyle overline);
+ method public androidx.compose.ui.text.TextStyle getBody1();
+ method public androidx.compose.ui.text.TextStyle getBody2();
+ method public androidx.compose.ui.text.TextStyle getButton();
+ method public androidx.compose.ui.text.TextStyle getCaption();
+ method public androidx.compose.ui.text.TextStyle getH1();
+ method public androidx.compose.ui.text.TextStyle getH2();
+ method public androidx.compose.ui.text.TextStyle getH3();
+ method public androidx.compose.ui.text.TextStyle getH4();
+ method public androidx.compose.ui.text.TextStyle getH5();
+ method public androidx.compose.ui.text.TextStyle getH6();
+ method public androidx.compose.ui.text.TextStyle getOverline();
+ method public androidx.compose.ui.text.TextStyle getSubtitle1();
+ method public androidx.compose.ui.text.TextStyle getSubtitle2();
}
public final class TypographyKt {
diff --git a/ui/ui-material/api/current.txt b/ui/ui-material/api/current.txt
index a017899..721b127 100644
--- a/ui/ui-material/api/current.txt
+++ b/ui/ui-material/api/current.txt
@@ -179,8 +179,8 @@
}
public final class OutlinedTextFieldKt {
- method @androidx.compose.Composable public static void OutlinedTextField-CVdlBpA(androidx.ui.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.ui.input.TextFieldValue,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.ui.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.ui.input.ImeAction,? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error);
- method @androidx.compose.Composable public static void OutlinedTextField-wI6llck(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.ui.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.ui.input.ImeAction,? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error);
+ method @androidx.compose.Composable public static void OutlinedTextField-Ike-ftg(androidx.compose.ui.text.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.TextFieldValue,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.compose.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.compose.ui.text.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.compose.ui.text.input.KeyboardType keyboardType = KeyboardType.Text, androidx.compose.ui.text.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.compose.ui.text.input.ImeAction,? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error);
+ method @androidx.compose.Composable public static void OutlinedTextField-YAF2Ul0(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.compose.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.compose.ui.text.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.compose.ui.text.input.KeyboardType keyboardType = KeyboardType.Text, androidx.compose.ui.text.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.compose.ui.text.input.ImeAction,? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error);
}
public final class ProgressIndicatorConstants {
@@ -207,12 +207,12 @@
public final class RadioButtonKt {
method @androidx.compose.Composable public static void RadioButton-mLaF0B0(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, boolean enabled = true, long selectedColor = MaterialTheme.colors.secondary, long unselectedColor = RadioButtonConstants.defaultUnselectedColor, long disabledColor = RadioButtonConstants.defaultDisabledColor);
method @Deprecated @androidx.compose.Composable public static void RadioGroup(kotlin.jvm.functions.Function1<? super androidx.ui.material.RadioGroupScope,kotlin.Unit> content);
- method @Deprecated @androidx.compose.Composable public static void RadioGroup-HJ2D5H4(java.util.List<java.lang.String> options, String? selectedOption, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onSelectedChange, androidx.ui.core.Modifier modifier = Modifier, long radioColor = MaterialTheme.colors.secondary, androidx.ui.text.TextStyle? textStyle = null);
+ method @Deprecated @androidx.compose.Composable public static void RadioGroup-pmj2ZzQ(java.util.List<java.lang.String> options, String? selectedOption, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onSelectedChange, androidx.ui.core.Modifier modifier = Modifier, long radioColor = MaterialTheme.colors.secondary, androidx.compose.ui.text.TextStyle? textStyle = null);
}
@Deprecated @androidx.compose.Stable public final class RadioGroupScope {
method @Deprecated @androidx.compose.Composable public void RadioGroupItem(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onSelect, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit> content);
- method @Deprecated @androidx.compose.Composable public void RadioGroupTextItem-JJAyy3w(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onSelect, String text, androidx.ui.core.Modifier modifier = Modifier, long radioColor = MaterialTheme.colors.secondary, androidx.ui.text.TextStyle? textStyle = null);
+ method @Deprecated @androidx.compose.Composable public void RadioGroupTextItem-JSFNu0c(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onSelect, String text, androidx.ui.core.Modifier modifier = Modifier, long radioColor = MaterialTheme.colors.secondary, androidx.compose.ui.text.TextStyle? textStyle = null);
}
public final class Scaffold {
@@ -316,41 +316,41 @@
}
public final class TextFieldKt {
- method @Deprecated @androidx.compose.Composable public static void FilledTextField-Vmoa5zc(androidx.ui.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.ui.input.TextFieldValue,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.ui.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.ui.input.ImeAction,? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error, long backgroundColor = MaterialTheme.colors.onSurface, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(ZeroCornerSize, ZeroCornerSize));
- method @Deprecated @androidx.compose.Composable public static void FilledTextField-o4GafH0(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.ui.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.ui.input.ImeAction,? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error, long backgroundColor = MaterialTheme.colors.onSurface, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(ZeroCornerSize, ZeroCornerSize));
- method @androidx.compose.Composable public static void TextField-Vmoa5zc(androidx.ui.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.ui.input.TextFieldValue,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.ui.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.ui.input.ImeAction,? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error, long backgroundColor = MaterialTheme.colors.onSurface, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(ZeroCornerSize, ZeroCornerSize));
- method @androidx.compose.Composable public static void TextField-o4GafH0(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.ui.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.ui.input.ImeAction,? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error, long backgroundColor = MaterialTheme.colors.onSurface, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(ZeroCornerSize, ZeroCornerSize));
+ method @Deprecated @androidx.compose.Composable public static void FilledTextField-M28u9F8(androidx.compose.ui.text.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.TextFieldValue,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.compose.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.compose.ui.text.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.compose.ui.text.input.KeyboardType keyboardType = KeyboardType.Text, androidx.compose.ui.text.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.compose.ui.text.input.ImeAction,? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error, long backgroundColor = MaterialTheme.colors.onSurface, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(ZeroCornerSize, ZeroCornerSize));
+ method @Deprecated @androidx.compose.Composable public static void FilledTextField-j88Ozi0(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.compose.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.compose.ui.text.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.compose.ui.text.input.KeyboardType keyboardType = KeyboardType.Text, androidx.compose.ui.text.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.compose.ui.text.input.ImeAction,? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error, long backgroundColor = MaterialTheme.colors.onSurface, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(ZeroCornerSize, ZeroCornerSize));
+ method @androidx.compose.Composable public static void TextField-M28u9F8(androidx.compose.ui.text.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.TextFieldValue,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.compose.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.compose.ui.text.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.compose.ui.text.input.KeyboardType keyboardType = KeyboardType.Text, androidx.compose.ui.text.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.compose.ui.text.input.ImeAction,? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error, long backgroundColor = MaterialTheme.colors.onSurface, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(ZeroCornerSize, ZeroCornerSize));
+ method @androidx.compose.Composable public static void TextField-j88Ozi0(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.compose.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.compose.ui.text.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.compose.ui.text.input.KeyboardType keyboardType = KeyboardType.Text, androidx.compose.ui.text.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.compose.ui.text.input.ImeAction,? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error, long backgroundColor = MaterialTheme.colors.onSurface, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(ZeroCornerSize, ZeroCornerSize));
}
@androidx.compose.Immutable public final class Typography {
- ctor public Typography(androidx.ui.text.font.FontFamily defaultFontFamily, androidx.ui.text.TextStyle h1, androidx.ui.text.TextStyle h2, androidx.ui.text.TextStyle h3, androidx.ui.text.TextStyle h4, androidx.ui.text.TextStyle h5, androidx.ui.text.TextStyle h6, androidx.ui.text.TextStyle subtitle1, androidx.ui.text.TextStyle subtitle2, androidx.ui.text.TextStyle body1, androidx.ui.text.TextStyle body2, androidx.ui.text.TextStyle button, androidx.ui.text.TextStyle caption, androidx.ui.text.TextStyle overline);
- method public androidx.ui.text.TextStyle component1();
- method public androidx.ui.text.TextStyle component10();
- method public androidx.ui.text.TextStyle component11();
- method public androidx.ui.text.TextStyle component12();
- method public androidx.ui.text.TextStyle component13();
- method public androidx.ui.text.TextStyle component2();
- method public androidx.ui.text.TextStyle component3();
- method public androidx.ui.text.TextStyle component4();
- method public androidx.ui.text.TextStyle component5();
- method public androidx.ui.text.TextStyle component6();
- method public androidx.ui.text.TextStyle component7();
- method public androidx.ui.text.TextStyle component8();
- method public androidx.ui.text.TextStyle component9();
- method @androidx.compose.Immutable public androidx.ui.material.Typography copy(androidx.ui.text.TextStyle h1, androidx.ui.text.TextStyle h2, androidx.ui.text.TextStyle h3, androidx.ui.text.TextStyle h4, androidx.ui.text.TextStyle h5, androidx.ui.text.TextStyle h6, androidx.ui.text.TextStyle subtitle1, androidx.ui.text.TextStyle subtitle2, androidx.ui.text.TextStyle body1, androidx.ui.text.TextStyle body2, androidx.ui.text.TextStyle button, androidx.ui.text.TextStyle caption, androidx.ui.text.TextStyle overline);
- method public androidx.ui.text.TextStyle getBody1();
- method public androidx.ui.text.TextStyle getBody2();
- method public androidx.ui.text.TextStyle getButton();
- method public androidx.ui.text.TextStyle getCaption();
- method public androidx.ui.text.TextStyle getH1();
- method public androidx.ui.text.TextStyle getH2();
- method public androidx.ui.text.TextStyle getH3();
- method public androidx.ui.text.TextStyle getH4();
- method public androidx.ui.text.TextStyle getH5();
- method public androidx.ui.text.TextStyle getH6();
- method public androidx.ui.text.TextStyle getOverline();
- method public androidx.ui.text.TextStyle getSubtitle1();
- method public androidx.ui.text.TextStyle getSubtitle2();
+ ctor public Typography(androidx.compose.ui.text.font.FontFamily defaultFontFamily, androidx.compose.ui.text.TextStyle h1, androidx.compose.ui.text.TextStyle h2, androidx.compose.ui.text.TextStyle h3, androidx.compose.ui.text.TextStyle h4, androidx.compose.ui.text.TextStyle h5, androidx.compose.ui.text.TextStyle h6, androidx.compose.ui.text.TextStyle subtitle1, androidx.compose.ui.text.TextStyle subtitle2, androidx.compose.ui.text.TextStyle body1, androidx.compose.ui.text.TextStyle body2, androidx.compose.ui.text.TextStyle button, androidx.compose.ui.text.TextStyle caption, androidx.compose.ui.text.TextStyle overline);
+ method public androidx.compose.ui.text.TextStyle component1();
+ method public androidx.compose.ui.text.TextStyle component10();
+ method public androidx.compose.ui.text.TextStyle component11();
+ method public androidx.compose.ui.text.TextStyle component12();
+ method public androidx.compose.ui.text.TextStyle component13();
+ method public androidx.compose.ui.text.TextStyle component2();
+ method public androidx.compose.ui.text.TextStyle component3();
+ method public androidx.compose.ui.text.TextStyle component4();
+ method public androidx.compose.ui.text.TextStyle component5();
+ method public androidx.compose.ui.text.TextStyle component6();
+ method public androidx.compose.ui.text.TextStyle component7();
+ method public androidx.compose.ui.text.TextStyle component8();
+ method public androidx.compose.ui.text.TextStyle component9();
+ method @androidx.compose.Immutable public androidx.ui.material.Typography copy(androidx.compose.ui.text.TextStyle h1, androidx.compose.ui.text.TextStyle h2, androidx.compose.ui.text.TextStyle h3, androidx.compose.ui.text.TextStyle h4, androidx.compose.ui.text.TextStyle h5, androidx.compose.ui.text.TextStyle h6, androidx.compose.ui.text.TextStyle subtitle1, androidx.compose.ui.text.TextStyle subtitle2, androidx.compose.ui.text.TextStyle body1, androidx.compose.ui.text.TextStyle body2, androidx.compose.ui.text.TextStyle button, androidx.compose.ui.text.TextStyle caption, androidx.compose.ui.text.TextStyle overline);
+ method public androidx.compose.ui.text.TextStyle getBody1();
+ method public androidx.compose.ui.text.TextStyle getBody2();
+ method public androidx.compose.ui.text.TextStyle getButton();
+ method public androidx.compose.ui.text.TextStyle getCaption();
+ method public androidx.compose.ui.text.TextStyle getH1();
+ method public androidx.compose.ui.text.TextStyle getH2();
+ method public androidx.compose.ui.text.TextStyle getH3();
+ method public androidx.compose.ui.text.TextStyle getH4();
+ method public androidx.compose.ui.text.TextStyle getH5();
+ method public androidx.compose.ui.text.TextStyle getH6();
+ method public androidx.compose.ui.text.TextStyle getOverline();
+ method public androidx.compose.ui.text.TextStyle getSubtitle1();
+ method public androidx.compose.ui.text.TextStyle getSubtitle2();
}
public final class TypographyKt {
diff --git a/ui/ui-material/api/public_plus_experimental_0.1.0-dev16.txt b/ui/ui-material/api/public_plus_experimental_0.1.0-dev16.txt
index a017899..721b127 100644
--- a/ui/ui-material/api/public_plus_experimental_0.1.0-dev16.txt
+++ b/ui/ui-material/api/public_plus_experimental_0.1.0-dev16.txt
@@ -179,8 +179,8 @@
}
public final class OutlinedTextFieldKt {
- method @androidx.compose.Composable public static void OutlinedTextField-CVdlBpA(androidx.ui.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.ui.input.TextFieldValue,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.ui.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.ui.input.ImeAction,? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error);
- method @androidx.compose.Composable public static void OutlinedTextField-wI6llck(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.ui.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.ui.input.ImeAction,? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error);
+ method @androidx.compose.Composable public static void OutlinedTextField-Ike-ftg(androidx.compose.ui.text.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.TextFieldValue,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.compose.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.compose.ui.text.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.compose.ui.text.input.KeyboardType keyboardType = KeyboardType.Text, androidx.compose.ui.text.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.compose.ui.text.input.ImeAction,? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error);
+ method @androidx.compose.Composable public static void OutlinedTextField-YAF2Ul0(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.compose.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.compose.ui.text.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.compose.ui.text.input.KeyboardType keyboardType = KeyboardType.Text, androidx.compose.ui.text.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.compose.ui.text.input.ImeAction,? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error);
}
public final class ProgressIndicatorConstants {
@@ -207,12 +207,12 @@
public final class RadioButtonKt {
method @androidx.compose.Composable public static void RadioButton-mLaF0B0(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, boolean enabled = true, long selectedColor = MaterialTheme.colors.secondary, long unselectedColor = RadioButtonConstants.defaultUnselectedColor, long disabledColor = RadioButtonConstants.defaultDisabledColor);
method @Deprecated @androidx.compose.Composable public static void RadioGroup(kotlin.jvm.functions.Function1<? super androidx.ui.material.RadioGroupScope,kotlin.Unit> content);
- method @Deprecated @androidx.compose.Composable public static void RadioGroup-HJ2D5H4(java.util.List<java.lang.String> options, String? selectedOption, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onSelectedChange, androidx.ui.core.Modifier modifier = Modifier, long radioColor = MaterialTheme.colors.secondary, androidx.ui.text.TextStyle? textStyle = null);
+ method @Deprecated @androidx.compose.Composable public static void RadioGroup-pmj2ZzQ(java.util.List<java.lang.String> options, String? selectedOption, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onSelectedChange, androidx.ui.core.Modifier modifier = Modifier, long radioColor = MaterialTheme.colors.secondary, androidx.compose.ui.text.TextStyle? textStyle = null);
}
@Deprecated @androidx.compose.Stable public final class RadioGroupScope {
method @Deprecated @androidx.compose.Composable public void RadioGroupItem(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onSelect, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit> content);
- method @Deprecated @androidx.compose.Composable public void RadioGroupTextItem-JJAyy3w(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onSelect, String text, androidx.ui.core.Modifier modifier = Modifier, long radioColor = MaterialTheme.colors.secondary, androidx.ui.text.TextStyle? textStyle = null);
+ method @Deprecated @androidx.compose.Composable public void RadioGroupTextItem-JSFNu0c(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onSelect, String text, androidx.ui.core.Modifier modifier = Modifier, long radioColor = MaterialTheme.colors.secondary, androidx.compose.ui.text.TextStyle? textStyle = null);
}
public final class Scaffold {
@@ -316,41 +316,41 @@
}
public final class TextFieldKt {
- method @Deprecated @androidx.compose.Composable public static void FilledTextField-Vmoa5zc(androidx.ui.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.ui.input.TextFieldValue,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.ui.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.ui.input.ImeAction,? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error, long backgroundColor = MaterialTheme.colors.onSurface, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(ZeroCornerSize, ZeroCornerSize));
- method @Deprecated @androidx.compose.Composable public static void FilledTextField-o4GafH0(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.ui.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.ui.input.ImeAction,? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error, long backgroundColor = MaterialTheme.colors.onSurface, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(ZeroCornerSize, ZeroCornerSize));
- method @androidx.compose.Composable public static void TextField-Vmoa5zc(androidx.ui.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.ui.input.TextFieldValue,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.ui.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.ui.input.ImeAction,? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error, long backgroundColor = MaterialTheme.colors.onSurface, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(ZeroCornerSize, ZeroCornerSize));
- method @androidx.compose.Composable public static void TextField-o4GafH0(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.ui.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.ui.input.ImeAction,? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error, long backgroundColor = MaterialTheme.colors.onSurface, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(ZeroCornerSize, ZeroCornerSize));
+ method @Deprecated @androidx.compose.Composable public static void FilledTextField-M28u9F8(androidx.compose.ui.text.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.TextFieldValue,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.compose.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.compose.ui.text.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.compose.ui.text.input.KeyboardType keyboardType = KeyboardType.Text, androidx.compose.ui.text.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.compose.ui.text.input.ImeAction,? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error, long backgroundColor = MaterialTheme.colors.onSurface, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(ZeroCornerSize, ZeroCornerSize));
+ method @Deprecated @androidx.compose.Composable public static void FilledTextField-j88Ozi0(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.compose.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.compose.ui.text.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.compose.ui.text.input.KeyboardType keyboardType = KeyboardType.Text, androidx.compose.ui.text.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.compose.ui.text.input.ImeAction,? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error, long backgroundColor = MaterialTheme.colors.onSurface, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(ZeroCornerSize, ZeroCornerSize));
+ method @androidx.compose.Composable public static void TextField-M28u9F8(androidx.compose.ui.text.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.TextFieldValue,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.compose.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.compose.ui.text.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.compose.ui.text.input.KeyboardType keyboardType = KeyboardType.Text, androidx.compose.ui.text.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.compose.ui.text.input.ImeAction,? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error, long backgroundColor = MaterialTheme.colors.onSurface, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(ZeroCornerSize, ZeroCornerSize));
+ method @androidx.compose.Composable public static void TextField-j88Ozi0(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.compose.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.compose.ui.text.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.compose.ui.text.input.KeyboardType keyboardType = KeyboardType.Text, androidx.compose.ui.text.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.compose.ui.text.input.ImeAction,? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error, long backgroundColor = MaterialTheme.colors.onSurface, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(ZeroCornerSize, ZeroCornerSize));
}
@androidx.compose.Immutable public final class Typography {
- ctor public Typography(androidx.ui.text.font.FontFamily defaultFontFamily, androidx.ui.text.TextStyle h1, androidx.ui.text.TextStyle h2, androidx.ui.text.TextStyle h3, androidx.ui.text.TextStyle h4, androidx.ui.text.TextStyle h5, androidx.ui.text.TextStyle h6, androidx.ui.text.TextStyle subtitle1, androidx.ui.text.TextStyle subtitle2, androidx.ui.text.TextStyle body1, androidx.ui.text.TextStyle body2, androidx.ui.text.TextStyle button, androidx.ui.text.TextStyle caption, androidx.ui.text.TextStyle overline);
- method public androidx.ui.text.TextStyle component1();
- method public androidx.ui.text.TextStyle component10();
- method public androidx.ui.text.TextStyle component11();
- method public androidx.ui.text.TextStyle component12();
- method public androidx.ui.text.TextStyle component13();
- method public androidx.ui.text.TextStyle component2();
- method public androidx.ui.text.TextStyle component3();
- method public androidx.ui.text.TextStyle component4();
- method public androidx.ui.text.TextStyle component5();
- method public androidx.ui.text.TextStyle component6();
- method public androidx.ui.text.TextStyle component7();
- method public androidx.ui.text.TextStyle component8();
- method public androidx.ui.text.TextStyle component9();
- method @androidx.compose.Immutable public androidx.ui.material.Typography copy(androidx.ui.text.TextStyle h1, androidx.ui.text.TextStyle h2, androidx.ui.text.TextStyle h3, androidx.ui.text.TextStyle h4, androidx.ui.text.TextStyle h5, androidx.ui.text.TextStyle h6, androidx.ui.text.TextStyle subtitle1, androidx.ui.text.TextStyle subtitle2, androidx.ui.text.TextStyle body1, androidx.ui.text.TextStyle body2, androidx.ui.text.TextStyle button, androidx.ui.text.TextStyle caption, androidx.ui.text.TextStyle overline);
- method public androidx.ui.text.TextStyle getBody1();
- method public androidx.ui.text.TextStyle getBody2();
- method public androidx.ui.text.TextStyle getButton();
- method public androidx.ui.text.TextStyle getCaption();
- method public androidx.ui.text.TextStyle getH1();
- method public androidx.ui.text.TextStyle getH2();
- method public androidx.ui.text.TextStyle getH3();
- method public androidx.ui.text.TextStyle getH4();
- method public androidx.ui.text.TextStyle getH5();
- method public androidx.ui.text.TextStyle getH6();
- method public androidx.ui.text.TextStyle getOverline();
- method public androidx.ui.text.TextStyle getSubtitle1();
- method public androidx.ui.text.TextStyle getSubtitle2();
+ ctor public Typography(androidx.compose.ui.text.font.FontFamily defaultFontFamily, androidx.compose.ui.text.TextStyle h1, androidx.compose.ui.text.TextStyle h2, androidx.compose.ui.text.TextStyle h3, androidx.compose.ui.text.TextStyle h4, androidx.compose.ui.text.TextStyle h5, androidx.compose.ui.text.TextStyle h6, androidx.compose.ui.text.TextStyle subtitle1, androidx.compose.ui.text.TextStyle subtitle2, androidx.compose.ui.text.TextStyle body1, androidx.compose.ui.text.TextStyle body2, androidx.compose.ui.text.TextStyle button, androidx.compose.ui.text.TextStyle caption, androidx.compose.ui.text.TextStyle overline);
+ method public androidx.compose.ui.text.TextStyle component1();
+ method public androidx.compose.ui.text.TextStyle component10();
+ method public androidx.compose.ui.text.TextStyle component11();
+ method public androidx.compose.ui.text.TextStyle component12();
+ method public androidx.compose.ui.text.TextStyle component13();
+ method public androidx.compose.ui.text.TextStyle component2();
+ method public androidx.compose.ui.text.TextStyle component3();
+ method public androidx.compose.ui.text.TextStyle component4();
+ method public androidx.compose.ui.text.TextStyle component5();
+ method public androidx.compose.ui.text.TextStyle component6();
+ method public androidx.compose.ui.text.TextStyle component7();
+ method public androidx.compose.ui.text.TextStyle component8();
+ method public androidx.compose.ui.text.TextStyle component9();
+ method @androidx.compose.Immutable public androidx.ui.material.Typography copy(androidx.compose.ui.text.TextStyle h1, androidx.compose.ui.text.TextStyle h2, androidx.compose.ui.text.TextStyle h3, androidx.compose.ui.text.TextStyle h4, androidx.compose.ui.text.TextStyle h5, androidx.compose.ui.text.TextStyle h6, androidx.compose.ui.text.TextStyle subtitle1, androidx.compose.ui.text.TextStyle subtitle2, androidx.compose.ui.text.TextStyle body1, androidx.compose.ui.text.TextStyle body2, androidx.compose.ui.text.TextStyle button, androidx.compose.ui.text.TextStyle caption, androidx.compose.ui.text.TextStyle overline);
+ method public androidx.compose.ui.text.TextStyle getBody1();
+ method public androidx.compose.ui.text.TextStyle getBody2();
+ method public androidx.compose.ui.text.TextStyle getButton();
+ method public androidx.compose.ui.text.TextStyle getCaption();
+ method public androidx.compose.ui.text.TextStyle getH1();
+ method public androidx.compose.ui.text.TextStyle getH2();
+ method public androidx.compose.ui.text.TextStyle getH3();
+ method public androidx.compose.ui.text.TextStyle getH4();
+ method public androidx.compose.ui.text.TextStyle getH5();
+ method public androidx.compose.ui.text.TextStyle getH6();
+ method public androidx.compose.ui.text.TextStyle getOverline();
+ method public androidx.compose.ui.text.TextStyle getSubtitle1();
+ method public androidx.compose.ui.text.TextStyle getSubtitle2();
}
public final class TypographyKt {
diff --git a/ui/ui-material/api/public_plus_experimental_current.txt b/ui/ui-material/api/public_plus_experimental_current.txt
index a017899..721b127 100644
--- a/ui/ui-material/api/public_plus_experimental_current.txt
+++ b/ui/ui-material/api/public_plus_experimental_current.txt
@@ -179,8 +179,8 @@
}
public final class OutlinedTextFieldKt {
- method @androidx.compose.Composable public static void OutlinedTextField-CVdlBpA(androidx.ui.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.ui.input.TextFieldValue,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.ui.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.ui.input.ImeAction,? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error);
- method @androidx.compose.Composable public static void OutlinedTextField-wI6llck(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.ui.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.ui.input.ImeAction,? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error);
+ method @androidx.compose.Composable public static void OutlinedTextField-Ike-ftg(androidx.compose.ui.text.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.TextFieldValue,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.compose.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.compose.ui.text.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.compose.ui.text.input.KeyboardType keyboardType = KeyboardType.Text, androidx.compose.ui.text.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.compose.ui.text.input.ImeAction,? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error);
+ method @androidx.compose.Composable public static void OutlinedTextField-YAF2Ul0(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.compose.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.compose.ui.text.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.compose.ui.text.input.KeyboardType keyboardType = KeyboardType.Text, androidx.compose.ui.text.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.compose.ui.text.input.ImeAction,? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error);
}
public final class ProgressIndicatorConstants {
@@ -207,12 +207,12 @@
public final class RadioButtonKt {
method @androidx.compose.Composable public static void RadioButton-mLaF0B0(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, boolean enabled = true, long selectedColor = MaterialTheme.colors.secondary, long unselectedColor = RadioButtonConstants.defaultUnselectedColor, long disabledColor = RadioButtonConstants.defaultDisabledColor);
method @Deprecated @androidx.compose.Composable public static void RadioGroup(kotlin.jvm.functions.Function1<? super androidx.ui.material.RadioGroupScope,kotlin.Unit> content);
- method @Deprecated @androidx.compose.Composable public static void RadioGroup-HJ2D5H4(java.util.List<java.lang.String> options, String? selectedOption, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onSelectedChange, androidx.ui.core.Modifier modifier = Modifier, long radioColor = MaterialTheme.colors.secondary, androidx.ui.text.TextStyle? textStyle = null);
+ method @Deprecated @androidx.compose.Composable public static void RadioGroup-pmj2ZzQ(java.util.List<java.lang.String> options, String? selectedOption, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onSelectedChange, androidx.ui.core.Modifier modifier = Modifier, long radioColor = MaterialTheme.colors.secondary, androidx.compose.ui.text.TextStyle? textStyle = null);
}
@Deprecated @androidx.compose.Stable public final class RadioGroupScope {
method @Deprecated @androidx.compose.Composable public void RadioGroupItem(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onSelect, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit> content);
- method @Deprecated @androidx.compose.Composable public void RadioGroupTextItem-JJAyy3w(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onSelect, String text, androidx.ui.core.Modifier modifier = Modifier, long radioColor = MaterialTheme.colors.secondary, androidx.ui.text.TextStyle? textStyle = null);
+ method @Deprecated @androidx.compose.Composable public void RadioGroupTextItem-JSFNu0c(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onSelect, String text, androidx.ui.core.Modifier modifier = Modifier, long radioColor = MaterialTheme.colors.secondary, androidx.compose.ui.text.TextStyle? textStyle = null);
}
public final class Scaffold {
@@ -316,41 +316,41 @@
}
public final class TextFieldKt {
- method @Deprecated @androidx.compose.Composable public static void FilledTextField-Vmoa5zc(androidx.ui.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.ui.input.TextFieldValue,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.ui.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.ui.input.ImeAction,? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error, long backgroundColor = MaterialTheme.colors.onSurface, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(ZeroCornerSize, ZeroCornerSize));
- method @Deprecated @androidx.compose.Composable public static void FilledTextField-o4GafH0(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.ui.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.ui.input.ImeAction,? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error, long backgroundColor = MaterialTheme.colors.onSurface, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(ZeroCornerSize, ZeroCornerSize));
- method @androidx.compose.Composable public static void TextField-Vmoa5zc(androidx.ui.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.ui.input.TextFieldValue,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.ui.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.ui.input.ImeAction,? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error, long backgroundColor = MaterialTheme.colors.onSurface, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(ZeroCornerSize, ZeroCornerSize));
- method @androidx.compose.Composable public static void TextField-o4GafH0(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.ui.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.ui.input.ImeAction,? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error, long backgroundColor = MaterialTheme.colors.onSurface, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(ZeroCornerSize, ZeroCornerSize));
+ method @Deprecated @androidx.compose.Composable public static void FilledTextField-M28u9F8(androidx.compose.ui.text.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.TextFieldValue,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.compose.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.compose.ui.text.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.compose.ui.text.input.KeyboardType keyboardType = KeyboardType.Text, androidx.compose.ui.text.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.compose.ui.text.input.ImeAction,? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error, long backgroundColor = MaterialTheme.colors.onSurface, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(ZeroCornerSize, ZeroCornerSize));
+ method @Deprecated @androidx.compose.Composable public static void FilledTextField-j88Ozi0(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.compose.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.compose.ui.text.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.compose.ui.text.input.KeyboardType keyboardType = KeyboardType.Text, androidx.compose.ui.text.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.compose.ui.text.input.ImeAction,? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error, long backgroundColor = MaterialTheme.colors.onSurface, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(ZeroCornerSize, ZeroCornerSize));
+ method @androidx.compose.Composable public static void TextField-M28u9F8(androidx.compose.ui.text.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.TextFieldValue,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.compose.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.compose.ui.text.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.compose.ui.text.input.KeyboardType keyboardType = KeyboardType.Text, androidx.compose.ui.text.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.compose.ui.text.input.ImeAction,? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error, long backgroundColor = MaterialTheme.colors.onSurface, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(ZeroCornerSize, ZeroCornerSize));
+ method @androidx.compose.Composable public static void TextField-j88Ozi0(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.compose.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.compose.ui.text.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.compose.ui.text.input.KeyboardType keyboardType = KeyboardType.Text, androidx.compose.ui.text.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.compose.ui.text.input.ImeAction,? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error, long backgroundColor = MaterialTheme.colors.onSurface, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(ZeroCornerSize, ZeroCornerSize));
}
@androidx.compose.Immutable public final class Typography {
- ctor public Typography(androidx.ui.text.font.FontFamily defaultFontFamily, androidx.ui.text.TextStyle h1, androidx.ui.text.TextStyle h2, androidx.ui.text.TextStyle h3, androidx.ui.text.TextStyle h4, androidx.ui.text.TextStyle h5, androidx.ui.text.TextStyle h6, androidx.ui.text.TextStyle subtitle1, androidx.ui.text.TextStyle subtitle2, androidx.ui.text.TextStyle body1, androidx.ui.text.TextStyle body2, androidx.ui.text.TextStyle button, androidx.ui.text.TextStyle caption, androidx.ui.text.TextStyle overline);
- method public androidx.ui.text.TextStyle component1();
- method public androidx.ui.text.TextStyle component10();
- method public androidx.ui.text.TextStyle component11();
- method public androidx.ui.text.TextStyle component12();
- method public androidx.ui.text.TextStyle component13();
- method public androidx.ui.text.TextStyle component2();
- method public androidx.ui.text.TextStyle component3();
- method public androidx.ui.text.TextStyle component4();
- method public androidx.ui.text.TextStyle component5();
- method public androidx.ui.text.TextStyle component6();
- method public androidx.ui.text.TextStyle component7();
- method public androidx.ui.text.TextStyle component8();
- method public androidx.ui.text.TextStyle component9();
- method @androidx.compose.Immutable public androidx.ui.material.Typography copy(androidx.ui.text.TextStyle h1, androidx.ui.text.TextStyle h2, androidx.ui.text.TextStyle h3, androidx.ui.text.TextStyle h4, androidx.ui.text.TextStyle h5, androidx.ui.text.TextStyle h6, androidx.ui.text.TextStyle subtitle1, androidx.ui.text.TextStyle subtitle2, androidx.ui.text.TextStyle body1, androidx.ui.text.TextStyle body2, androidx.ui.text.TextStyle button, androidx.ui.text.TextStyle caption, androidx.ui.text.TextStyle overline);
- method public androidx.ui.text.TextStyle getBody1();
- method public androidx.ui.text.TextStyle getBody2();
- method public androidx.ui.text.TextStyle getButton();
- method public androidx.ui.text.TextStyle getCaption();
- method public androidx.ui.text.TextStyle getH1();
- method public androidx.ui.text.TextStyle getH2();
- method public androidx.ui.text.TextStyle getH3();
- method public androidx.ui.text.TextStyle getH4();
- method public androidx.ui.text.TextStyle getH5();
- method public androidx.ui.text.TextStyle getH6();
- method public androidx.ui.text.TextStyle getOverline();
- method public androidx.ui.text.TextStyle getSubtitle1();
- method public androidx.ui.text.TextStyle getSubtitle2();
+ ctor public Typography(androidx.compose.ui.text.font.FontFamily defaultFontFamily, androidx.compose.ui.text.TextStyle h1, androidx.compose.ui.text.TextStyle h2, androidx.compose.ui.text.TextStyle h3, androidx.compose.ui.text.TextStyle h4, androidx.compose.ui.text.TextStyle h5, androidx.compose.ui.text.TextStyle h6, androidx.compose.ui.text.TextStyle subtitle1, androidx.compose.ui.text.TextStyle subtitle2, androidx.compose.ui.text.TextStyle body1, androidx.compose.ui.text.TextStyle body2, androidx.compose.ui.text.TextStyle button, androidx.compose.ui.text.TextStyle caption, androidx.compose.ui.text.TextStyle overline);
+ method public androidx.compose.ui.text.TextStyle component1();
+ method public androidx.compose.ui.text.TextStyle component10();
+ method public androidx.compose.ui.text.TextStyle component11();
+ method public androidx.compose.ui.text.TextStyle component12();
+ method public androidx.compose.ui.text.TextStyle component13();
+ method public androidx.compose.ui.text.TextStyle component2();
+ method public androidx.compose.ui.text.TextStyle component3();
+ method public androidx.compose.ui.text.TextStyle component4();
+ method public androidx.compose.ui.text.TextStyle component5();
+ method public androidx.compose.ui.text.TextStyle component6();
+ method public androidx.compose.ui.text.TextStyle component7();
+ method public androidx.compose.ui.text.TextStyle component8();
+ method public androidx.compose.ui.text.TextStyle component9();
+ method @androidx.compose.Immutable public androidx.ui.material.Typography copy(androidx.compose.ui.text.TextStyle h1, androidx.compose.ui.text.TextStyle h2, androidx.compose.ui.text.TextStyle h3, androidx.compose.ui.text.TextStyle h4, androidx.compose.ui.text.TextStyle h5, androidx.compose.ui.text.TextStyle h6, androidx.compose.ui.text.TextStyle subtitle1, androidx.compose.ui.text.TextStyle subtitle2, androidx.compose.ui.text.TextStyle body1, androidx.compose.ui.text.TextStyle body2, androidx.compose.ui.text.TextStyle button, androidx.compose.ui.text.TextStyle caption, androidx.compose.ui.text.TextStyle overline);
+ method public androidx.compose.ui.text.TextStyle getBody1();
+ method public androidx.compose.ui.text.TextStyle getBody2();
+ method public androidx.compose.ui.text.TextStyle getButton();
+ method public androidx.compose.ui.text.TextStyle getCaption();
+ method public androidx.compose.ui.text.TextStyle getH1();
+ method public androidx.compose.ui.text.TextStyle getH2();
+ method public androidx.compose.ui.text.TextStyle getH3();
+ method public androidx.compose.ui.text.TextStyle getH4();
+ method public androidx.compose.ui.text.TextStyle getH5();
+ method public androidx.compose.ui.text.TextStyle getH6();
+ method public androidx.compose.ui.text.TextStyle getOverline();
+ method public androidx.compose.ui.text.TextStyle getSubtitle1();
+ method public androidx.compose.ui.text.TextStyle getSubtitle2();
}
public final class TypographyKt {
diff --git a/ui/ui-material/api/restricted_0.1.0-dev16.txt b/ui/ui-material/api/restricted_0.1.0-dev16.txt
index 1d5b4f0..0bd6bc5 100644
--- a/ui/ui-material/api/restricted_0.1.0-dev16.txt
+++ b/ui/ui-material/api/restricted_0.1.0-dev16.txt
@@ -180,8 +180,8 @@
}
public final class OutlinedTextFieldKt {
- method @androidx.compose.Composable public static void OutlinedTextField-CVdlBpA(androidx.ui.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.ui.input.TextFieldValue,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.ui.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.ui.input.ImeAction,? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error);
- method @androidx.compose.Composable public static void OutlinedTextField-wI6llck(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.ui.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.ui.input.ImeAction,? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error);
+ method @androidx.compose.Composable public static void OutlinedTextField-Ike-ftg(androidx.compose.ui.text.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.TextFieldValue,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.compose.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.compose.ui.text.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.compose.ui.text.input.KeyboardType keyboardType = KeyboardType.Text, androidx.compose.ui.text.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.compose.ui.text.input.ImeAction,? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error);
+ method @androidx.compose.Composable public static void OutlinedTextField-YAF2Ul0(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.compose.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.compose.ui.text.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.compose.ui.text.input.KeyboardType keyboardType = KeyboardType.Text, androidx.compose.ui.text.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.compose.ui.text.input.ImeAction,? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error);
}
public final class ProgressIndicatorConstants {
@@ -208,12 +208,12 @@
public final class RadioButtonKt {
method @androidx.compose.Composable public static void RadioButton-mLaF0B0(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, boolean enabled = true, long selectedColor = MaterialTheme.colors.secondary, long unselectedColor = RadioButtonConstants.defaultUnselectedColor, long disabledColor = RadioButtonConstants.defaultDisabledColor);
method @Deprecated @androidx.compose.Composable public static void RadioGroup(kotlin.jvm.functions.Function1<? super androidx.ui.material.RadioGroupScope,kotlin.Unit> content);
- method @Deprecated @androidx.compose.Composable public static void RadioGroup-HJ2D5H4(java.util.List<java.lang.String> options, String? selectedOption, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onSelectedChange, androidx.ui.core.Modifier modifier = Modifier, long radioColor = MaterialTheme.colors.secondary, androidx.ui.text.TextStyle? textStyle = null);
+ method @Deprecated @androidx.compose.Composable public static void RadioGroup-pmj2ZzQ(java.util.List<java.lang.String> options, String? selectedOption, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onSelectedChange, androidx.ui.core.Modifier modifier = Modifier, long radioColor = MaterialTheme.colors.secondary, androidx.compose.ui.text.TextStyle? textStyle = null);
}
@Deprecated @androidx.compose.Stable public final class RadioGroupScope {
method @Deprecated @androidx.compose.Composable public void RadioGroupItem(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onSelect, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit> content);
- method @Deprecated @androidx.compose.Composable public void RadioGroupTextItem-JJAyy3w(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onSelect, String text, androidx.ui.core.Modifier modifier = Modifier, long radioColor = MaterialTheme.colors.secondary, androidx.ui.text.TextStyle? textStyle = null);
+ method @Deprecated @androidx.compose.Composable public void RadioGroupTextItem-JSFNu0c(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onSelect, String text, androidx.ui.core.Modifier modifier = Modifier, long radioColor = MaterialTheme.colors.secondary, androidx.compose.ui.text.TextStyle? textStyle = null);
}
public final class Scaffold {
@@ -317,41 +317,41 @@
}
public final class TextFieldKt {
- method @Deprecated @androidx.compose.Composable public static void FilledTextField-Vmoa5zc(androidx.ui.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.ui.input.TextFieldValue,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.ui.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.ui.input.ImeAction,? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error, long backgroundColor = MaterialTheme.colors.onSurface, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(ZeroCornerSize, ZeroCornerSize));
- method @Deprecated @androidx.compose.Composable public static void FilledTextField-o4GafH0(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.ui.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.ui.input.ImeAction,? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error, long backgroundColor = MaterialTheme.colors.onSurface, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(ZeroCornerSize, ZeroCornerSize));
- method @androidx.compose.Composable public static void TextField-Vmoa5zc(androidx.ui.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.ui.input.TextFieldValue,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.ui.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.ui.input.ImeAction,? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error, long backgroundColor = MaterialTheme.colors.onSurface, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(ZeroCornerSize, ZeroCornerSize));
- method @androidx.compose.Composable public static void TextField-o4GafH0(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.ui.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.ui.input.ImeAction,? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error, long backgroundColor = MaterialTheme.colors.onSurface, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(ZeroCornerSize, ZeroCornerSize));
+ method @Deprecated @androidx.compose.Composable public static void FilledTextField-M28u9F8(androidx.compose.ui.text.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.TextFieldValue,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.compose.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.compose.ui.text.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.compose.ui.text.input.KeyboardType keyboardType = KeyboardType.Text, androidx.compose.ui.text.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.compose.ui.text.input.ImeAction,? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error, long backgroundColor = MaterialTheme.colors.onSurface, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(ZeroCornerSize, ZeroCornerSize));
+ method @Deprecated @androidx.compose.Composable public static void FilledTextField-j88Ozi0(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.compose.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.compose.ui.text.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.compose.ui.text.input.KeyboardType keyboardType = KeyboardType.Text, androidx.compose.ui.text.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.compose.ui.text.input.ImeAction,? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error, long backgroundColor = MaterialTheme.colors.onSurface, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(ZeroCornerSize, ZeroCornerSize));
+ method @androidx.compose.Composable public static void TextField-M28u9F8(androidx.compose.ui.text.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.TextFieldValue,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.compose.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.compose.ui.text.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.compose.ui.text.input.KeyboardType keyboardType = KeyboardType.Text, androidx.compose.ui.text.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.compose.ui.text.input.ImeAction,? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error, long backgroundColor = MaterialTheme.colors.onSurface, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(ZeroCornerSize, ZeroCornerSize));
+ method @androidx.compose.Composable public static void TextField-j88Ozi0(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.compose.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.compose.ui.text.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.compose.ui.text.input.KeyboardType keyboardType = KeyboardType.Text, androidx.compose.ui.text.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.compose.ui.text.input.ImeAction,? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error, long backgroundColor = MaterialTheme.colors.onSurface, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(ZeroCornerSize, ZeroCornerSize));
}
@androidx.compose.Immutable public final class Typography {
- ctor public Typography(androidx.ui.text.font.FontFamily defaultFontFamily, androidx.ui.text.TextStyle h1, androidx.ui.text.TextStyle h2, androidx.ui.text.TextStyle h3, androidx.ui.text.TextStyle h4, androidx.ui.text.TextStyle h5, androidx.ui.text.TextStyle h6, androidx.ui.text.TextStyle subtitle1, androidx.ui.text.TextStyle subtitle2, androidx.ui.text.TextStyle body1, androidx.ui.text.TextStyle body2, androidx.ui.text.TextStyle button, androidx.ui.text.TextStyle caption, androidx.ui.text.TextStyle overline);
- method public androidx.ui.text.TextStyle component1();
- method public androidx.ui.text.TextStyle component10();
- method public androidx.ui.text.TextStyle component11();
- method public androidx.ui.text.TextStyle component12();
- method public androidx.ui.text.TextStyle component13();
- method public androidx.ui.text.TextStyle component2();
- method public androidx.ui.text.TextStyle component3();
- method public androidx.ui.text.TextStyle component4();
- method public androidx.ui.text.TextStyle component5();
- method public androidx.ui.text.TextStyle component6();
- method public androidx.ui.text.TextStyle component7();
- method public androidx.ui.text.TextStyle component8();
- method public androidx.ui.text.TextStyle component9();
- method @androidx.compose.Immutable public androidx.ui.material.Typography copy(androidx.ui.text.TextStyle h1, androidx.ui.text.TextStyle h2, androidx.ui.text.TextStyle h3, androidx.ui.text.TextStyle h4, androidx.ui.text.TextStyle h5, androidx.ui.text.TextStyle h6, androidx.ui.text.TextStyle subtitle1, androidx.ui.text.TextStyle subtitle2, androidx.ui.text.TextStyle body1, androidx.ui.text.TextStyle body2, androidx.ui.text.TextStyle button, androidx.ui.text.TextStyle caption, androidx.ui.text.TextStyle overline);
- method public androidx.ui.text.TextStyle getBody1();
- method public androidx.ui.text.TextStyle getBody2();
- method public androidx.ui.text.TextStyle getButton();
- method public androidx.ui.text.TextStyle getCaption();
- method public androidx.ui.text.TextStyle getH1();
- method public androidx.ui.text.TextStyle getH2();
- method public androidx.ui.text.TextStyle getH3();
- method public androidx.ui.text.TextStyle getH4();
- method public androidx.ui.text.TextStyle getH5();
- method public androidx.ui.text.TextStyle getH6();
- method public androidx.ui.text.TextStyle getOverline();
- method public androidx.ui.text.TextStyle getSubtitle1();
- method public androidx.ui.text.TextStyle getSubtitle2();
+ ctor public Typography(androidx.compose.ui.text.font.FontFamily defaultFontFamily, androidx.compose.ui.text.TextStyle h1, androidx.compose.ui.text.TextStyle h2, androidx.compose.ui.text.TextStyle h3, androidx.compose.ui.text.TextStyle h4, androidx.compose.ui.text.TextStyle h5, androidx.compose.ui.text.TextStyle h6, androidx.compose.ui.text.TextStyle subtitle1, androidx.compose.ui.text.TextStyle subtitle2, androidx.compose.ui.text.TextStyle body1, androidx.compose.ui.text.TextStyle body2, androidx.compose.ui.text.TextStyle button, androidx.compose.ui.text.TextStyle caption, androidx.compose.ui.text.TextStyle overline);
+ method public androidx.compose.ui.text.TextStyle component1();
+ method public androidx.compose.ui.text.TextStyle component10();
+ method public androidx.compose.ui.text.TextStyle component11();
+ method public androidx.compose.ui.text.TextStyle component12();
+ method public androidx.compose.ui.text.TextStyle component13();
+ method public androidx.compose.ui.text.TextStyle component2();
+ method public androidx.compose.ui.text.TextStyle component3();
+ method public androidx.compose.ui.text.TextStyle component4();
+ method public androidx.compose.ui.text.TextStyle component5();
+ method public androidx.compose.ui.text.TextStyle component6();
+ method public androidx.compose.ui.text.TextStyle component7();
+ method public androidx.compose.ui.text.TextStyle component8();
+ method public androidx.compose.ui.text.TextStyle component9();
+ method @androidx.compose.Immutable public androidx.ui.material.Typography copy(androidx.compose.ui.text.TextStyle h1, androidx.compose.ui.text.TextStyle h2, androidx.compose.ui.text.TextStyle h3, androidx.compose.ui.text.TextStyle h4, androidx.compose.ui.text.TextStyle h5, androidx.compose.ui.text.TextStyle h6, androidx.compose.ui.text.TextStyle subtitle1, androidx.compose.ui.text.TextStyle subtitle2, androidx.compose.ui.text.TextStyle body1, androidx.compose.ui.text.TextStyle body2, androidx.compose.ui.text.TextStyle button, androidx.compose.ui.text.TextStyle caption, androidx.compose.ui.text.TextStyle overline);
+ method public androidx.compose.ui.text.TextStyle getBody1();
+ method public androidx.compose.ui.text.TextStyle getBody2();
+ method public androidx.compose.ui.text.TextStyle getButton();
+ method public androidx.compose.ui.text.TextStyle getCaption();
+ method public androidx.compose.ui.text.TextStyle getH1();
+ method public androidx.compose.ui.text.TextStyle getH2();
+ method public androidx.compose.ui.text.TextStyle getH3();
+ method public androidx.compose.ui.text.TextStyle getH4();
+ method public androidx.compose.ui.text.TextStyle getH5();
+ method public androidx.compose.ui.text.TextStyle getH6();
+ method public androidx.compose.ui.text.TextStyle getOverline();
+ method public androidx.compose.ui.text.TextStyle getSubtitle1();
+ method public androidx.compose.ui.text.TextStyle getSubtitle2();
}
public final class TypographyKt {
diff --git a/ui/ui-material/api/restricted_current.txt b/ui/ui-material/api/restricted_current.txt
index 1d5b4f0..0bd6bc5 100644
--- a/ui/ui-material/api/restricted_current.txt
+++ b/ui/ui-material/api/restricted_current.txt
@@ -180,8 +180,8 @@
}
public final class OutlinedTextFieldKt {
- method @androidx.compose.Composable public static void OutlinedTextField-CVdlBpA(androidx.ui.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.ui.input.TextFieldValue,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.ui.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.ui.input.ImeAction,? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error);
- method @androidx.compose.Composable public static void OutlinedTextField-wI6llck(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.ui.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.ui.input.ImeAction,? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error);
+ method @androidx.compose.Composable public static void OutlinedTextField-Ike-ftg(androidx.compose.ui.text.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.TextFieldValue,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.compose.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.compose.ui.text.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.compose.ui.text.input.KeyboardType keyboardType = KeyboardType.Text, androidx.compose.ui.text.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.compose.ui.text.input.ImeAction,? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error);
+ method @androidx.compose.Composable public static void OutlinedTextField-YAF2Ul0(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.compose.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.compose.ui.text.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.compose.ui.text.input.KeyboardType keyboardType = KeyboardType.Text, androidx.compose.ui.text.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.compose.ui.text.input.ImeAction,? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error);
}
public final class ProgressIndicatorConstants {
@@ -208,12 +208,12 @@
public final class RadioButtonKt {
method @androidx.compose.Composable public static void RadioButton-mLaF0B0(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onClick, androidx.ui.core.Modifier modifier = Modifier, boolean enabled = true, long selectedColor = MaterialTheme.colors.secondary, long unselectedColor = RadioButtonConstants.defaultUnselectedColor, long disabledColor = RadioButtonConstants.defaultDisabledColor);
method @Deprecated @androidx.compose.Composable public static void RadioGroup(kotlin.jvm.functions.Function1<? super androidx.ui.material.RadioGroupScope,kotlin.Unit> content);
- method @Deprecated @androidx.compose.Composable public static void RadioGroup-HJ2D5H4(java.util.List<java.lang.String> options, String? selectedOption, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onSelectedChange, androidx.ui.core.Modifier modifier = Modifier, long radioColor = MaterialTheme.colors.secondary, androidx.ui.text.TextStyle? textStyle = null);
+ method @Deprecated @androidx.compose.Composable public static void RadioGroup-pmj2ZzQ(java.util.List<java.lang.String> options, String? selectedOption, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onSelectedChange, androidx.ui.core.Modifier modifier = Modifier, long radioColor = MaterialTheme.colors.secondary, androidx.compose.ui.text.TextStyle? textStyle = null);
}
@Deprecated @androidx.compose.Stable public final class RadioGroupScope {
method @Deprecated @androidx.compose.Composable public void RadioGroupItem(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onSelect, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function0<kotlin.Unit> content);
- method @Deprecated @androidx.compose.Composable public void RadioGroupTextItem-JJAyy3w(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onSelect, String text, androidx.ui.core.Modifier modifier = Modifier, long radioColor = MaterialTheme.colors.secondary, androidx.ui.text.TextStyle? textStyle = null);
+ method @Deprecated @androidx.compose.Composable public void RadioGroupTextItem-JSFNu0c(boolean selected, kotlin.jvm.functions.Function0<kotlin.Unit> onSelect, String text, androidx.ui.core.Modifier modifier = Modifier, long radioColor = MaterialTheme.colors.secondary, androidx.compose.ui.text.TextStyle? textStyle = null);
}
public final class Scaffold {
@@ -317,41 +317,41 @@
}
public final class TextFieldKt {
- method @Deprecated @androidx.compose.Composable public static void FilledTextField-Vmoa5zc(androidx.ui.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.ui.input.TextFieldValue,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.ui.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.ui.input.ImeAction,? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error, long backgroundColor = MaterialTheme.colors.onSurface, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(ZeroCornerSize, ZeroCornerSize));
- method @Deprecated @androidx.compose.Composable public static void FilledTextField-o4GafH0(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.ui.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.ui.input.ImeAction,? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error, long backgroundColor = MaterialTheme.colors.onSurface, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(ZeroCornerSize, ZeroCornerSize));
- method @androidx.compose.Composable public static void TextField-Vmoa5zc(androidx.ui.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.ui.input.TextFieldValue,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.ui.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.ui.input.ImeAction,? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error, long backgroundColor = MaterialTheme.colors.onSurface, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(ZeroCornerSize, ZeroCornerSize));
- method @androidx.compose.Composable public static void TextField-o4GafH0(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.ui.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.ui.input.ImeAction,? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error, long backgroundColor = MaterialTheme.colors.onSurface, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(ZeroCornerSize, ZeroCornerSize));
+ method @Deprecated @androidx.compose.Composable public static void FilledTextField-M28u9F8(androidx.compose.ui.text.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.TextFieldValue,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.compose.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.compose.ui.text.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.compose.ui.text.input.KeyboardType keyboardType = KeyboardType.Text, androidx.compose.ui.text.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.compose.ui.text.input.ImeAction,? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error, long backgroundColor = MaterialTheme.colors.onSurface, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(ZeroCornerSize, ZeroCornerSize));
+ method @Deprecated @androidx.compose.Composable public static void FilledTextField-j88Ozi0(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.compose.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.compose.ui.text.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.compose.ui.text.input.KeyboardType keyboardType = KeyboardType.Text, androidx.compose.ui.text.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.compose.ui.text.input.ImeAction,? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error, long backgroundColor = MaterialTheme.colors.onSurface, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(ZeroCornerSize, ZeroCornerSize));
+ method @androidx.compose.Composable public static void TextField-M28u9F8(androidx.compose.ui.text.input.TextFieldValue value, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.TextFieldValue,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.compose.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.compose.ui.text.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.compose.ui.text.input.KeyboardType keyboardType = KeyboardType.Text, androidx.compose.ui.text.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.compose.ui.text.input.ImeAction,? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error, long backgroundColor = MaterialTheme.colors.onSurface, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(ZeroCornerSize, ZeroCornerSize));
+ method @androidx.compose.Composable public static void TextField-j88Ozi0(String value, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> onValueChange, kotlin.jvm.functions.Function0<kotlin.Unit> label, androidx.ui.core.Modifier modifier = Modifier, androidx.compose.ui.text.TextStyle textStyle = currentTextStyle(), kotlin.jvm.functions.Function0<kotlin.Unit>? placeholder = null, kotlin.jvm.functions.Function0<kotlin.Unit>? leadingIcon = null, kotlin.jvm.functions.Function0<kotlin.Unit>? trailingIcon = null, boolean isErrorValue = false, androidx.compose.ui.text.input.VisualTransformation visualTransformation = VisualTransformation.None, androidx.compose.ui.text.input.KeyboardType keyboardType = KeyboardType.Text, androidx.compose.ui.text.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function2<? super androidx.compose.ui.text.input.ImeAction,? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> _, _ -> }, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> long activeColor = MaterialTheme.colors.primary, long inactiveColor = MaterialTheme.colors.onSurface, long errorColor = MaterialTheme.colors.error, long backgroundColor = MaterialTheme.colors.onSurface, androidx.ui.graphics.Shape shape = MaterialTheme.shapes.small.copy(ZeroCornerSize, ZeroCornerSize));
}
@androidx.compose.Immutable public final class Typography {
- ctor public Typography(androidx.ui.text.font.FontFamily defaultFontFamily, androidx.ui.text.TextStyle h1, androidx.ui.text.TextStyle h2, androidx.ui.text.TextStyle h3, androidx.ui.text.TextStyle h4, androidx.ui.text.TextStyle h5, androidx.ui.text.TextStyle h6, androidx.ui.text.TextStyle subtitle1, androidx.ui.text.TextStyle subtitle2, androidx.ui.text.TextStyle body1, androidx.ui.text.TextStyle body2, androidx.ui.text.TextStyle button, androidx.ui.text.TextStyle caption, androidx.ui.text.TextStyle overline);
- method public androidx.ui.text.TextStyle component1();
- method public androidx.ui.text.TextStyle component10();
- method public androidx.ui.text.TextStyle component11();
- method public androidx.ui.text.TextStyle component12();
- method public androidx.ui.text.TextStyle component13();
- method public androidx.ui.text.TextStyle component2();
- method public androidx.ui.text.TextStyle component3();
- method public androidx.ui.text.TextStyle component4();
- method public androidx.ui.text.TextStyle component5();
- method public androidx.ui.text.TextStyle component6();
- method public androidx.ui.text.TextStyle component7();
- method public androidx.ui.text.TextStyle component8();
- method public androidx.ui.text.TextStyle component9();
- method @androidx.compose.Immutable public androidx.ui.material.Typography copy(androidx.ui.text.TextStyle h1, androidx.ui.text.TextStyle h2, androidx.ui.text.TextStyle h3, androidx.ui.text.TextStyle h4, androidx.ui.text.TextStyle h5, androidx.ui.text.TextStyle h6, androidx.ui.text.TextStyle subtitle1, androidx.ui.text.TextStyle subtitle2, androidx.ui.text.TextStyle body1, androidx.ui.text.TextStyle body2, androidx.ui.text.TextStyle button, androidx.ui.text.TextStyle caption, androidx.ui.text.TextStyle overline);
- method public androidx.ui.text.TextStyle getBody1();
- method public androidx.ui.text.TextStyle getBody2();
- method public androidx.ui.text.TextStyle getButton();
- method public androidx.ui.text.TextStyle getCaption();
- method public androidx.ui.text.TextStyle getH1();
- method public androidx.ui.text.TextStyle getH2();
- method public androidx.ui.text.TextStyle getH3();
- method public androidx.ui.text.TextStyle getH4();
- method public androidx.ui.text.TextStyle getH5();
- method public androidx.ui.text.TextStyle getH6();
- method public androidx.ui.text.TextStyle getOverline();
- method public androidx.ui.text.TextStyle getSubtitle1();
- method public androidx.ui.text.TextStyle getSubtitle2();
+ ctor public Typography(androidx.compose.ui.text.font.FontFamily defaultFontFamily, androidx.compose.ui.text.TextStyle h1, androidx.compose.ui.text.TextStyle h2, androidx.compose.ui.text.TextStyle h3, androidx.compose.ui.text.TextStyle h4, androidx.compose.ui.text.TextStyle h5, androidx.compose.ui.text.TextStyle h6, androidx.compose.ui.text.TextStyle subtitle1, androidx.compose.ui.text.TextStyle subtitle2, androidx.compose.ui.text.TextStyle body1, androidx.compose.ui.text.TextStyle body2, androidx.compose.ui.text.TextStyle button, androidx.compose.ui.text.TextStyle caption, androidx.compose.ui.text.TextStyle overline);
+ method public androidx.compose.ui.text.TextStyle component1();
+ method public androidx.compose.ui.text.TextStyle component10();
+ method public androidx.compose.ui.text.TextStyle component11();
+ method public androidx.compose.ui.text.TextStyle component12();
+ method public androidx.compose.ui.text.TextStyle component13();
+ method public androidx.compose.ui.text.TextStyle component2();
+ method public androidx.compose.ui.text.TextStyle component3();
+ method public androidx.compose.ui.text.TextStyle component4();
+ method public androidx.compose.ui.text.TextStyle component5();
+ method public androidx.compose.ui.text.TextStyle component6();
+ method public androidx.compose.ui.text.TextStyle component7();
+ method public androidx.compose.ui.text.TextStyle component8();
+ method public androidx.compose.ui.text.TextStyle component9();
+ method @androidx.compose.Immutable public androidx.ui.material.Typography copy(androidx.compose.ui.text.TextStyle h1, androidx.compose.ui.text.TextStyle h2, androidx.compose.ui.text.TextStyle h3, androidx.compose.ui.text.TextStyle h4, androidx.compose.ui.text.TextStyle h5, androidx.compose.ui.text.TextStyle h6, androidx.compose.ui.text.TextStyle subtitle1, androidx.compose.ui.text.TextStyle subtitle2, androidx.compose.ui.text.TextStyle body1, androidx.compose.ui.text.TextStyle body2, androidx.compose.ui.text.TextStyle button, androidx.compose.ui.text.TextStyle caption, androidx.compose.ui.text.TextStyle overline);
+ method public androidx.compose.ui.text.TextStyle getBody1();
+ method public androidx.compose.ui.text.TextStyle getBody2();
+ method public androidx.compose.ui.text.TextStyle getButton();
+ method public androidx.compose.ui.text.TextStyle getCaption();
+ method public androidx.compose.ui.text.TextStyle getH1();
+ method public androidx.compose.ui.text.TextStyle getH2();
+ method public androidx.compose.ui.text.TextStyle getH3();
+ method public androidx.compose.ui.text.TextStyle getH4();
+ method public androidx.compose.ui.text.TextStyle getH5();
+ method public androidx.compose.ui.text.TextStyle getH6();
+ method public androidx.compose.ui.text.TextStyle getOverline();
+ method public androidx.compose.ui.text.TextStyle getSubtitle1();
+ method public androidx.compose.ui.text.TextStyle getSubtitle2();
}
public final class TypographyKt {
diff --git a/ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/ColorPickerDemo.kt b/ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/ColorPickerDemo.kt
index e87714c..14a55c26 100644
--- a/ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/ColorPickerDemo.kt
+++ b/ui/ui-material/integration-tests/material-demos/src/main/java/androidx/ui/material/demos/ColorPickerDemo.kt
@@ -67,7 +67,7 @@
import androidx.compose.foundation.layout.preferredSize
import androidx.ui.material.Surface
import androidx.ui.material.TopAppBar
-import androidx.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextAlign
import androidx.ui.unit.Dp
import androidx.ui.unit.dp
import java.util.Locale
diff --git a/ui/ui-material/integration-tests/material-studies/src/main/java/androidx/ui/material/studies/rally/RallyTheme.kt b/ui/ui-material/integration-tests/material-studies/src/main/java/androidx/ui/material/studies/rally/RallyTheme.kt
index 60abbdf..9559556 100644
--- a/ui/ui-material/integration-tests/material-studies/src/main/java/androidx/ui/material/studies/rally/RallyTheme.kt
+++ b/ui/ui-material/integration-tests/material-studies/src/main/java/androidx/ui/material/studies/rally/RallyTheme.kt
@@ -21,9 +21,9 @@
import androidx.ui.material.MaterialTheme
import androidx.ui.material.Typography
import androidx.ui.material.darkColorPalette
-import androidx.ui.text.TextStyle
-import androidx.ui.text.font.FontFamily
-import androidx.ui.text.font.FontWeight
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontWeight
import androidx.ui.unit.em
import androidx.ui.unit.sp
diff --git a/ui/ui-material/samples/src/main/java/androidx/ui/material/samples/TextFieldSamples.kt b/ui/ui-material/samples/src/main/java/androidx/ui/material/samples/TextFieldSamples.kt
index 219475a..997703a 100644
--- a/ui/ui-material/samples/src/main/java/androidx/ui/material/samples/TextFieldSamples.kt
+++ b/ui/ui-material/samples/src/main/java/androidx/ui/material/samples/TextFieldSamples.kt
@@ -23,10 +23,10 @@
import androidx.ui.core.Modifier
import androidx.compose.foundation.Icon
import androidx.compose.foundation.Text
-import androidx.ui.input.ImeAction
-import androidx.ui.input.KeyboardType
-import androidx.ui.input.PasswordVisualTransformation
-import androidx.ui.input.TextFieldValue
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.text.input.PasswordVisualTransformation
+import androidx.compose.ui.text.input.TextFieldValue
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.padding
import androidx.ui.material.EmphasisAmbient
@@ -37,7 +37,7 @@
import androidx.ui.material.icons.filled.Favorite
import androidx.ui.material.icons.filled.Info
import androidx.compose.runtime.savedinstancestate.savedInstanceState
-import androidx.ui.text.TextRange
+import androidx.compose.ui.text.TextRange
import androidx.ui.unit.dp
@Sampled
diff --git a/ui/ui-material/samples/src/main/java/androidx/ui/material/samples/ThemeSamples.kt b/ui/ui-material/samples/src/main/java/androidx/ui/material/samples/ThemeSamples.kt
index 4b024a9..b20ea3c 100644
--- a/ui/ui-material/samples/src/main/java/androidx/ui/material/samples/ThemeSamples.kt
+++ b/ui/ui-material/samples/src/main/java/androidx/ui/material/samples/ThemeSamples.kt
@@ -31,8 +31,8 @@
import androidx.ui.material.Typography
import androidx.ui.material.darkColorPalette
import androidx.ui.material.lightColorPalette
-import androidx.ui.text.TextStyle
-import androidx.ui.text.font.FontWeight
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontWeight
import androidx.ui.unit.sp
@Sampled
diff --git a/ui/ui-material/src/androidTest/java/androidx/ui/material/AppBarTest.kt b/ui/ui-material/src/androidTest/java/androidx/ui/material/AppBarTest.kt
index 8186454..d916385 100644
--- a/ui/ui-material/src/androidTest/java/androidx/ui/material/AppBarTest.kt
+++ b/ui/ui-material/src/androidTest/java/androidx/ui/material/AppBarTest.kt
@@ -34,7 +34,7 @@
import androidx.ui.test.onNodeWithTag
import androidx.ui.test.onNodeWithText
import androidx.ui.test.getBoundsInRoot
-import androidx.ui.text.TextStyle
+import androidx.compose.ui.text.TextStyle
import androidx.ui.unit.Dp
import androidx.ui.unit.dp
import androidx.ui.unit.height
diff --git a/ui/ui-material/src/androidTest/java/androidx/ui/material/textfield/FilledTextFieldTest.kt b/ui/ui-material/src/androidTest/java/androidx/ui/material/textfield/FilledTextFieldTest.kt
index 53d24f6..2d4f047 100644
--- a/ui/ui-material/src/androidTest/java/androidx/ui/material/textfield/FilledTextFieldTest.kt
+++ b/ui/ui-material/src/androidTest/java/androidx/ui/material/textfield/FilledTextFieldTest.kt
@@ -36,11 +36,11 @@
import androidx.ui.graphics.Color
import androidx.ui.graphics.RectangleShape
import androidx.ui.graphics.compositeOver
-import androidx.ui.input.ImeAction
-import androidx.ui.input.KeyboardType
-import androidx.ui.input.PasswordVisualTransformation
-import androidx.ui.input.TextFieldValue
-import androidx.ui.input.TextInputService
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.text.input.PasswordVisualTransformation
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.text.input.TextInputService
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Stack
import androidx.compose.foundation.layout.height
@@ -63,7 +63,7 @@
import androidx.ui.test.performImeAction
import androidx.ui.test.waitForIdle
import androidx.compose.foundation.text.FirstBaseline
-import androidx.ui.text.SoftwareKeyboardController
+import androidx.compose.ui.text.SoftwareKeyboardController
import androidx.ui.unit.IntSize
import androidx.ui.unit.dp
import androidx.ui.unit.sp
diff --git a/ui/ui-material/src/androidTest/java/androidx/ui/material/textfield/OutlinedTextFieldTest.kt b/ui/ui-material/src/androidTest/java/androidx/ui/material/textfield/OutlinedTextFieldTest.kt
index f367ca5..4c79754 100644
--- a/ui/ui-material/src/androidTest/java/androidx/ui/material/textfield/OutlinedTextFieldTest.kt
+++ b/ui/ui-material/src/androidTest/java/androidx/ui/material/textfield/OutlinedTextFieldTest.kt
@@ -35,11 +35,11 @@
import androidx.ui.geometry.Offset
import androidx.ui.graphics.Color
import androidx.ui.graphics.RectangleShape
-import androidx.ui.input.ImeAction
-import androidx.ui.input.KeyboardType
-import androidx.ui.input.PasswordVisualTransformation
-import androidx.ui.input.TextFieldValue
-import androidx.ui.input.TextInputService
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.text.input.PasswordVisualTransformation
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.text.input.TextInputService
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.preferredSize
import androidx.compose.foundation.layout.preferredWidth
@@ -57,7 +57,7 @@
import androidx.ui.test.click
import androidx.ui.test.performImeAction
import androidx.ui.test.waitForIdle
-import androidx.ui.text.SoftwareKeyboardController
+import androidx.compose.ui.text.SoftwareKeyboardController
import androidx.ui.unit.IntSize
import androidx.ui.unit.dp
import com.google.common.truth.Truth.assertThat
diff --git a/ui/ui-material/src/androidTest/java/androidx/ui/material/textfield/TextFieldTest.kt b/ui/ui-material/src/androidTest/java/androidx/ui/material/textfield/TextFieldTest.kt
index ebe9a71..fce5dff 100644
--- a/ui/ui-material/src/androidTest/java/androidx/ui/material/textfield/TextFieldTest.kt
+++ b/ui/ui-material/src/androidTest/java/androidx/ui/material/textfield/TextFieldTest.kt
@@ -26,7 +26,7 @@
import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.background
import androidx.ui.graphics.Color
-import androidx.ui.input.TextFieldValue
+import androidx.compose.ui.text.input.TextFieldValue
import androidx.compose.foundation.layout.Stack
import androidx.compose.foundation.layout.preferredSize
import androidx.ui.material.TextFieldScroller
diff --git a/ui/ui-material/src/main/java/androidx/ui/material/BottomNavigation.kt b/ui/ui-material/src/main/java/androidx/ui/material/BottomNavigation.kt
index 5f0444b..c83aa35 100644
--- a/ui/ui-material/src/main/java/androidx/ui/material/BottomNavigation.kt
+++ b/ui/ui-material/src/main/java/androidx/ui/material/BottomNavigation.kt
@@ -46,7 +46,7 @@
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.preferredHeight
import androidx.compose.foundation.text.LastBaseline
-import androidx.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextAlign
import androidx.ui.unit.Dp
import androidx.ui.unit.dp
import kotlin.math.max
diff --git a/ui/ui-material/src/main/java/androidx/ui/material/ListItem.kt b/ui/ui-material/src/main/java/androidx/ui/material/ListItem.kt
index 0e9765a..13e0125 100644
--- a/ui/ui-material/src/main/java/androidx/ui/material/ListItem.kt
+++ b/ui/ui-material/src/main/java/androidx/ui/material/ListItem.kt
@@ -37,8 +37,8 @@
import androidx.ui.material.ripple.RippleIndication
import androidx.compose.foundation.text.FirstBaseline
import androidx.compose.foundation.text.LastBaseline
-import androidx.ui.text.TextStyle
-import androidx.ui.text.style.TextOverflow
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.style.TextOverflow
import androidx.ui.unit.Dp
import androidx.ui.unit.IntSize
import androidx.ui.unit.dp
diff --git a/ui/ui-material/src/main/java/androidx/ui/material/OutlinedTextField.kt b/ui/ui-material/src/main/java/androidx/ui/material/OutlinedTextField.kt
index 050e4ac..1234f13 100644
--- a/ui/ui-material/src/main/java/androidx/ui/material/OutlinedTextField.kt
+++ b/ui/ui-material/src/main/java/androidx/ui/material/OutlinedTextField.kt
@@ -46,15 +46,15 @@
import androidx.ui.graphics.Path
import androidx.ui.graphics.RectangleShape
import androidx.ui.graphics.drawscope.Stroke
-import androidx.ui.input.ImeAction
-import androidx.ui.input.KeyboardType
-import androidx.ui.input.TextFieldValue
-import androidx.ui.input.VisualTransformation
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.text.input.VisualTransformation
import androidx.compose.foundation.layout.padding
-import androidx.ui.text.InternalTextApi
-import androidx.ui.text.SoftwareKeyboardController
-import androidx.ui.text.TextStyle
-import androidx.ui.text.constrain
+import androidx.compose.ui.text.InternalTextApi
+import androidx.compose.ui.text.SoftwareKeyboardController
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.constrain
import androidx.ui.unit.Dp
import androidx.ui.unit.dp
import kotlin.math.max
@@ -89,7 +89,7 @@
* @param isErrorValue indicates if the text field's current value is in error. If set to true, the
* label, bottom indicator and trailing icon will be displayed in [errorColor] color
* @param visualTransformation transforms the visual representation of the input [value].
- * For example, you can use [androidx.ui.input.PasswordVisualTransformation] to create a password
+ * For example, you can use [androidx.compose.ui.text.input.PasswordVisualTransformation] to create a password
* text field. By default no visual transformation is applied
* @param keyboardType the keyboard type to be used with the text field.
* Note that the input type is not guaranteed. For example, an IME may send a non-ASCII character
@@ -205,7 +205,7 @@
* @param isErrorValue indicates if the text field's current value is in error state. If set to
* true, the label, bottom indicator and trailing icon will be displayed in [errorColor] color
* @param visualTransformation transforms the visual representation of the input [value].
- * For example, you can use [androidx.ui.input.PasswordVisualTransformation] to create a password
+ * For example, you can use [androidx.compose.ui.text.input.PasswordVisualTransformation] to create a password
* text field. By default no visual transformation is applied
* @param keyboardType the keyboard type to be used with the text field.
* Note that the input type is not guaranteed. For example, an IME may send a non-ASCII character
diff --git a/ui/ui-material/src/main/java/androidx/ui/material/RadioButton.kt b/ui/ui-material/src/main/java/androidx/ui/material/RadioButton.kt
index a5caff4..7969a0f 100644
--- a/ui/ui-material/src/main/java/androidx/ui/material/RadioButton.kt
+++ b/ui/ui-material/src/main/java/androidx/ui/material/RadioButton.kt
@@ -41,7 +41,7 @@
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.wrapContentSize
import androidx.ui.material.ripple.RippleIndication
-import androidx.ui.text.TextStyle
+import androidx.compose.ui.text.TextStyle
import androidx.ui.unit.Dp
import androidx.ui.unit.dp
diff --git a/ui/ui-material/src/main/java/androidx/ui/material/Surface.kt b/ui/ui-material/src/main/java/androidx/ui/material/Surface.kt
index c09b7a1..30dbfca 100644
--- a/ui/ui-material/src/main/java/androidx/ui/material/Surface.kt
+++ b/ui/ui-material/src/main/java/androidx/ui/material/Surface.kt
@@ -34,7 +34,7 @@
import androidx.ui.graphics.RectangleShape
import androidx.ui.graphics.Shape
import androidx.ui.graphics.compositeOver
-import androidx.ui.text.TextStyle
+import androidx.compose.ui.text.TextStyle
import androidx.ui.unit.Dp
import androidx.ui.unit.dp
import kotlin.math.ln
diff --git a/ui/ui-material/src/main/java/androidx/ui/material/Tab.kt b/ui/ui-material/src/main/java/androidx/ui/material/Tab.kt
index d165bac..bee5d43 100644
--- a/ui/ui-material/src/main/java/androidx/ui/material/Tab.kt
+++ b/ui/ui-material/src/main/java/androidx/ui/material/Tab.kt
@@ -62,7 +62,7 @@
import androidx.ui.material.TabRow.TabPosition
import androidx.compose.foundation.text.FirstBaseline
import androidx.compose.foundation.text.LastBaseline
-import androidx.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextAlign
import androidx.ui.unit.Density
import androidx.ui.unit.Dp
import androidx.ui.unit.dp
diff --git a/ui/ui-material/src/main/java/androidx/ui/material/TextField.kt b/ui/ui-material/src/main/java/androidx/ui/material/TextField.kt
index de79d74..35fecec 100644
--- a/ui/ui-material/src/main/java/androidx/ui/material/TextField.kt
+++ b/ui/ui-material/src/main/java/androidx/ui/material/TextField.kt
@@ -37,16 +37,16 @@
import androidx.ui.geometry.Offset
import androidx.ui.graphics.Color
import androidx.ui.graphics.Shape
-import androidx.ui.input.ImeAction
-import androidx.ui.input.KeyboardType
-import androidx.ui.input.TextFieldValue
-import androidx.ui.input.VisualTransformation
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.text.input.VisualTransformation
import androidx.compose.foundation.layout.padding
-import androidx.ui.text.InternalTextApi
+import androidx.compose.ui.text.InternalTextApi
import androidx.compose.foundation.text.LastBaseline
-import androidx.ui.text.SoftwareKeyboardController
-import androidx.ui.text.TextStyle
-import androidx.ui.text.constrain
+import androidx.compose.ui.text.SoftwareKeyboardController
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.constrain
import androidx.ui.unit.Dp
import androidx.ui.unit.IntSize
import androidx.ui.unit.dp
@@ -108,7 +108,7 @@
* @param isErrorValue indicates if the text field's current value is in error. If set to true, the
* label, bottom indicator and trailing icon will be displayed in [errorColor] color
* @param visualTransformation transforms the visual representation of the input [value].
- * For example, you can use [androidx.ui.input.PasswordVisualTransformation] to create a password
+ * For example, you can use [androidx.compose.ui.text.input.PasswordVisualTransformation] to create a password
* text field. By default no visual transformation is applied
* @param keyboardType the keyboard type to be used with the text field.
* Note that the input type is not guaranteed. For example, an IME may send a non-ASCII character
@@ -253,7 +253,7 @@
* @param isErrorValue indicates if the text field's current value is in error. If set to true, the
* label, bottom indicator and trailing icon will be displayed in [errorColor] color
* @param visualTransformation transforms the visual representation of the input [value].
- * For example, you can use [androidx.ui.input.PasswordVisualTransformation] to create a password
+ * For example, you can use [androidx.compose.ui.text.input.PasswordVisualTransformation] to create a password
* text field. By default no visual transformation is applied
* @param keyboardType the keyboard type to be used with the text field.
* Note that the input type is not guaranteed. For example, an IME may send a non-ASCII character
@@ -387,7 +387,7 @@
* @param isErrorValue indicates if the text field's current value is in error state. If set to
* true, the label, bottom indicator and trailing icon will be displayed in [errorColor] color
* @param visualTransformation transforms the visual representation of the input [value].
- * For example, you can use [androidx.ui.input.PasswordVisualTransformation] to create a password
+ * For example, you can use [androidx.compose.ui.text.input.PasswordVisualTransformation] to create a password
* text field. By default no visual transformation is applied
* @param keyboardType the keyboard type to be used with the text field.
* Note that the input type is not guaranteed. For example, an IME may send a non-ASCII character
@@ -494,7 +494,7 @@
* @param isErrorValue indicates if the text field's current value is in error. If set to true, the
* label, bottom indicator and trailing icon will be displayed in [errorColor] color
* @param visualTransformation transforms the visual representation of the input [value].
- * For example, you can use [androidx.ui.input.PasswordVisualTransformation] to create a password
+ * For example, you can use [androidx.compose.ui.text.input.PasswordVisualTransformation] to create a password
* text field. By default no visual transformation is applied
* @param keyboardType the keyboard type to be used with the text field.
* Note that the input type is not guaranteed. For example, an IME may send a non-ASCII character
diff --git a/ui/ui-material/src/main/java/androidx/ui/material/TextFieldImpl.kt b/ui/ui-material/src/main/java/androidx/ui/material/TextFieldImpl.kt
index e33db4a..bcbc048 100644
--- a/ui/ui-material/src/main/java/androidx/ui/material/TextFieldImpl.kt
+++ b/ui/ui-material/src/main/java/androidx/ui/material/TextFieldImpl.kt
@@ -61,18 +61,18 @@
import androidx.compose.foundation.gestures.scrollable
import androidx.ui.graphics.Color
import androidx.ui.graphics.Shape
-import androidx.ui.input.ImeAction
-import androidx.ui.input.KeyboardType
-import androidx.ui.input.TextFieldValue
-import androidx.ui.input.VisualTransformation
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.text.input.VisualTransformation
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.preferredSizeIn
import androidx.ui.material.ripple.RippleIndication
import androidx.compose.runtime.savedinstancestate.Saver
import androidx.compose.runtime.savedinstancestate.rememberSavedInstanceState
-import androidx.ui.text.SoftwareKeyboardController
-import androidx.ui.text.TextStyle
-import androidx.ui.text.lerp
+import androidx.compose.ui.text.SoftwareKeyboardController
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.lerp
import androidx.ui.unit.Dp
import androidx.ui.unit.dp
import kotlin.math.min
diff --git a/ui/ui-material/src/main/java/androidx/ui/material/Typography.kt b/ui/ui-material/src/main/java/androidx/ui/material/Typography.kt
index 8eb265e..35bcec7 100644
--- a/ui/ui-material/src/main/java/androidx/ui/material/Typography.kt
+++ b/ui/ui-material/src/main/java/androidx/ui/material/Typography.kt
@@ -18,9 +18,9 @@
import androidx.compose.Immutable
import androidx.compose.staticAmbientOf
-import androidx.ui.text.TextStyle
-import androidx.ui.text.font.FontFamily
-import androidx.ui.text.font.FontWeight
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontWeight
import androidx.ui.unit.sp
/**
diff --git a/ui/ui-test-font/src/main/AndroidManifest.xml b/ui/ui-test-font/src/main/AndroidManifest.xml
index f6cc38b..2751a04 100644
--- a/ui/ui-test-font/src/main/AndroidManifest.xml
+++ b/ui/ui-test-font/src/main/AndroidManifest.xml
@@ -14,5 +14,5 @@
limitations under the License.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.ui.text.font.test">
+ package="androidx.compose.ui.text.font.test">
</manifest>
diff --git a/ui/ui-test/api/0.1.0-dev16.txt b/ui/ui-test/api/0.1.0-dev16.txt
index fff9759..a15cfb7 100644
--- a/ui/ui-test/api/0.1.0-dev16.txt
+++ b/ui/ui-test/api/0.1.0-dev16.txt
@@ -171,7 +171,7 @@
method public static androidx.ui.test.SemanticsMatcher hasAnyDescendant(androidx.ui.test.SemanticsMatcher matcher);
method public static androidx.ui.test.SemanticsMatcher hasAnySibling(androidx.ui.test.SemanticsMatcher matcher);
method public static androidx.ui.test.SemanticsMatcher hasClickAction();
- method public static androidx.ui.test.SemanticsMatcher hasImeAction(androidx.ui.input.ImeAction actionType);
+ method public static androidx.ui.test.SemanticsMatcher hasImeAction(androidx.compose.ui.text.input.ImeAction actionType);
method public static androidx.ui.test.SemanticsMatcher hasInputMethodsSupport();
method public static androidx.ui.test.SemanticsMatcher hasLabel(String label, boolean ignoreCase = false);
method public static androidx.ui.test.SemanticsMatcher hasNoClickAction();
diff --git a/ui/ui-test/api/current.txt b/ui/ui-test/api/current.txt
index fff9759..a15cfb7 100644
--- a/ui/ui-test/api/current.txt
+++ b/ui/ui-test/api/current.txt
@@ -171,7 +171,7 @@
method public static androidx.ui.test.SemanticsMatcher hasAnyDescendant(androidx.ui.test.SemanticsMatcher matcher);
method public static androidx.ui.test.SemanticsMatcher hasAnySibling(androidx.ui.test.SemanticsMatcher matcher);
method public static androidx.ui.test.SemanticsMatcher hasClickAction();
- method public static androidx.ui.test.SemanticsMatcher hasImeAction(androidx.ui.input.ImeAction actionType);
+ method public static androidx.ui.test.SemanticsMatcher hasImeAction(androidx.compose.ui.text.input.ImeAction actionType);
method public static androidx.ui.test.SemanticsMatcher hasInputMethodsSupport();
method public static androidx.ui.test.SemanticsMatcher hasLabel(String label, boolean ignoreCase = false);
method public static androidx.ui.test.SemanticsMatcher hasNoClickAction();
diff --git a/ui/ui-test/api/public_plus_experimental_0.1.0-dev16.txt b/ui/ui-test/api/public_plus_experimental_0.1.0-dev16.txt
index fff9759..a15cfb7 100644
--- a/ui/ui-test/api/public_plus_experimental_0.1.0-dev16.txt
+++ b/ui/ui-test/api/public_plus_experimental_0.1.0-dev16.txt
@@ -171,7 +171,7 @@
method public static androidx.ui.test.SemanticsMatcher hasAnyDescendant(androidx.ui.test.SemanticsMatcher matcher);
method public static androidx.ui.test.SemanticsMatcher hasAnySibling(androidx.ui.test.SemanticsMatcher matcher);
method public static androidx.ui.test.SemanticsMatcher hasClickAction();
- method public static androidx.ui.test.SemanticsMatcher hasImeAction(androidx.ui.input.ImeAction actionType);
+ method public static androidx.ui.test.SemanticsMatcher hasImeAction(androidx.compose.ui.text.input.ImeAction actionType);
method public static androidx.ui.test.SemanticsMatcher hasInputMethodsSupport();
method public static androidx.ui.test.SemanticsMatcher hasLabel(String label, boolean ignoreCase = false);
method public static androidx.ui.test.SemanticsMatcher hasNoClickAction();
diff --git a/ui/ui-test/api/public_plus_experimental_current.txt b/ui/ui-test/api/public_plus_experimental_current.txt
index fff9759..a15cfb7 100644
--- a/ui/ui-test/api/public_plus_experimental_current.txt
+++ b/ui/ui-test/api/public_plus_experimental_current.txt
@@ -171,7 +171,7 @@
method public static androidx.ui.test.SemanticsMatcher hasAnyDescendant(androidx.ui.test.SemanticsMatcher matcher);
method public static androidx.ui.test.SemanticsMatcher hasAnySibling(androidx.ui.test.SemanticsMatcher matcher);
method public static androidx.ui.test.SemanticsMatcher hasClickAction();
- method public static androidx.ui.test.SemanticsMatcher hasImeAction(androidx.ui.input.ImeAction actionType);
+ method public static androidx.ui.test.SemanticsMatcher hasImeAction(androidx.compose.ui.text.input.ImeAction actionType);
method public static androidx.ui.test.SemanticsMatcher hasInputMethodsSupport();
method public static androidx.ui.test.SemanticsMatcher hasLabel(String label, boolean ignoreCase = false);
method public static androidx.ui.test.SemanticsMatcher hasNoClickAction();
diff --git a/ui/ui-test/api/restricted_0.1.0-dev16.txt b/ui/ui-test/api/restricted_0.1.0-dev16.txt
index fff9759..a15cfb7 100644
--- a/ui/ui-test/api/restricted_0.1.0-dev16.txt
+++ b/ui/ui-test/api/restricted_0.1.0-dev16.txt
@@ -171,7 +171,7 @@
method public static androidx.ui.test.SemanticsMatcher hasAnyDescendant(androidx.ui.test.SemanticsMatcher matcher);
method public static androidx.ui.test.SemanticsMatcher hasAnySibling(androidx.ui.test.SemanticsMatcher matcher);
method public static androidx.ui.test.SemanticsMatcher hasClickAction();
- method public static androidx.ui.test.SemanticsMatcher hasImeAction(androidx.ui.input.ImeAction actionType);
+ method public static androidx.ui.test.SemanticsMatcher hasImeAction(androidx.compose.ui.text.input.ImeAction actionType);
method public static androidx.ui.test.SemanticsMatcher hasInputMethodsSupport();
method public static androidx.ui.test.SemanticsMatcher hasLabel(String label, boolean ignoreCase = false);
method public static androidx.ui.test.SemanticsMatcher hasNoClickAction();
diff --git a/ui/ui-test/api/restricted_current.txt b/ui/ui-test/api/restricted_current.txt
index fff9759..a15cfb7 100644
--- a/ui/ui-test/api/restricted_current.txt
+++ b/ui/ui-test/api/restricted_current.txt
@@ -171,7 +171,7 @@
method public static androidx.ui.test.SemanticsMatcher hasAnyDescendant(androidx.ui.test.SemanticsMatcher matcher);
method public static androidx.ui.test.SemanticsMatcher hasAnySibling(androidx.ui.test.SemanticsMatcher matcher);
method public static androidx.ui.test.SemanticsMatcher hasClickAction();
- method public static androidx.ui.test.SemanticsMatcher hasImeAction(androidx.ui.input.ImeAction actionType);
+ method public static androidx.ui.test.SemanticsMatcher hasImeAction(androidx.compose.ui.text.input.ImeAction actionType);
method public static androidx.ui.test.SemanticsMatcher hasInputMethodsSupport();
method public static androidx.ui.test.SemanticsMatcher hasLabel(String label, boolean ignoreCase = false);
method public static androidx.ui.test.SemanticsMatcher hasNoClickAction();
diff --git a/ui/ui-test/src/androidTest/java/androidx/ui/test/ErrorMessagesTest.kt b/ui/ui-test/src/androidTest/java/androidx/ui/test/ErrorMessagesTest.kt
index 0dd5872..9cc3efb 100644
--- a/ui/ui-test/src/androidTest/java/androidx/ui/test/ErrorMessagesTest.kt
+++ b/ui/ui-test/src/androidTest/java/androidx/ui/test/ErrorMessagesTest.kt
@@ -55,7 +55,8 @@
"Disabled = 'kotlin.Unit'\n" +
"Text = 'Toggle'\n" +
"GetTextLayoutResult = 'AccessibilityAction(label=null, action=Function1<" +
- "java.util.List<androidx.ui.text.TextLayoutResult>, java.lang.Boolean>)'\n" +
+ "java.util.List<androidx.compose.ui.text.TextLayoutResult>, " +
+ "java.lang.Boolean>)'\n" +
"MergeDescendants = 'true'\n" +
"Has 1 sibling\n" +
"Selector used: (TestTag = 'MyButton')"
@@ -232,7 +233,8 @@
"Node #X at (X, X, X, X)px\n" +
"Text = 'Hello'\n" +
"GetTextLayoutResult = 'AccessibilityAction(label=null, action=Function1<" +
- "java.util.List<androidx.ui.text.TextLayoutResult>, java.lang.Boolean>)'\n" +
+ "java.util.List<androidx.compose.ui.text.TextLayoutResult>," +
+ " java.lang.Boolean>)'\n" +
"Has 1 sibling\n" +
"Original selector: Text = 'Hello' (ignoreCase: false)"
) {
@@ -259,7 +261,8 @@
"Node #X at (X, X, X, X)px\n" +
"Text = 'Hello'\n" +
"GetTextLayoutResult = 'AccessibilityAction(label=null, action=Function1<" +
- "java.util.List<androidx.ui.text.TextLayoutResult>, java.lang.Boolean>)'\n" +
+ "java.util.List<androidx.compose.ui.text.TextLayoutResult>," +
+ " java.lang.Boolean>)'\n" +
"Has 1 sibling\n" +
"Original selector: Text = 'Hello' (ignoreCase: false)"
) {
@@ -286,7 +289,8 @@
"Node #X at (X, X, X, X)px\n" +
"Text = 'Hello'\n" +
"GetTextLayoutResult = 'AccessibilityAction(label=null, action=Function1<" +
- "java.util.List<androidx.ui.text.TextLayoutResult>, java.lang.Boolean>)'\n" +
+ "java.util.List<androidx.compose.ui.text.TextLayoutResult>," +
+ " java.lang.Boolean>)'\n" +
"Has 1 sibling\n" +
"Original selector: Text = 'Hello' (ignoreCase: false)"
) {
diff --git a/ui/ui-test/src/androidTest/java/androidx/ui/test/FindersTest.kt b/ui/ui-test/src/androidTest/java/androidx/ui/test/FindersTest.kt
index 7148d8d..2b07a5b 100644
--- a/ui/ui-test/src/androidTest/java/androidx/ui/test/FindersTest.kt
+++ b/ui/ui-test/src/androidTest/java/androidx/ui/test/FindersTest.kt
@@ -26,7 +26,7 @@
import androidx.ui.semantics.testTag
import androidx.ui.semantics.text
import androidx.ui.test.util.expectError
-import androidx.ui.text.AnnotatedString
+import androidx.compose.ui.text.AnnotatedString
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/ui/ui-test/src/androidTest/java/androidx/ui/test/PrintToStringTest.kt b/ui/ui-test/src/androidTest/java/androidx/ui/test/PrintToStringTest.kt
index c625139..eed138f 100644
--- a/ui/ui-test/src/androidTest/java/androidx/ui/test/PrintToStringTest.kt
+++ b/ui/ui-test/src/androidTest/java/androidx/ui/test/PrintToStringTest.kt
@@ -70,7 +70,7 @@
"Node #X at (X, X, X, X)px\n" +
"Text = 'Hello'\n" +
"GetTextLayoutResult = 'AccessibilityAction(label=null, action=Function1<java" +
- ".util.List<androidx.ui.text.TextLayoutResult>, java.lang.Boolean>)'\n" +
+ ".util.List<androidx.compose.ui.text.TextLayoutResult>, java.lang.Boolean>)'\n" +
"Has 1 sibling")
}
@@ -88,12 +88,12 @@
"1) Node #X at (X, X, X, X)px\n" +
"Text = 'Hello'\n" +
"GetTextLayoutResult = 'AccessibilityAction(label=null, action=Function1<java" +
- ".util.List<androidx.ui.text.TextLayoutResult>, java.lang.Boolean>)'\n" +
+ ".util.List<androidx.compose.ui.text.TextLayoutResult>, java.lang.Boolean>)'\n" +
"Has 1 sibling\n" +
"2) Node #X at (X, X, X, X)px\n" +
"Text = 'World'\n" +
"GetTextLayoutResult = 'AccessibilityAction(label=null, action=Function1<java" +
- ".util.List<androidx.ui.text.TextLayoutResult>, java.lang.Boolean>)'\n" +
+ ".util.List<androidx.compose.ui.text.TextLayoutResult>, java.lang.Boolean>)'\n" +
"Has 1 sibling")
}
@@ -124,13 +124,15 @@
"<java.lang.Boolean>)'\n" +
" | Text = 'Button'\n" +
" | GetTextLayoutResult = 'AccessibilityAction(label=null, " +
- "action=Function1<java.util.List<androidx.ui.text.TextLayoutResult>, java.lang" +
+ "action=Function1<java.util.List<androidx.compose.ui.text.TextLayoutResult>," +
+ " java.lang" +
".Boolean>)'\n" +
" | MergeDescendants = 'true'\n" +
" |-Node #X at (X, X, X, X)px\n" +
" Text = 'Hello'\n" +
" GetTextLayoutResult = 'AccessibilityAction(label=null, " +
- "action=Function1<java.util.List<androidx.ui.text.TextLayoutResult>, java.lang" +
+ "action=Function1<java.util.List<androidx.compose.ui.text.TextLayoutResult>," +
+ " java.lang" +
".Boolean>)'")
}
diff --git a/ui/ui-test/src/androidTest/java/androidx/ui/test/TextActionsTest.kt b/ui/ui-test/src/androidTest/java/androidx/ui/test/TextActionsTest.kt
index ed12e7c..cc93855 100644
--- a/ui/ui-test/src/androidTest/java/androidx/ui/test/TextActionsTest.kt
+++ b/ui/ui-test/src/androidTest/java/androidx/ui/test/TextActionsTest.kt
@@ -23,8 +23,8 @@
import androidx.ui.core.testTag
import androidx.compose.foundation.BaseTextField
import androidx.compose.foundation.ExperimentalFoundationApi
-import androidx.ui.input.ImeAction
-import androidx.ui.input.TextFieldValue
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.TextFieldValue
import androidx.ui.test.util.BoundaryNode
import androidx.ui.test.util.expectError
import androidx.ui.test.util.expectErrorMessageStartsWith
diff --git a/ui/ui-test/src/main/java/androidx/ui/test/Filters.kt b/ui/ui-test/src/main/java/androidx/ui/test/Filters.kt
index 3421989..f785b1a 100644
--- a/ui/ui-test/src/main/java/androidx/ui/test/Filters.kt
+++ b/ui/ui-test/src/main/java/androidx/ui/test/Filters.kt
@@ -20,7 +20,7 @@
import androidx.ui.core.semantics.getOrNull
import androidx.compose.foundation.selection.ToggleableState
import androidx.compose.foundation.semantics.FoundationSemanticsProperties
-import androidx.ui.input.ImeAction
+import androidx.compose.ui.text.input.ImeAction
import androidx.ui.semantics.AccessibilityRangeInfo
import androidx.ui.semantics.SemanticsActions
import androidx.ui.semantics.SemanticsProperties
diff --git a/ui/ui-test/src/main/java/androidx/ui/test/Output.kt b/ui/ui-test/src/main/java/androidx/ui/test/Output.kt
index 6778ad5..88be6de 100644
--- a/ui/ui-test/src/main/java/androidx/ui/test/Output.kt
+++ b/ui/ui-test/src/main/java/androidx/ui/test/Output.kt
@@ -21,7 +21,7 @@
import androidx.ui.core.semantics.SemanticsConfiguration
import androidx.ui.core.semantics.SemanticsNode
import androidx.ui.semantics.SemanticsProperties
-import androidx.ui.text.AnnotatedString
+import androidx.compose.ui.text.AnnotatedString
import androidx.ui.unit.PxBounds
import androidx.ui.unit.toSize
diff --git a/ui/ui-test/src/main/java/androidx/ui/test/TextActions.kt b/ui/ui-test/src/main/java/androidx/ui/test/TextActions.kt
index 712b153..14b76c5 100644
--- a/ui/ui-test/src/main/java/androidx/ui/test/TextActions.kt
+++ b/ui/ui-test/src/main/java/androidx/ui/test/TextActions.kt
@@ -18,10 +18,10 @@
import androidx.ui.core.AndroidOwner
import androidx.ui.core.ExperimentalLayoutNodeApi
-import androidx.ui.input.CommitTextEditOp
-import androidx.ui.input.DeleteAllEditOp
-import androidx.ui.input.EditOperation
-import androidx.ui.input.ImeAction
+import androidx.compose.ui.text.input.CommitTextEditOp
+import androidx.compose.ui.text.input.DeleteAllEditOp
+import androidx.compose.ui.text.input.EditOperation
+import androidx.compose.ui.text.input.ImeAction
import androidx.compose.foundation.text.TextSemanticsProperties
/**
diff --git a/ui/ui-test/src/main/java/androidx/ui/test/TextInputServiceForTests.kt b/ui/ui-test/src/main/java/androidx/ui/test/TextInputServiceForTests.kt
index 3f891aa..8cd58f7 100644
--- a/ui/ui-test/src/main/java/androidx/ui/test/TextInputServiceForTests.kt
+++ b/ui/ui-test/src/main/java/androidx/ui/test/TextInputServiceForTests.kt
@@ -16,13 +16,13 @@
package androidx.ui.test
-import androidx.ui.input.EditOperation
-import androidx.ui.input.TextFieldValue
-import androidx.ui.input.ImeAction
-import androidx.ui.input.InputSessionToken
-import androidx.ui.input.KeyboardType
-import androidx.ui.input.PlatformTextInputService
-import androidx.ui.input.TextInputService
+import androidx.compose.ui.text.input.EditOperation
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.InputSessionToken
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.text.input.PlatformTextInputService
+import androidx.compose.ui.text.input.TextInputService
/**
* Extra layer that serves as an observer between the text input service and text fields.
diff --git a/ui/ui-test/src/main/java/androidx/ui/test/android/AndroidComposeTestRule.kt b/ui/ui-test/src/main/java/androidx/ui/test/android/AndroidComposeTestRule.kt
index e30d703..9637d81 100644
--- a/ui/ui-test/src/main/java/androidx/ui/test/android/AndroidComposeTestRule.kt
+++ b/ui/ui-test/src/main/java/androidx/ui/test/android/AndroidComposeTestRule.kt
@@ -27,7 +27,7 @@
import androidx.ui.core.setContent
import androidx.compose.foundation.InternalFoundationApi
import androidx.compose.foundation.blinkingCursorEnabled
-import androidx.ui.input.textInputServiceFactory
+import androidx.compose.ui.text.input.textInputServiceFactory
import androidx.ui.test.AnimationClockTestRule
import androidx.ui.test.ComposeTestCase
import androidx.ui.test.ComposeTestCaseSetup
diff --git a/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/LayoutGetHorizontalTest.kt b/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/LayoutGetHorizontalTest.kt
index 73caa8d..a9e4e03 100644
--- a/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/LayoutGetHorizontalTest.kt
+++ b/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/LayoutGetHorizontalTest.kt
@@ -22,7 +22,7 @@
import androidx.core.content.res.ResourcesCompat
import androidx.test.filters.SmallTest
import androidx.test.platform.app.InstrumentationRegistry
-import androidx.ui.text.font.test.R
+import androidx.compose.ui.text.font.test.R
import com.google.common.truth.Truth.assertThat
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/LayoutIntrinsicsTest.kt b/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/LayoutIntrinsicsTest.kt
index f7f5e3f..b7b427e 100644
--- a/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/LayoutIntrinsicsTest.kt
+++ b/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/LayoutIntrinsicsTest.kt
@@ -24,7 +24,7 @@
import androidx.core.content.res.ResourcesCompat
import androidx.test.filters.SmallTest
import androidx.test.platform.app.InstrumentationRegistry
-import androidx.ui.text.font.test.R
+import androidx.compose.ui.text.font.test.R
import com.google.common.truth.Truth.assertThat
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/SegmentBreakerTest.kt b/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/SegmentBreakerTest.kt
index e122af8..7a3db3e 100644
--- a/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/SegmentBreakerTest.kt
+++ b/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/SegmentBreakerTest.kt
@@ -22,7 +22,7 @@
import androidx.core.content.res.ResourcesCompat
import androidx.test.filters.SmallTest
import androidx.test.platform.app.InstrumentationRegistry
-import androidx.ui.text.font.test.R
+import androidx.compose.ui.text.font.test.R
import androidx.compose.ui.text.android.animation.SegmentBreaker
import androidx.compose.ui.text.android.animation.SegmentType
import com.google.common.truth.Truth.assertThat
diff --git a/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/StaticLayoutFactoryTest.kt b/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/StaticLayoutFactoryTest.kt
index 05f5dda..c772fa9 100644
--- a/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/StaticLayoutFactoryTest.kt
+++ b/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/StaticLayoutFactoryTest.kt
@@ -25,7 +25,7 @@
import androidx.test.filters.SdkSuppress
import androidx.test.filters.SmallTest
import androidx.test.platform.app.InstrumentationRegistry
-import androidx.ui.text.font.test.R
+import androidx.compose.ui.text.font.test.R
import com.google.common.truth.Truth.assertThat
import org.junit.Before
import org.junit.Test
diff --git a/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/TextLayoutSpanTest.kt b/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/TextLayoutSpanTest.kt
index ddba2d9..81bf62b 100644
--- a/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/TextLayoutSpanTest.kt
+++ b/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/TextLayoutSpanTest.kt
@@ -24,7 +24,7 @@
import androidx.core.content.res.ResourcesCompat
import androidx.test.filters.SmallTest
import androidx.test.platform.app.InstrumentationRegistry
-import androidx.ui.text.font.test.R
+import androidx.compose.ui.text.font.test.R
import androidx.compose.ui.text.android.style.BaselineShiftSpan
import androidx.compose.ui.text.android.style.SkewXSpan
import com.google.common.truth.Truth.assertThat
diff --git a/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/TextLayoutTest.kt b/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/TextLayoutTest.kt
index 42b388a..04160f7 100644
--- a/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/TextLayoutTest.kt
+++ b/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/TextLayoutTest.kt
@@ -26,7 +26,7 @@
import androidx.core.content.res.ResourcesCompat
import androidx.test.filters.SmallTest
import androidx.test.platform.app.InstrumentationRegistry
-import androidx.ui.text.font.test.R
+import androidx.compose.ui.text.font.test.R
import androidx.compose.ui.text.android.style.BaselineShiftSpan
import com.google.common.truth.Truth.assertThat
import org.junit.Before
diff --git a/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/animation/SegmentBreakerBreakSegmentTest.kt b/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/animation/SegmentBreakerBreakSegmentTest.kt
index 5b9e3ee..ae13037 100644
--- a/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/animation/SegmentBreakerBreakSegmentTest.kt
+++ b/ui/ui-text-android/src/androidTest/java/androidx/compose/ui/text/android/animation/SegmentBreakerBreakSegmentTest.kt
@@ -22,7 +22,7 @@
import androidx.core.content.res.ResourcesCompat
import androidx.test.filters.SmallTest
import androidx.test.platform.app.InstrumentationRegistry
-import androidx.ui.text.font.test.R
+import androidx.compose.ui.text.font.test.R
import androidx.compose.ui.text.android.InternalPlatformTextApi
import androidx.compose.ui.text.android.LayoutHelper
import androidx.compose.ui.text.android.StaticLayoutFactory
diff --git a/ui/ui-text-core/api/0.1.0-dev16.txt b/ui/ui-text-core/api/0.1.0-dev16.txt
index b5c1f07..f75dd52 100644
--- a/ui/ui-text-core/api/0.1.0-dev16.txt
+++ b/ui/ui-text-core/api/0.1.0-dev16.txt
@@ -1,321 +1,38 @@
// Signature format: 3.0
-package androidx.ui.input {
-
- public final class BackspaceKeyEditOp implements androidx.ui.input.EditOperation {
- ctor public BackspaceKeyEditOp();
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- public final class CommitTextEditOp implements androidx.ui.input.EditOperation {
- ctor public CommitTextEditOp(String text, int newCursorPosition);
- method public String component1();
- method public int component2();
- method public androidx.ui.input.CommitTextEditOp copy(String text, int newCursorPosition);
- method public int getNewCursorPosition();
- method public String getText();
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- public final class DeleteAllEditOp implements androidx.ui.input.EditOperation {
- ctor public DeleteAllEditOp();
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- public final class DeleteSurroundingTextEditOp implements androidx.ui.input.EditOperation {
- ctor public DeleteSurroundingTextEditOp(int beforeLength, int afterLength);
- method public int component1();
- method public int component2();
- method public androidx.ui.input.DeleteSurroundingTextEditOp copy(int beforeLength, int afterLength);
- method public int getAfterLength();
- method public int getBeforeLength();
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- public final class DeleteSurroundingTextInCodePointsEditOp implements androidx.ui.input.EditOperation {
- ctor public DeleteSurroundingTextInCodePointsEditOp(int beforeLength, int afterLength);
- method public int component1();
- method public int component2();
- method public androidx.ui.input.DeleteSurroundingTextInCodePointsEditOp copy(int beforeLength, int afterLength);
- method public int getAfterLength();
- method public int getBeforeLength();
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- public interface EditOperation {
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- public final class EditingBuffer {
- ctor public EditingBuffer(String initialText, androidx.ui.text.TextRange initialSelection);
- field public static final int NOWHERE = -1; // 0xffffffff
- }
-
- @Deprecated @androidx.compose.Immutable public final class EditorValue {
- ctor @Deprecated public EditorValue(String text, androidx.ui.text.TextRange selection, androidx.ui.text.TextRange? composition);
- ctor @Deprecated public EditorValue();
- method @Deprecated public String component1();
- method @Deprecated public androidx.ui.text.TextRange component2();
- method @Deprecated public androidx.ui.text.TextRange? component3();
- method @Deprecated @androidx.compose.Immutable public androidx.ui.input.EditorValue copy(String text, androidx.ui.text.TextRange selection, androidx.ui.text.TextRange? composition);
- method @Deprecated public androidx.ui.text.TextRange? getComposition();
- method @Deprecated public String getSelectedText();
- method @Deprecated public androidx.ui.text.TextRange getSelection();
- method @Deprecated public String getText();
- method @Deprecated public String getTextAfterSelection(int maxChars);
- method @Deprecated public String getTextBeforeSelection(int maxChars);
- }
-
- public final class FinishComposingTextEditOp implements androidx.ui.input.EditOperation {
- ctor public FinishComposingTextEditOp();
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- public final class GapBufferKt {
- }
-
- public enum ImeAction {
- method public static androidx.ui.input.ImeAction valueOf(String name) throws java.lang.IllegalArgumentException;
- method public static androidx.ui.input.ImeAction[] values();
- enum_constant public static final androidx.ui.input.ImeAction Done;
- enum_constant public static final androidx.ui.input.ImeAction Go;
- enum_constant public static final androidx.ui.input.ImeAction Next;
- enum_constant public static final androidx.ui.input.ImeAction NoAction;
- enum_constant public static final androidx.ui.input.ImeAction Previous;
- enum_constant public static final androidx.ui.input.ImeAction Search;
- enum_constant public static final androidx.ui.input.ImeAction Send;
- enum_constant public static final androidx.ui.input.ImeAction Unspecified;
- }
-
- public interface InputEventListener {
- method public void onEditOperations(java.util.List<? extends androidx.ui.input.EditOperation> editOps);
- method public void onImeAction(androidx.ui.input.ImeAction imeAction);
- }
-
- public enum KeyboardType {
- method public static androidx.ui.input.KeyboardType valueOf(String name) throws java.lang.IllegalArgumentException;
- method public static androidx.ui.input.KeyboardType[] values();
- enum_constant public static final androidx.ui.input.KeyboardType Ascii;
- enum_constant public static final androidx.ui.input.KeyboardType Email;
- enum_constant public static final androidx.ui.input.KeyboardType Number;
- enum_constant public static final androidx.ui.input.KeyboardType NumberPassword;
- enum_constant public static final androidx.ui.input.KeyboardType Password;
- enum_constant public static final androidx.ui.input.KeyboardType Phone;
- enum_constant public static final androidx.ui.input.KeyboardType Text;
- enum_constant public static final androidx.ui.input.KeyboardType Uri;
- }
-
- public final class MoveCursorEditOp implements androidx.ui.input.EditOperation {
- ctor public MoveCursorEditOp(int amount);
- method public int component1();
- method public androidx.ui.input.MoveCursorEditOp copy(int amount);
- method public int getAmount();
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- public interface OffsetMap {
- method public int originalToTransformed(int offset);
- method public int transformedToOriginal(int offset);
- field public static final androidx.ui.input.OffsetMap.Companion Companion;
- }
-
- public static final class OffsetMap.Companion {
- method public androidx.ui.input.OffsetMap getIdentityOffsetMap();
- property public final androidx.ui.input.OffsetMap identityOffsetMap;
- }
-
- public final class PasswordVisualTransformation implements androidx.ui.input.VisualTransformation {
- ctor public PasswordVisualTransformation(char mask);
- ctor public PasswordVisualTransformation();
- method public char component1();
- method public androidx.ui.input.PasswordVisualTransformation copy(char mask);
- method public androidx.ui.input.TransformedText filter(androidx.ui.text.AnnotatedString text);
- method public char getMask();
- }
-
- public interface PlatformTextInputService {
- method public void hideSoftwareKeyboard();
- method public void notifyFocusedRect(androidx.ui.geometry.Rect rect);
- method public void onStateUpdated(androidx.ui.input.TextFieldValue value);
- method public void showSoftwareKeyboard();
- method public void startInput(androidx.ui.input.TextFieldValue value, androidx.ui.input.KeyboardType keyboardType, androidx.ui.input.ImeAction imeAction, kotlin.jvm.functions.Function1<? super java.util.List<? extends androidx.ui.input.EditOperation>,kotlin.Unit> onEditCommand, kotlin.jvm.functions.Function1<? super androidx.ui.input.ImeAction,kotlin.Unit> onImeActionPerformed);
- method public void stopInput();
- }
-
- public final class SetComposingRegionEditOp implements androidx.ui.input.EditOperation {
- ctor public SetComposingRegionEditOp(int start, int end);
- method public int component1();
- method public int component2();
- method public androidx.ui.input.SetComposingRegionEditOp copy(int start, int end);
- method public int getEnd();
- method public int getStart();
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- public final class SetComposingTextEditOp implements androidx.ui.input.EditOperation {
- ctor public SetComposingTextEditOp(String text, int newCursorPosition);
- method public String component1();
- method public int component2();
- method public androidx.ui.input.SetComposingTextEditOp copy(String text, int newCursorPosition);
- method public int getNewCursorPosition();
- method public String getText();
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- public final class SetSelectionEditOp implements androidx.ui.input.EditOperation {
- ctor public SetSelectionEditOp(int start, int end);
- method public int component1();
- method public int component2();
- method public androidx.ui.input.SetSelectionEditOp copy(int start, int end);
- method public int getEnd();
- method public int getStart();
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- @androidx.compose.Immutable public final class TextFieldValue {
- ctor public TextFieldValue(String text, androidx.ui.text.TextRange selection, androidx.ui.text.TextRange? composition);
- ctor public TextFieldValue();
- method public String component1();
- method public androidx.ui.text.TextRange component2();
- method public androidx.ui.text.TextRange? component3();
- method @androidx.compose.Immutable public androidx.ui.input.TextFieldValue copy(String text, androidx.ui.text.TextRange selection, androidx.ui.text.TextRange? composition);
- method public androidx.ui.text.TextRange? getComposition();
- method public androidx.ui.text.TextRange getSelection();
- method public String getText();
- field public static final androidx.ui.input.TextFieldValue.Companion Companion;
- }
-
- public static final class TextFieldValue.Companion {
- method public androidx.compose.runtime.savedinstancestate.Saver<androidx.ui.input.TextFieldValue,java.lang.Object> getSaver();
- property public final androidx.compose.runtime.savedinstancestate.Saver<androidx.ui.input.TextFieldValue,java.lang.Object> Saver;
- }
-
- public final class TextFieldValueKt {
- method public static String getSelectedText(androidx.ui.input.TextFieldValue);
- method public static String getTextAfterSelection(androidx.ui.input.TextFieldValue, int maxChars);
- method public static String getTextBeforeSelection(androidx.ui.input.TextFieldValue, int maxChars);
- }
-
- public class TextInputService {
- ctor public TextInputService(androidx.ui.input.PlatformTextInputService platformTextInputService);
- method public void hideSoftwareKeyboard(int token);
- method public void notifyFocusedRect(int token, androidx.ui.geometry.Rect rect);
- method public void onStateUpdated(int token, androidx.ui.input.TextFieldValue value);
- method public void showSoftwareKeyboard(int token);
- method public int startInput(androidx.ui.input.TextFieldValue value, androidx.ui.input.KeyboardType keyboardType, androidx.ui.input.ImeAction imeAction, kotlin.jvm.functions.Function1<? super java.util.List<? extends androidx.ui.input.EditOperation>,kotlin.Unit> onEditCommand, kotlin.jvm.functions.Function1<? super androidx.ui.input.ImeAction,kotlin.Unit> onImeActionPerformed);
- method public void stopInput(int token);
- }
-
- public final class TextInputServiceKt {
- method @Deprecated public static kotlin.jvm.functions.Function1<androidx.ui.input.PlatformTextInputService,androidx.ui.input.TextInputService> getTextInputServiceFactory();
- method @Deprecated public static void setTextInputServiceFactory(kotlin.jvm.functions.Function1<? super androidx.ui.input.PlatformTextInputService,? extends androidx.ui.input.TextInputService> p);
- field public static final int INVALID_SESSION = -1; // 0xffffffff
- field public static final int NO_SESSION = 0; // 0x0
- }
-
- public final class TransformedText {
- ctor public TransformedText(androidx.ui.text.AnnotatedString transformedText, androidx.ui.input.OffsetMap offsetMap);
- method public androidx.ui.text.AnnotatedString component1();
- method public androidx.ui.input.OffsetMap component2();
- method public androidx.ui.input.TransformedText copy(androidx.ui.text.AnnotatedString transformedText, androidx.ui.input.OffsetMap offsetMap);
- method public androidx.ui.input.OffsetMap getOffsetMap();
- method public androidx.ui.text.AnnotatedString getTransformedText();
- }
-
- @androidx.compose.Immutable public interface VisualTransformation {
- method public androidx.ui.input.TransformedText filter(androidx.ui.text.AnnotatedString text);
- field public static final androidx.ui.input.VisualTransformation.Companion Companion;
- }
-
- public static final class VisualTransformation.Companion {
- method public androidx.ui.input.VisualTransformation getNone();
- property public final androidx.ui.input.VisualTransformation None;
- }
-
-}
-
-package androidx.ui.intl {
-
- public final class AndroidPlatformLocaleKt {
- }
-
- @androidx.compose.Immutable public final class Locale {
- ctor public Locale(String languageTag);
- method public String getLanguage();
- method public String getRegion();
- method public String getScript();
- method public String toLanguageTag();
- property public final String language;
- property public final String region;
- property public final String script;
- field public static final androidx.ui.intl.Locale.Companion Companion;
- }
-
- public static final class Locale.Companion {
- method public androidx.ui.intl.Locale getCurrent();
- property public final androidx.ui.intl.Locale current;
- }
-
- @androidx.compose.Immutable public final class LocaleList implements java.util.Collection<androidx.ui.intl.Locale> kotlin.jvm.internal.markers.KMappedMarker {
- ctor public LocaleList(java.util.List<androidx.ui.intl.Locale> localeList);
- ctor public LocaleList(String languageTags);
- ctor public LocaleList(androidx.ui.intl.Locale... locales);
- method public java.util.List<androidx.ui.intl.Locale> component1();
- method public operator boolean contains(androidx.ui.intl.Locale element);
- method public boolean containsAll(java.util.Collection<?> elements);
- method @androidx.compose.Immutable public androidx.ui.intl.LocaleList copy(java.util.List<androidx.ui.intl.Locale> localeList);
- method public operator androidx.ui.intl.Locale get(int i);
- method public java.util.List<androidx.ui.intl.Locale> getLocaleList();
- method public int getSize();
- method public boolean isEmpty();
- method public java.util.Iterator<androidx.ui.intl.Locale> iterator();
- property public int size;
- field public static final androidx.ui.intl.LocaleList.Companion Companion;
- }
-
- public static final class LocaleList.Companion {
- method public androidx.ui.intl.LocaleList getCurrent();
- property public final androidx.ui.intl.LocaleList current;
- }
-
- public final class PlatformLocaleKt {
- }
-
-}
-
-package androidx.ui.text {
+package androidx.compose.ui.text {
@androidx.compose.Immutable public final class AnnotatedString {
- ctor public AnnotatedString(String text, java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.SpanStyle>> spanStyles, java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.ParagraphStyle>> paragraphStyles);
+ ctor public AnnotatedString(String text, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> spanStyles, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.ParagraphStyle>> paragraphStyles);
method public String component1();
- method public java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.SpanStyle>> component2();
- method public java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.ParagraphStyle>> component3();
- method @androidx.compose.Immutable public androidx.ui.text.AnnotatedString copy(String text, java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.SpanStyle>> spanStyles, java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.ParagraphStyle>> paragraphStyles, java.util.List<androidx.ui.text.AnnotatedString.Range<java.lang.String>> annotations);
- method public java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.ParagraphStyle>> getParagraphStyles();
- method public java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.SpanStyle>> getSpanStyles();
- method public java.util.List<androidx.ui.text.AnnotatedString.Range<java.lang.String>> getStringAnnotations(String tag, int start, int end);
- method public java.util.List<androidx.ui.text.AnnotatedString.Range<java.lang.String>> getStringAnnotations(int start, int end);
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> component2();
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.ParagraphStyle>> component3();
+ method @androidx.compose.Immutable public androidx.compose.ui.text.AnnotatedString copy(String text, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> spanStyles, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.ParagraphStyle>> paragraphStyles, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<java.lang.String>> annotations);
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.ParagraphStyle>> getParagraphStyles();
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> getSpanStyles();
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<java.lang.String>> getStringAnnotations(String tag, int start, int end);
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<java.lang.String>> getStringAnnotations(int start, int end);
method public String getText();
- method @androidx.compose.Stable public operator androidx.ui.text.AnnotatedString plus(androidx.ui.text.AnnotatedString other);
+ method @androidx.compose.Stable public operator androidx.compose.ui.text.AnnotatedString plus(androidx.compose.ui.text.AnnotatedString other);
}
public static final class AnnotatedString.Builder {
ctor public AnnotatedString.Builder(int capacity);
ctor public AnnotatedString.Builder();
ctor public AnnotatedString.Builder(String text);
- ctor public AnnotatedString.Builder(androidx.ui.text.AnnotatedString text);
+ ctor public AnnotatedString.Builder(androidx.compose.ui.text.AnnotatedString text);
method public void addStringAnnotation(String scope, String annotation, int start, int end);
- method public void addStyle(androidx.ui.text.SpanStyle style, int start, int end);
- method public void addStyle(androidx.ui.text.ParagraphStyle style, int start, int end);
+ method public void addStyle(androidx.compose.ui.text.SpanStyle style, int start, int end);
+ method public void addStyle(androidx.compose.ui.text.ParagraphStyle style, int start, int end);
method public void append(String text);
method public void append(char p);
- method public void append(androidx.ui.text.AnnotatedString text);
+ method public void append(androidx.compose.ui.text.AnnotatedString text);
method public int getLength();
method public void pop();
method public void pop(int index);
method public int pushStringAnnotation(String tag, String annotation);
- method public int pushStyle(androidx.ui.text.SpanStyle style);
- method public int pushStyle(androidx.ui.text.ParagraphStyle style);
- method public androidx.ui.text.AnnotatedString toAnnotatedString();
+ method public int pushStyle(androidx.compose.ui.text.SpanStyle style);
+ method public int pushStyle(androidx.compose.ui.text.ParagraphStyle style);
+ method public androidx.compose.ui.text.AnnotatedString toAnnotatedString();
property public final int length;
}
@@ -326,7 +43,7 @@
method public int component2();
method public int component3();
method public String component4();
- method public androidx.ui.text.AnnotatedString.Range<T> copy(T! item, int start, int end, String tag);
+ method public androidx.compose.ui.text.AnnotatedString.Range<T> copy(T! item, int start, int end, String tag);
method public int getEnd();
method public T! getItem();
method public int getStart();
@@ -334,18 +51,18 @@
}
public final class AnnotatedStringKt {
- method public static androidx.ui.text.AnnotatedString AnnotatedString(String text, androidx.ui.text.SpanStyle spanStyle, androidx.ui.text.ParagraphStyle? paragraphStyle = null);
- method public static androidx.ui.text.AnnotatedString AnnotatedString(String text, androidx.ui.text.ParagraphStyle paragraphStyle);
- method @Deprecated public static inline androidx.ui.text.AnnotatedString AnnotatedString(kotlin.jvm.functions.Function1<? super androidx.ui.text.AnnotatedString.Builder,kotlin.Unit> builder);
- method public static inline androidx.ui.text.AnnotatedString annotatedString(kotlin.jvm.functions.Function1<? super androidx.ui.text.AnnotatedString.Builder,kotlin.Unit> builder);
- method public static androidx.ui.text.AnnotatedString capitalize(androidx.ui.text.AnnotatedString, androidx.ui.intl.LocaleList localeList = LocaleList.current);
- method public static androidx.ui.text.AnnotatedString decapitalize(androidx.ui.text.AnnotatedString, androidx.ui.intl.LocaleList localeList = LocaleList.current);
- method public static int getLength(androidx.ui.text.AnnotatedString);
- method public static androidx.ui.text.AnnotatedString subSequence(androidx.ui.text.AnnotatedString, int start, int end);
- method public static androidx.ui.text.AnnotatedString toLowerCase(androidx.ui.text.AnnotatedString, androidx.ui.intl.LocaleList localeList = LocaleList.current);
- method public static androidx.ui.text.AnnotatedString toUpperCase(androidx.ui.text.AnnotatedString, androidx.ui.intl.LocaleList localeList = LocaleList.current);
- method public static inline <R> R withStyle(androidx.ui.text.AnnotatedString.Builder, androidx.ui.text.SpanStyle style, kotlin.jvm.functions.Function1<? super androidx.ui.text.AnnotatedString.Builder,? extends R> block);
- method public static inline <R> R withStyle(androidx.ui.text.AnnotatedString.Builder, androidx.ui.text.ParagraphStyle style, kotlin.jvm.functions.Function1<? super androidx.ui.text.AnnotatedString.Builder,? extends R> block);
+ method public static androidx.compose.ui.text.AnnotatedString AnnotatedString(String text, androidx.compose.ui.text.SpanStyle spanStyle, androidx.compose.ui.text.ParagraphStyle? paragraphStyle = null);
+ method public static androidx.compose.ui.text.AnnotatedString AnnotatedString(String text, androidx.compose.ui.text.ParagraphStyle paragraphStyle);
+ method @Deprecated public static inline androidx.compose.ui.text.AnnotatedString AnnotatedString(kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.AnnotatedString.Builder,kotlin.Unit> builder);
+ method public static inline androidx.compose.ui.text.AnnotatedString annotatedString(kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.AnnotatedString.Builder,kotlin.Unit> builder);
+ method public static androidx.compose.ui.text.AnnotatedString capitalize(androidx.compose.ui.text.AnnotatedString, androidx.compose.ui.text.intl.LocaleList localeList = LocaleList.current);
+ method public static androidx.compose.ui.text.AnnotatedString decapitalize(androidx.compose.ui.text.AnnotatedString, androidx.compose.ui.text.intl.LocaleList localeList = LocaleList.current);
+ method public static int getLength(androidx.compose.ui.text.AnnotatedString);
+ method public static androidx.compose.ui.text.AnnotatedString subSequence(androidx.compose.ui.text.AnnotatedString, int start, int end);
+ method public static androidx.compose.ui.text.AnnotatedString toLowerCase(androidx.compose.ui.text.AnnotatedString, androidx.compose.ui.text.intl.LocaleList localeList = LocaleList.current);
+ method public static androidx.compose.ui.text.AnnotatedString toUpperCase(androidx.compose.ui.text.AnnotatedString, androidx.compose.ui.text.intl.LocaleList localeList = LocaleList.current);
+ method public static inline <R> R withStyle(androidx.compose.ui.text.AnnotatedString.Builder, androidx.compose.ui.text.SpanStyle style, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.AnnotatedString.Builder,? extends R> block);
+ method public static inline <R> R withStyle(androidx.compose.ui.text.AnnotatedString.Builder, androidx.compose.ui.text.ParagraphStyle style, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.AnnotatedString.Builder,? extends R> block);
}
@kotlin.RequiresOptIn(level=RequiresOptIn.Level.ERROR, message="This is internal API that may change frequently and without warning.") @kotlin.annotation.Target(allowedTargets={AnnotationTarget.CLASS, AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY}) public @interface InternalTextApi {
@@ -355,16 +72,16 @@
}
public final class MultiParagraph {
- ctor public MultiParagraph(androidx.ui.text.MultiParagraphIntrinsics intrinsics, int maxLines, boolean ellipsis, androidx.ui.text.ParagraphConstraints constraints);
- ctor public MultiParagraph(androidx.ui.text.AnnotatedString annotatedString, androidx.ui.text.TextStyle style, java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>> placeholders, int maxLines, boolean ellipsis, androidx.ui.text.ParagraphConstraints constraints, androidx.ui.unit.Density density, androidx.ui.text.font.Font.ResourceLoader resourceLoader);
- method public androidx.ui.text.style.ResolvedTextDirection getBidiRunDirection(int offset);
+ ctor public MultiParagraph(androidx.compose.ui.text.MultiParagraphIntrinsics intrinsics, int maxLines, boolean ellipsis, androidx.compose.ui.text.ParagraphConstraints constraints);
+ ctor public MultiParagraph(androidx.compose.ui.text.AnnotatedString annotatedString, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, int maxLines, boolean ellipsis, androidx.compose.ui.text.ParagraphConstraints constraints, androidx.ui.unit.Density density, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getBidiRunDirection(int offset);
method public androidx.ui.geometry.Rect getBoundingBox(int offset);
method public androidx.ui.geometry.Rect getCursorRect(int offset);
method public boolean getDidExceedMaxLines();
method public float getFirstBaseline();
method public float getHeight();
method public float getHorizontalPosition(int offset, boolean usePrimaryDirection);
- method public androidx.ui.text.MultiParagraphIntrinsics getIntrinsics();
+ method public androidx.compose.ui.text.MultiParagraphIntrinsics getIntrinsics();
method public float getLastBaseline();
method public float getLineBottom(int lineIndex);
method public int getLineCount();
@@ -382,11 +99,11 @@
method public int getMaxLines();
method public float getMinIntrinsicWidth();
method public int getOffsetForPosition(androidx.ui.geometry.Offset position);
- method public androidx.ui.text.style.ResolvedTextDirection getParagraphDirection(int offset);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getParagraphDirection(int offset);
method public androidx.ui.graphics.Path getPathForRange(int start, int end);
method public java.util.List<androidx.ui.geometry.Rect> getPlaceholderRects();
method public float getWidth();
- method public androidx.ui.text.TextRange getWordBoundary(int offset);
+ method public androidx.compose.ui.text.TextRange getWordBoundary(int offset);
method public void paint(androidx.ui.graphics.Canvas canvas);
property public final boolean didExceedMaxLines;
property public final float firstBaseline;
@@ -399,12 +116,12 @@
property public final float width;
}
- public final class MultiParagraphIntrinsics implements androidx.ui.text.ParagraphIntrinsics {
- ctor public MultiParagraphIntrinsics(androidx.ui.text.AnnotatedString annotatedString, androidx.ui.text.TextStyle style, java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>> placeholders, androidx.ui.unit.Density density, androidx.ui.text.font.Font.ResourceLoader resourceLoader);
- method public androidx.ui.text.AnnotatedString getAnnotatedString();
+ public final class MultiParagraphIntrinsics implements androidx.compose.ui.text.ParagraphIntrinsics {
+ ctor public MultiParagraphIntrinsics(androidx.compose.ui.text.AnnotatedString annotatedString, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, androidx.ui.unit.Density density, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader);
+ method public androidx.compose.ui.text.AnnotatedString getAnnotatedString();
method public float getMaxIntrinsicWidth();
method public float getMinIntrinsicWidth();
- method public java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>> getPlaceholders();
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> getPlaceholders();
property public float maxIntrinsicWidth;
property public float minIntrinsicWidth;
}
@@ -416,7 +133,7 @@
}
public interface Paragraph {
- method public androidx.ui.text.style.ResolvedTextDirection getBidiRunDirection(int offset);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getBidiRunDirection(int offset);
method public androidx.ui.geometry.Rect getBoundingBox(int offset);
method public androidx.ui.geometry.Rect getCursorRect(int offset);
method public boolean getDidExceedMaxLines();
@@ -439,11 +156,11 @@
method public float getMaxIntrinsicWidth();
method public float getMinIntrinsicWidth();
method public int getOffsetForPosition(androidx.ui.geometry.Offset position);
- method public androidx.ui.text.style.ResolvedTextDirection getParagraphDirection(int offset);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getParagraphDirection(int offset);
method public androidx.ui.graphics.Path getPathForRange(int start, int end);
method public java.util.List<androidx.ui.geometry.Rect> getPlaceholderRects();
method public float getWidth();
- method public androidx.ui.text.TextRange getWordBoundary(int offset);
+ method public androidx.compose.ui.text.TextRange getWordBoundary(int offset);
method public void paint(androidx.ui.graphics.Canvas canvas);
property public abstract boolean didExceedMaxLines;
property public abstract float firstBaseline;
@@ -459,7 +176,7 @@
public final class ParagraphConstraints {
ctor public ParagraphConstraints(float width);
method public float component1();
- method public androidx.ui.text.ParagraphConstraints copy(float width);
+ method public androidx.compose.ui.text.ParagraphConstraints copy(float width);
method public float getWidth();
}
@@ -471,56 +188,56 @@
}
public final class ParagraphIntrinsicsKt {
- method public static androidx.ui.text.ParagraphIntrinsics ParagraphIntrinsics(String text, androidx.ui.text.TextStyle style, java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.SpanStyle>> spanStyles = listOf(), java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>> placeholders = listOf(), androidx.ui.unit.Density density, androidx.ui.text.font.Font.ResourceLoader resourceLoader);
+ method public static androidx.compose.ui.text.ParagraphIntrinsics ParagraphIntrinsics(String text, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> spanStyles = listOf(), java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders = listOf(), androidx.ui.unit.Density density, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader);
}
public final class ParagraphKt {
- method public static androidx.ui.text.Paragraph Paragraph(String text, androidx.ui.text.TextStyle style, java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.SpanStyle>> spanStyles = listOf(), java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>> placeholders = listOf(), int maxLines = 2147483647, boolean ellipsis = false, androidx.ui.text.ParagraphConstraints constraints, androidx.ui.unit.Density density, androidx.ui.text.font.Font.ResourceLoader resourceLoader);
- method public static androidx.ui.text.Paragraph Paragraph(androidx.ui.text.ParagraphIntrinsics paragraphIntrinsics, int maxLines = 2147483647, boolean ellipsis = false, androidx.ui.text.ParagraphConstraints constraints);
+ method public static androidx.compose.ui.text.Paragraph Paragraph(String text, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> spanStyles = listOf(), java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders = listOf(), int maxLines = 2147483647, boolean ellipsis = false, androidx.compose.ui.text.ParagraphConstraints constraints, androidx.ui.unit.Density density, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader);
+ method public static androidx.compose.ui.text.Paragraph Paragraph(androidx.compose.ui.text.ParagraphIntrinsics paragraphIntrinsics, int maxLines = 2147483647, boolean ellipsis = false, androidx.compose.ui.text.ParagraphConstraints constraints);
}
@androidx.compose.Immutable public final class ParagraphStyle {
- method public androidx.ui.text.style.TextAlign? component1();
- method public androidx.ui.text.style.TextDirection? component2();
+ method public androidx.compose.ui.text.style.TextAlign? component1();
+ method public androidx.compose.ui.text.style.TextDirection? component2();
method public long component3();
- method public androidx.ui.text.style.TextIndent? component4();
- method @androidx.compose.Immutable public androidx.ui.text.ParagraphStyle copy-JVmhFNw(androidx.ui.text.style.TextAlign? textAlign, androidx.ui.text.style.TextDirection? textDirection, long lineHeight, androidx.ui.text.style.TextIndent? textIndent);
+ method public androidx.compose.ui.text.style.TextIndent? component4();
+ method @androidx.compose.Immutable public androidx.compose.ui.text.ParagraphStyle copy-yfYFPjM(androidx.compose.ui.text.style.TextAlign? textAlign, androidx.compose.ui.text.style.TextDirection? textDirection, long lineHeight, androidx.compose.ui.text.style.TextIndent? textIndent);
method public long getLineHeight();
- method public androidx.ui.text.style.TextAlign? getTextAlign();
- method public androidx.ui.text.style.TextDirection? getTextDirection();
- method public androidx.ui.text.style.TextIndent? getTextIndent();
- method @androidx.compose.Stable public androidx.ui.text.ParagraphStyle merge(androidx.ui.text.ParagraphStyle? other = null);
- method @androidx.compose.Stable public operator androidx.ui.text.ParagraphStyle plus(androidx.ui.text.ParagraphStyle other);
+ 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.Stable public androidx.compose.ui.text.ParagraphStyle merge(androidx.compose.ui.text.ParagraphStyle? other = null);
+ method @androidx.compose.Stable public operator androidx.compose.ui.text.ParagraphStyle plus(androidx.compose.ui.text.ParagraphStyle other);
}
public final class ParagraphStyleKt {
- method @androidx.compose.Stable public static androidx.ui.text.ParagraphStyle lerp(androidx.ui.text.ParagraphStyle start, androidx.ui.text.ParagraphStyle stop, float fraction);
+ method @androidx.compose.Stable public static androidx.compose.ui.text.ParagraphStyle lerp(androidx.compose.ui.text.ParagraphStyle start, androidx.compose.ui.text.ParagraphStyle stop, float fraction);
}
@androidx.compose.Immutable public final class Placeholder {
method public long component1();
method public long component2();
- method public androidx.ui.text.PlaceholderVerticalAlign component3();
- method @androidx.compose.Immutable public androidx.ui.text.Placeholder copy-eLqjHCw(long width, long height, androidx.ui.text.PlaceholderVerticalAlign placeholderVerticalAlign);
+ method public androidx.compose.ui.text.PlaceholderVerticalAlign component3();
+ method @androidx.compose.Immutable public androidx.compose.ui.text.Placeholder copy-LxtbTAo(long width, long height, androidx.compose.ui.text.PlaceholderVerticalAlign placeholderVerticalAlign);
method public long getHeight();
- method public androidx.ui.text.PlaceholderVerticalAlign getPlaceholderVerticalAlign();
+ method public androidx.compose.ui.text.PlaceholderVerticalAlign getPlaceholderVerticalAlign();
method public long getWidth();
}
public enum PlaceholderVerticalAlign {
- method public static androidx.ui.text.PlaceholderVerticalAlign valueOf(String name) throws java.lang.IllegalArgumentException;
- method public static androidx.ui.text.PlaceholderVerticalAlign[] values();
- enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign AboveBaseline;
- enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign Bottom;
- enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign Center;
- enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign TextBottom;
- enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign TextCenter;
- enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign TextTop;
- enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign Top;
+ method public static androidx.compose.ui.text.PlaceholderVerticalAlign valueOf(String name) throws java.lang.IllegalArgumentException;
+ method public static androidx.compose.ui.text.PlaceholderVerticalAlign[] values();
+ enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign AboveBaseline;
+ enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign Bottom;
+ enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign Center;
+ enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign TextBottom;
+ enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign TextCenter;
+ enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign TextTop;
+ enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign Top;
}
public final class SoftwareKeyboardController {
- ctor public SoftwareKeyboardController(androidx.ui.input.TextInputService textInputService, int token);
+ ctor public SoftwareKeyboardController(androidx.compose.ui.text.input.TextInputService textInputService, int token);
method public void hideSoftwareKeyboard();
method public void notifyFocusedRect(androidx.ui.geometry.Rect rect);
method public void showSoftwareKeyboard();
@@ -528,86 +245,86 @@
@androidx.compose.Immutable public final class SpanStyle {
method public long component1();
- method public androidx.ui.text.style.TextGeometricTransform? component10();
- method public androidx.ui.intl.LocaleList? component11();
+ method public androidx.compose.ui.text.style.TextGeometricTransform? component10();
+ method public androidx.compose.ui.text.intl.LocaleList? component11();
method public long component12();
- method public androidx.ui.text.style.TextDecoration? component13();
+ method public androidx.compose.ui.text.style.TextDecoration? component13();
method public androidx.ui.graphics.Shadow? component14();
method public long component2();
- method public androidx.ui.text.font.FontWeight? component3();
- method public androidx.ui.text.font.FontStyle? component4();
- method public androidx.ui.text.font.FontSynthesis? component5();
- method public androidx.ui.text.font.FontFamily? component6();
+ method public androidx.compose.ui.text.font.FontWeight? component3();
+ method public androidx.compose.ui.text.font.FontStyle? component4();
+ method public androidx.compose.ui.text.font.FontSynthesis? component5();
+ method public androidx.compose.ui.text.font.FontFamily? component6();
method public String? component7();
method public long component8();
- method public androidx.ui.text.style.BaselineShift? component9();
- method @androidx.compose.Immutable public androidx.ui.text.SpanStyle copy-HjQ0eR4(long color, long fontSize, androidx.ui.text.font.FontWeight? fontWeight, androidx.ui.text.font.FontStyle? fontStyle, androidx.ui.text.font.FontSynthesis? fontSynthesis, androidx.ui.text.font.FontFamily? fontFamily, String? fontFeatureSettings, long letterSpacing, androidx.ui.text.style.BaselineShift? baselineShift, androidx.ui.text.style.TextGeometricTransform? textGeometricTransform, androidx.ui.intl.LocaleList? localeList, long background, androidx.ui.text.style.TextDecoration? textDecoration, androidx.ui.graphics.Shadow? shadow);
+ method public androidx.compose.ui.text.style.BaselineShift? component9();
+ method @androidx.compose.Immutable public androidx.compose.ui.text.SpanStyle copy-3JaCuMk(long color, long fontSize, androidx.compose.ui.text.font.FontWeight? fontWeight, androidx.compose.ui.text.font.FontStyle? fontStyle, androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, androidx.compose.ui.text.font.FontFamily? fontFamily, String? fontFeatureSettings, long letterSpacing, androidx.compose.ui.text.style.BaselineShift? baselineShift, androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, androidx.compose.ui.text.intl.LocaleList? localeList, long background, androidx.compose.ui.text.style.TextDecoration? textDecoration, androidx.ui.graphics.Shadow? shadow);
method public long getBackground();
- method public androidx.ui.text.style.BaselineShift? getBaselineShift();
+ method public androidx.compose.ui.text.style.BaselineShift? getBaselineShift();
method public long getColor();
- method public androidx.ui.text.font.FontFamily? getFontFamily();
+ method public androidx.compose.ui.text.font.FontFamily? getFontFamily();
method public String? getFontFeatureSettings();
method public long getFontSize();
- method public androidx.ui.text.font.FontStyle? getFontStyle();
- method public androidx.ui.text.font.FontSynthesis? getFontSynthesis();
- method public androidx.ui.text.font.FontWeight? getFontWeight();
+ method public androidx.compose.ui.text.font.FontStyle? getFontStyle();
+ method public androidx.compose.ui.text.font.FontSynthesis? getFontSynthesis();
+ method public androidx.compose.ui.text.font.FontWeight? getFontWeight();
method public long getLetterSpacing();
- method public androidx.ui.intl.LocaleList? getLocaleList();
+ method public androidx.compose.ui.text.intl.LocaleList? getLocaleList();
method public androidx.ui.graphics.Shadow? getShadow();
- method public androidx.ui.text.style.TextDecoration? getTextDecoration();
- method public androidx.ui.text.style.TextGeometricTransform? getTextGeometricTransform();
- method @androidx.compose.Stable public androidx.ui.text.SpanStyle merge(androidx.ui.text.SpanStyle? other = null);
- method @androidx.compose.Stable public operator androidx.ui.text.SpanStyle plus(androidx.ui.text.SpanStyle other);
+ method public androidx.compose.ui.text.style.TextDecoration? getTextDecoration();
+ method public androidx.compose.ui.text.style.TextGeometricTransform? getTextGeometricTransform();
+ method @androidx.compose.Stable public androidx.compose.ui.text.SpanStyle merge(androidx.compose.ui.text.SpanStyle? other = null);
+ method @androidx.compose.Stable public operator androidx.compose.ui.text.SpanStyle plus(androidx.compose.ui.text.SpanStyle other);
}
public final class SpanStyleKt {
- method public static androidx.ui.text.SpanStyle lerp(androidx.ui.text.SpanStyle start, androidx.ui.text.SpanStyle stop, float fraction);
+ method public static androidx.compose.ui.text.SpanStyle lerp(androidx.compose.ui.text.SpanStyle start, androidx.compose.ui.text.SpanStyle stop, float fraction);
}
public final class StringKt {
- method public static String capitalize(String, androidx.ui.intl.Locale locale);
- method public static String capitalize(String, androidx.ui.intl.LocaleList localeList);
- method public static String decapitalize(String, androidx.ui.intl.Locale locale);
- method public static String decapitalize(String, androidx.ui.intl.LocaleList localeList);
- method public static String toLowerCase(String, androidx.ui.intl.Locale locale);
- method public static String toLowerCase(String, androidx.ui.intl.LocaleList localeList);
- method public static String toUpperCase(String, androidx.ui.intl.Locale locale);
- method public static String toUpperCase(String, androidx.ui.intl.LocaleList localeList);
+ method public static String capitalize(String, androidx.compose.ui.text.intl.Locale locale);
+ method public static String capitalize(String, androidx.compose.ui.text.intl.LocaleList localeList);
+ method public static String decapitalize(String, androidx.compose.ui.text.intl.Locale locale);
+ method public static String decapitalize(String, androidx.compose.ui.text.intl.LocaleList localeList);
+ method public static String toLowerCase(String, androidx.compose.ui.text.intl.Locale locale);
+ method public static String toLowerCase(String, androidx.compose.ui.text.intl.LocaleList localeList);
+ method public static String toUpperCase(String, androidx.compose.ui.text.intl.Locale locale);
+ method public static String toUpperCase(String, androidx.compose.ui.text.intl.LocaleList localeList);
}
public final class TextLayoutHelperKt {
}
public final class TextLayoutInput {
- ctor public TextLayoutInput(androidx.ui.text.AnnotatedString text, androidx.ui.text.TextStyle style, java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>> placeholders, int maxLines, boolean softWrap, androidx.ui.text.style.TextOverflow overflow, androidx.ui.unit.Density density, androidx.ui.core.LayoutDirection layoutDirection, androidx.ui.text.font.Font.ResourceLoader resourceLoader, androidx.ui.core.Constraints constraints);
- method public androidx.ui.text.AnnotatedString component1();
+ ctor public TextLayoutInput(androidx.compose.ui.text.AnnotatedString text, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, int maxLines, boolean softWrap, androidx.compose.ui.text.style.TextOverflow overflow, androidx.ui.unit.Density density, androidx.ui.core.LayoutDirection layoutDirection, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader, androidx.ui.core.Constraints constraints);
+ method public androidx.compose.ui.text.AnnotatedString component1();
method public androidx.ui.core.Constraints component10();
- method public androidx.ui.text.TextStyle component2();
- method public java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>> component3();
+ method public androidx.compose.ui.text.TextStyle component2();
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> component3();
method public int component4();
method public boolean component5();
- method public androidx.ui.text.style.TextOverflow component6();
+ method public androidx.compose.ui.text.style.TextOverflow component6();
method public androidx.ui.unit.Density component7();
method public androidx.ui.core.LayoutDirection component8();
- method public androidx.ui.text.font.Font.ResourceLoader component9();
- method public androidx.ui.text.TextLayoutInput copy(androidx.ui.text.AnnotatedString text, androidx.ui.text.TextStyle style, java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>> placeholders, int maxLines, boolean softWrap, androidx.ui.text.style.TextOverflow overflow, androidx.ui.unit.Density density, androidx.ui.core.LayoutDirection layoutDirection, androidx.ui.text.font.Font.ResourceLoader resourceLoader, androidx.ui.core.Constraints constraints);
+ method public androidx.compose.ui.text.font.Font.ResourceLoader component9();
+ method public androidx.compose.ui.text.TextLayoutInput copy(androidx.compose.ui.text.AnnotatedString text, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, int maxLines, boolean softWrap, androidx.compose.ui.text.style.TextOverflow overflow, androidx.ui.unit.Density density, androidx.ui.core.LayoutDirection layoutDirection, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader, androidx.ui.core.Constraints constraints);
method public androidx.ui.core.Constraints getConstraints();
method public androidx.ui.unit.Density getDensity();
method public androidx.ui.core.LayoutDirection getLayoutDirection();
method public int getMaxLines();
- method public androidx.ui.text.style.TextOverflow getOverflow();
- method public java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>> getPlaceholders();
- method public androidx.ui.text.font.Font.ResourceLoader getResourceLoader();
+ method public androidx.compose.ui.text.style.TextOverflow getOverflow();
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> getPlaceholders();
+ method public androidx.compose.ui.text.font.Font.ResourceLoader getResourceLoader();
method public boolean getSoftWrap();
- method public androidx.ui.text.TextStyle getStyle();
- method public androidx.ui.text.AnnotatedString getText();
+ method public androidx.compose.ui.text.TextStyle getStyle();
+ method public androidx.compose.ui.text.AnnotatedString getText();
}
public final class TextLayoutResult {
- method public androidx.ui.text.TextLayoutInput component1();
+ method public androidx.compose.ui.text.TextLayoutInput component1();
method public androidx.ui.unit.IntSize component3();
- method public androidx.ui.text.TextLayoutResult copy(androidx.ui.text.TextLayoutInput layoutInput, androidx.ui.text.MultiParagraph multiParagraph, androidx.ui.unit.IntSize size);
- method public androidx.ui.text.style.ResolvedTextDirection getBidiRunDirection(int offset);
+ method public androidx.compose.ui.text.TextLayoutResult copy(androidx.compose.ui.text.TextLayoutInput layoutInput, androidx.compose.ui.text.MultiParagraph multiParagraph, androidx.ui.unit.IntSize size);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getBidiRunDirection(int offset);
method public androidx.ui.geometry.Rect getBoundingBox(int offset);
method public androidx.ui.geometry.Rect getCursorRect(int offset);
method public boolean getDidOverflowHeight();
@@ -616,7 +333,7 @@
method public boolean getHasVisualOverflow();
method public float getHorizontalPosition(int offset, boolean usePrimaryDirection);
method public float getLastBaseline();
- method public androidx.ui.text.TextLayoutInput getLayoutInput();
+ method public androidx.compose.ui.text.TextLayoutInput getLayoutInput();
method public float getLineBottom(int lineIndex);
method public int getLineCount();
method public int getLineEnd(int lineIndex);
@@ -626,11 +343,11 @@
method public int getLineStart(int lineIndex);
method public float getLineTop(int lineIndex);
method public int getOffsetForPosition(androidx.ui.geometry.Offset position);
- method public androidx.ui.text.style.ResolvedTextDirection getParagraphDirection(int offset);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getParagraphDirection(int offset);
method public androidx.ui.graphics.Path getPathForRange(int start, int end);
method public java.util.List<androidx.ui.geometry.Rect> getPlaceholderRects();
method public androidx.ui.unit.IntSize getSize();
- method public androidx.ui.text.TextRange getWordBoundary(int offset);
+ method public androidx.compose.ui.text.TextRange getWordBoundary(int offset);
property public final boolean didOverflowHeight;
property public final boolean didOverflowWidth;
property public final float firstBaseline;
@@ -641,17 +358,17 @@
}
public final class TextPainter {
- method public void paint(androidx.ui.graphics.Canvas canvas, androidx.ui.text.TextLayoutResult textLayoutResult);
- field public static final androidx.ui.text.TextPainter INSTANCE;
+ method public void paint(androidx.ui.graphics.Canvas canvas, androidx.compose.ui.text.TextLayoutResult textLayoutResult);
+ field public static final androidx.compose.ui.text.TextPainter INSTANCE;
}
@androidx.compose.Immutable public final class TextRange {
ctor public TextRange(@IntRange(from=null) int start, @IntRange(from=null) int end);
method public int component1();
method public int component2();
- method public operator boolean contains(androidx.ui.text.TextRange other);
+ method public operator boolean contains(androidx.compose.ui.text.TextRange other);
method public operator boolean contains(int offset);
- method @androidx.compose.Immutable public androidx.ui.text.TextRange copy(int start, int end);
+ method @androidx.compose.Immutable public androidx.compose.ui.text.TextRange copy(int start, int end);
method public boolean getCollapsed();
method public int getEnd();
method public int getLength();
@@ -659,274 +376,557 @@
method public int getMin();
method public boolean getReversed();
method public int getStart();
- method public boolean intersects(androidx.ui.text.TextRange other);
+ method public boolean intersects(androidx.compose.ui.text.TextRange other);
property public final boolean collapsed;
property public final int length;
property public final int max;
property public final int min;
property public final boolean reversed;
- field public static final androidx.ui.text.TextRange.Companion Companion;
+ field public static final androidx.compose.ui.text.TextRange.Companion Companion;
}
public static final class TextRange.Companion {
- method public androidx.ui.text.TextRange getZero();
- property public final androidx.ui.text.TextRange Zero;
+ method public androidx.compose.ui.text.TextRange getZero();
+ property public final androidx.compose.ui.text.TextRange Zero;
}
public final class TextRangeKt {
- method public static androidx.ui.text.TextRange TextRange(int index);
- method public static String substring(CharSequence, androidx.ui.text.TextRange range);
+ method public static androidx.compose.ui.text.TextRange TextRange(int index);
+ method public static String substring(CharSequence, androidx.compose.ui.text.TextRange range);
}
@androidx.compose.Immutable public final class TextStyle {
method public long component1();
- method public androidx.ui.text.style.TextGeometricTransform? component10();
- method public androidx.ui.intl.LocaleList? component11();
+ method public androidx.compose.ui.text.style.TextGeometricTransform? component10();
+ method public androidx.compose.ui.text.intl.LocaleList? component11();
method public long component12();
- method public androidx.ui.text.style.TextDecoration? component13();
+ method public androidx.compose.ui.text.style.TextDecoration? component13();
method public androidx.ui.graphics.Shadow? component14();
- method public androidx.ui.text.style.TextAlign? component15();
- method public androidx.ui.text.style.TextDirection? component16();
+ method public androidx.compose.ui.text.style.TextAlign? component15();
+ method public androidx.compose.ui.text.style.TextDirection? component16();
method public long component17();
- method public androidx.ui.text.style.TextIndent? component18();
+ method public androidx.compose.ui.text.style.TextIndent? component18();
method public long component2();
- method public androidx.ui.text.font.FontWeight? component3();
- method public androidx.ui.text.font.FontStyle? component4();
- method public androidx.ui.text.font.FontSynthesis? component5();
- method public androidx.ui.text.font.FontFamily? component6();
+ method public androidx.compose.ui.text.font.FontWeight? component3();
+ method public androidx.compose.ui.text.font.FontStyle? component4();
+ method public androidx.compose.ui.text.font.FontSynthesis? component5();
+ method public androidx.compose.ui.text.font.FontFamily? component6();
method public String? component7();
method public long component8();
- method public androidx.ui.text.style.BaselineShift? component9();
- method @androidx.compose.Immutable public androidx.ui.text.TextStyle copy-7aJ7aFo(long color, long fontSize, androidx.ui.text.font.FontWeight? fontWeight, androidx.ui.text.font.FontStyle? fontStyle, androidx.ui.text.font.FontSynthesis? fontSynthesis, androidx.ui.text.font.FontFamily? fontFamily, String? fontFeatureSettings, long letterSpacing, androidx.ui.text.style.BaselineShift? baselineShift, androidx.ui.text.style.TextGeometricTransform? textGeometricTransform, androidx.ui.intl.LocaleList? localeList, long background, androidx.ui.text.style.TextDecoration? textDecoration, androidx.ui.graphics.Shadow? shadow, androidx.ui.text.style.TextAlign? textAlign, androidx.ui.text.style.TextDirection? textDirection, long lineHeight, androidx.ui.text.style.TextIndent? textIndent);
+ method public androidx.compose.ui.text.style.BaselineShift? component9();
+ method @androidx.compose.Immutable public androidx.compose.ui.text.TextStyle copy-7Y_OIKU(long color, long fontSize, androidx.compose.ui.text.font.FontWeight? fontWeight, androidx.compose.ui.text.font.FontStyle? fontStyle, androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, androidx.compose.ui.text.font.FontFamily? fontFamily, String? fontFeatureSettings, long letterSpacing, androidx.compose.ui.text.style.BaselineShift? baselineShift, androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, androidx.compose.ui.text.intl.LocaleList? localeList, long background, androidx.compose.ui.text.style.TextDecoration? textDecoration, androidx.ui.graphics.Shadow? shadow, androidx.compose.ui.text.style.TextAlign? textAlign, androidx.compose.ui.text.style.TextDirection? textDirection, long lineHeight, androidx.compose.ui.text.style.TextIndent? textIndent);
method public long getBackground();
- method public androidx.ui.text.style.BaselineShift? getBaselineShift();
+ method public androidx.compose.ui.text.style.BaselineShift? getBaselineShift();
method public long getColor();
- method public androidx.ui.text.font.FontFamily? getFontFamily();
+ method public androidx.compose.ui.text.font.FontFamily? getFontFamily();
method public String? getFontFeatureSettings();
method public long getFontSize();
- method public androidx.ui.text.font.FontStyle? getFontStyle();
- method public androidx.ui.text.font.FontSynthesis? getFontSynthesis();
- method public androidx.ui.text.font.FontWeight? getFontWeight();
+ method public androidx.compose.ui.text.font.FontStyle? getFontStyle();
+ method public androidx.compose.ui.text.font.FontSynthesis? getFontSynthesis();
+ method public androidx.compose.ui.text.font.FontWeight? getFontWeight();
method public long getLetterSpacing();
method public long getLineHeight();
- method public androidx.ui.intl.LocaleList? getLocaleList();
+ method public androidx.compose.ui.text.intl.LocaleList? getLocaleList();
method public androidx.ui.graphics.Shadow? getShadow();
- method public androidx.ui.text.style.TextAlign? getTextAlign();
- method public androidx.ui.text.style.TextDecoration? getTextDecoration();
- method public androidx.ui.text.style.TextDirection? getTextDirection();
- method public androidx.ui.text.style.TextGeometricTransform? getTextGeometricTransform();
- method public androidx.ui.text.style.TextIndent? getTextIndent();
- method @androidx.compose.Stable public androidx.ui.text.TextStyle merge(androidx.ui.text.TextStyle? other = null);
- method @androidx.compose.Stable public androidx.ui.text.TextStyle merge(androidx.ui.text.SpanStyle other);
- method @androidx.compose.Stable public androidx.ui.text.TextStyle merge(androidx.ui.text.ParagraphStyle other);
- method @androidx.compose.Stable public operator androidx.ui.text.TextStyle plus(androidx.ui.text.TextStyle other);
- method @androidx.compose.Stable public operator androidx.ui.text.TextStyle plus(androidx.ui.text.ParagraphStyle other);
- method @androidx.compose.Stable public operator androidx.ui.text.TextStyle plus(androidx.ui.text.SpanStyle other);
- method @androidx.compose.Stable public androidx.ui.text.ParagraphStyle toParagraphStyle();
- method @androidx.compose.Stable public androidx.ui.text.SpanStyle toSpanStyle();
- field public static final androidx.ui.text.TextStyle.Companion Companion;
+ method public androidx.compose.ui.text.style.TextAlign? getTextAlign();
+ method public androidx.compose.ui.text.style.TextDecoration? getTextDecoration();
+ 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.Stable public androidx.compose.ui.text.TextStyle merge(androidx.compose.ui.text.TextStyle? other = null);
+ method @androidx.compose.Stable public androidx.compose.ui.text.TextStyle merge(androidx.compose.ui.text.SpanStyle other);
+ method @androidx.compose.Stable public androidx.compose.ui.text.TextStyle merge(androidx.compose.ui.text.ParagraphStyle other);
+ method @androidx.compose.Stable public operator androidx.compose.ui.text.TextStyle plus(androidx.compose.ui.text.TextStyle other);
+ method @androidx.compose.Stable public operator androidx.compose.ui.text.TextStyle plus(androidx.compose.ui.text.ParagraphStyle other);
+ method @androidx.compose.Stable public operator androidx.compose.ui.text.TextStyle plus(androidx.compose.ui.text.SpanStyle other);
+ method @androidx.compose.Stable public androidx.compose.ui.text.ParagraphStyle toParagraphStyle();
+ method @androidx.compose.Stable public androidx.compose.ui.text.SpanStyle toSpanStyle();
+ field public static final androidx.compose.ui.text.TextStyle.Companion Companion;
}
public static final class TextStyle.Companion {
- method public androidx.ui.text.TextStyle getDefault();
- property public final androidx.ui.text.TextStyle Default;
+ method public androidx.compose.ui.text.TextStyle getDefault();
+ property public final androidx.compose.ui.text.TextStyle Default;
}
public final class TextStyleKt {
- method public static androidx.ui.text.TextStyle lerp(androidx.ui.text.TextStyle start, androidx.ui.text.TextStyle stop, float fraction);
- method public static androidx.ui.text.TextStyle resolveDefaults(androidx.ui.text.TextStyle style, androidx.ui.core.LayoutDirection direction);
+ method public static androidx.compose.ui.text.TextStyle lerp(androidx.compose.ui.text.TextStyle start, androidx.compose.ui.text.TextStyle stop, float fraction);
+ method public static androidx.compose.ui.text.TextStyle resolveDefaults(androidx.compose.ui.text.TextStyle style, androidx.ui.core.LayoutDirection direction);
}
public interface Typeface {
- method public androidx.ui.text.font.FontFamily getFontFamily();
- property public abstract androidx.ui.text.font.FontFamily fontFamily;
+ method public androidx.compose.ui.text.font.FontFamily getFontFamily();
+ property public abstract androidx.compose.ui.text.font.FontFamily fontFamily;
}
}
-package androidx.ui.text.font {
+package androidx.compose.ui.text.font {
- public abstract sealed class FileBasedFontFamily extends androidx.ui.text.font.FontFamily {
+ public abstract sealed class FileBasedFontFamily extends androidx.compose.ui.text.font.FontFamily {
}
@androidx.compose.Immutable public interface Font {
- method public androidx.ui.text.font.FontStyle getStyle();
- method public androidx.ui.text.font.FontWeight getWeight();
- property public abstract androidx.ui.text.font.FontStyle style;
- property public abstract androidx.ui.text.font.FontWeight weight;
+ method public androidx.compose.ui.text.font.FontStyle getStyle();
+ method public androidx.compose.ui.text.font.FontWeight getWeight();
+ property public abstract androidx.compose.ui.text.font.FontStyle style;
+ property public abstract androidx.compose.ui.text.font.FontWeight weight;
}
public static interface Font.ResourceLoader {
- method public Object load(androidx.ui.text.font.Font font);
+ method public Object load(androidx.compose.ui.text.font.Font font);
}
@androidx.compose.Immutable public abstract sealed class FontFamily {
method public final boolean getCanLoadSynchronously();
- field public static final androidx.ui.text.font.FontFamily.Companion Companion;
+ field public static final androidx.compose.ui.text.font.FontFamily.Companion Companion;
}
public static final class FontFamily.Companion {
- method public androidx.ui.text.font.GenericFontFamily getCursive();
- method public androidx.ui.text.font.SystemFontFamily getDefault();
- method public androidx.ui.text.font.GenericFontFamily getMonospace();
- method public androidx.ui.text.font.GenericFontFamily getSansSerif();
- method public androidx.ui.text.font.GenericFontFamily getSerif();
- property public final androidx.ui.text.font.GenericFontFamily Cursive;
- property public final androidx.ui.text.font.SystemFontFamily Default;
- property public final androidx.ui.text.font.GenericFontFamily Monospace;
- property public final androidx.ui.text.font.GenericFontFamily SansSerif;
- property public final androidx.ui.text.font.GenericFontFamily Serif;
+ method public androidx.compose.ui.text.font.GenericFontFamily getCursive();
+ method public androidx.compose.ui.text.font.SystemFontFamily getDefault();
+ method public androidx.compose.ui.text.font.GenericFontFamily getMonospace();
+ method public androidx.compose.ui.text.font.GenericFontFamily getSansSerif();
+ method public androidx.compose.ui.text.font.GenericFontFamily getSerif();
+ property public final androidx.compose.ui.text.font.GenericFontFamily Cursive;
+ property public final androidx.compose.ui.text.font.SystemFontFamily Default;
+ property public final androidx.compose.ui.text.font.GenericFontFamily Monospace;
+ property public final androidx.compose.ui.text.font.GenericFontFamily SansSerif;
+ property public final androidx.compose.ui.text.font.GenericFontFamily Serif;
}
public final class FontFamilyKt {
- method @androidx.compose.Stable public static androidx.ui.text.font.FontListFontFamily fontFamily(java.util.List<? extends androidx.ui.text.font.Font> fonts);
- method @androidx.compose.Stable public static androidx.ui.text.font.FontListFontFamily fontFamily(androidx.ui.text.font.Font... fonts);
- method public static androidx.ui.text.font.LoadedFontFamily fontFamily(androidx.ui.text.Typeface typeface);
+ method @androidx.compose.Stable public static androidx.compose.ui.text.font.FontListFontFamily fontFamily(java.util.List<? extends androidx.compose.ui.text.font.Font> fonts);
+ method @androidx.compose.Stable public static androidx.compose.ui.text.font.FontListFontFamily fontFamily(androidx.compose.ui.text.font.Font... fonts);
+ method public static androidx.compose.ui.text.font.LoadedFontFamily fontFamily(androidx.compose.ui.text.Typeface typeface);
}
public final class FontKt {
- method @androidx.compose.Stable public static androidx.ui.text.font.FontListFontFamily asFontFamily(androidx.ui.text.font.Font);
- method @androidx.compose.Stable public static androidx.ui.text.font.Font font(int resId, androidx.ui.text.font.FontWeight weight = FontWeight.Normal, androidx.ui.text.font.FontStyle style = androidx.ui.text.font.FontStyle.Normal);
+ method @androidx.compose.Stable public static androidx.compose.ui.text.font.FontListFontFamily asFontFamily(androidx.compose.ui.text.font.Font);
+ method @androidx.compose.Stable public static androidx.compose.ui.text.font.Font font(int resId, androidx.compose.ui.text.font.FontWeight weight = FontWeight.Normal, androidx.compose.ui.text.font.FontStyle style = androidx.compose.ui.text.font.FontStyle.Normal);
}
- @androidx.compose.Immutable public final class FontListFontFamily extends androidx.ui.text.font.FileBasedFontFamily implements kotlin.jvm.internal.markers.KMappedMarker java.util.List<androidx.ui.text.font.Font> {
- ctor public FontListFontFamily(java.util.List<? extends androidx.ui.text.font.Font> fonts);
- method public java.util.List<androidx.ui.text.font.Font> component1();
- method public boolean contains(androidx.ui.text.font.Font element);
+ @androidx.compose.Immutable public final class FontListFontFamily extends androidx.compose.ui.text.font.FileBasedFontFamily implements kotlin.jvm.internal.markers.KMappedMarker java.util.List<androidx.compose.ui.text.font.Font> {
+ ctor public FontListFontFamily(java.util.List<? extends androidx.compose.ui.text.font.Font> fonts);
+ method public java.util.List<androidx.compose.ui.text.font.Font> component1();
+ method public boolean contains(androidx.compose.ui.text.font.Font element);
method public boolean containsAll(java.util.Collection<?> elements);
- method @androidx.compose.Immutable public androidx.ui.text.font.FontListFontFamily copy(java.util.List<? extends androidx.ui.text.font.Font> fonts);
- method public androidx.ui.text.font.Font get(int index);
- method public java.util.List<androidx.ui.text.font.Font> getFonts();
+ method @androidx.compose.Immutable public androidx.compose.ui.text.font.FontListFontFamily copy(java.util.List<? extends androidx.compose.ui.text.font.Font> fonts);
+ method public androidx.compose.ui.text.font.Font get(int index);
+ method public java.util.List<androidx.compose.ui.text.font.Font> getFonts();
method public int getSize();
- method public int indexOf(androidx.ui.text.font.Font element);
+ method public int indexOf(androidx.compose.ui.text.font.Font element);
method public boolean isEmpty();
- method public java.util.Iterator<androidx.ui.text.font.Font> iterator();
- method public int lastIndexOf(androidx.ui.text.font.Font element);
- method public java.util.ListIterator<androidx.ui.text.font.Font> listIterator();
- method public java.util.ListIterator<androidx.ui.text.font.Font> listIterator(int index);
- method public java.util.List<androidx.ui.text.font.Font> subList(int fromIndex, int toIndex);
+ method public java.util.Iterator<androidx.compose.ui.text.font.Font> iterator();
+ method public int lastIndexOf(androidx.compose.ui.text.font.Font element);
+ method public java.util.ListIterator<androidx.compose.ui.text.font.Font> listIterator();
+ method public java.util.ListIterator<androidx.compose.ui.text.font.Font> listIterator(int index);
+ method public java.util.List<androidx.compose.ui.text.font.Font> subList(int fromIndex, int toIndex);
}
public enum FontStyle {
- method public static androidx.ui.text.font.FontStyle valueOf(String name) throws java.lang.IllegalArgumentException;
- method public static androidx.ui.text.font.FontStyle[] values();
- enum_constant public static final androidx.ui.text.font.FontStyle Italic;
- enum_constant public static final androidx.ui.text.font.FontStyle Normal;
+ method public static androidx.compose.ui.text.font.FontStyle valueOf(String name) throws java.lang.IllegalArgumentException;
+ method public static androidx.compose.ui.text.font.FontStyle[] values();
+ enum_constant public static final androidx.compose.ui.text.font.FontStyle Italic;
+ enum_constant public static final androidx.compose.ui.text.font.FontStyle Normal;
}
public enum FontSynthesis {
- method public static androidx.ui.text.font.FontSynthesis valueOf(String name) throws java.lang.IllegalArgumentException;
- method public static androidx.ui.text.font.FontSynthesis[] values();
- enum_constant public static final androidx.ui.text.font.FontSynthesis All;
- enum_constant public static final androidx.ui.text.font.FontSynthesis None;
- enum_constant public static final androidx.ui.text.font.FontSynthesis Style;
- enum_constant public static final androidx.ui.text.font.FontSynthesis Weight;
+ method public static androidx.compose.ui.text.font.FontSynthesis valueOf(String name) throws java.lang.IllegalArgumentException;
+ method public static androidx.compose.ui.text.font.FontSynthesis[] values();
+ enum_constant public static final androidx.compose.ui.text.font.FontSynthesis All;
+ enum_constant public static final androidx.compose.ui.text.font.FontSynthesis None;
+ enum_constant public static final androidx.compose.ui.text.font.FontSynthesis Style;
+ enum_constant public static final androidx.compose.ui.text.font.FontSynthesis Weight;
}
- @androidx.compose.Immutable public final class FontWeight implements java.lang.Comparable<androidx.ui.text.font.FontWeight> {
+ @androidx.compose.Immutable public final class FontWeight implements java.lang.Comparable<androidx.compose.ui.text.font.FontWeight> {
ctor public FontWeight(int weight);
- method public int compareTo(androidx.ui.text.font.FontWeight other);
+ method public int compareTo(androidx.compose.ui.text.font.FontWeight other);
method public int component1();
- method @androidx.compose.Immutable public androidx.ui.text.font.FontWeight copy(int weight);
+ method @androidx.compose.Immutable public androidx.compose.ui.text.font.FontWeight copy(int weight);
method public int getWeight();
- field public static final androidx.ui.text.font.FontWeight.Companion Companion;
+ field public static final androidx.compose.ui.text.font.FontWeight.Companion Companion;
}
public static final class FontWeight.Companion {
- method public androidx.ui.text.font.FontWeight getBlack();
- method public androidx.ui.text.font.FontWeight getBold();
- method public androidx.ui.text.font.FontWeight getExtraBold();
- method public androidx.ui.text.font.FontWeight getExtraLight();
- method public androidx.ui.text.font.FontWeight getLight();
- method public androidx.ui.text.font.FontWeight getMedium();
- method public androidx.ui.text.font.FontWeight getNormal();
- method public androidx.ui.text.font.FontWeight getSemiBold();
- method public androidx.ui.text.font.FontWeight getThin();
- method public androidx.ui.text.font.FontWeight getW100();
- method public androidx.ui.text.font.FontWeight getW200();
- method public androidx.ui.text.font.FontWeight getW300();
- method public androidx.ui.text.font.FontWeight getW400();
- method public androidx.ui.text.font.FontWeight getW500();
- method public androidx.ui.text.font.FontWeight getW600();
- method public androidx.ui.text.font.FontWeight getW700();
- method public androidx.ui.text.font.FontWeight getW800();
- method public androidx.ui.text.font.FontWeight getW900();
- property public final androidx.ui.text.font.FontWeight Black;
- property public final androidx.ui.text.font.FontWeight Bold;
- property public final androidx.ui.text.font.FontWeight ExtraBold;
- property public final androidx.ui.text.font.FontWeight ExtraLight;
- property public final androidx.ui.text.font.FontWeight Light;
- property public final androidx.ui.text.font.FontWeight Medium;
- property public final androidx.ui.text.font.FontWeight Normal;
- property public final androidx.ui.text.font.FontWeight SemiBold;
- property public final androidx.ui.text.font.FontWeight Thin;
- property public final androidx.ui.text.font.FontWeight W100;
- property public final androidx.ui.text.font.FontWeight W200;
- property public final androidx.ui.text.font.FontWeight W300;
- property public final androidx.ui.text.font.FontWeight W400;
- property public final androidx.ui.text.font.FontWeight W500;
- property public final androidx.ui.text.font.FontWeight W600;
- property public final androidx.ui.text.font.FontWeight W700;
- property public final androidx.ui.text.font.FontWeight W800;
- property public final androidx.ui.text.font.FontWeight W900;
+ method public androidx.compose.ui.text.font.FontWeight getBlack();
+ method public androidx.compose.ui.text.font.FontWeight getBold();
+ method public androidx.compose.ui.text.font.FontWeight getExtraBold();
+ method public androidx.compose.ui.text.font.FontWeight getExtraLight();
+ method public androidx.compose.ui.text.font.FontWeight getLight();
+ method public androidx.compose.ui.text.font.FontWeight getMedium();
+ method public androidx.compose.ui.text.font.FontWeight getNormal();
+ method public androidx.compose.ui.text.font.FontWeight getSemiBold();
+ method public androidx.compose.ui.text.font.FontWeight getThin();
+ method public androidx.compose.ui.text.font.FontWeight getW100();
+ method public androidx.compose.ui.text.font.FontWeight getW200();
+ method public androidx.compose.ui.text.font.FontWeight getW300();
+ method public androidx.compose.ui.text.font.FontWeight getW400();
+ method public androidx.compose.ui.text.font.FontWeight getW500();
+ method public androidx.compose.ui.text.font.FontWeight getW600();
+ method public androidx.compose.ui.text.font.FontWeight getW700();
+ method public androidx.compose.ui.text.font.FontWeight getW800();
+ method public androidx.compose.ui.text.font.FontWeight getW900();
+ property public final androidx.compose.ui.text.font.FontWeight Black;
+ property public final androidx.compose.ui.text.font.FontWeight Bold;
+ property public final androidx.compose.ui.text.font.FontWeight ExtraBold;
+ property public final androidx.compose.ui.text.font.FontWeight ExtraLight;
+ property public final androidx.compose.ui.text.font.FontWeight Light;
+ property public final androidx.compose.ui.text.font.FontWeight Medium;
+ property public final androidx.compose.ui.text.font.FontWeight Normal;
+ property public final androidx.compose.ui.text.font.FontWeight SemiBold;
+ property public final androidx.compose.ui.text.font.FontWeight Thin;
+ property public final androidx.compose.ui.text.font.FontWeight W100;
+ property public final androidx.compose.ui.text.font.FontWeight W200;
+ property public final androidx.compose.ui.text.font.FontWeight W300;
+ property public final androidx.compose.ui.text.font.FontWeight W400;
+ property public final androidx.compose.ui.text.font.FontWeight W500;
+ property public final androidx.compose.ui.text.font.FontWeight W600;
+ property public final androidx.compose.ui.text.font.FontWeight W700;
+ property public final androidx.compose.ui.text.font.FontWeight W800;
+ property public final androidx.compose.ui.text.font.FontWeight W900;
}
public final class FontWeightKt {
- method public static androidx.ui.text.font.FontWeight lerp(androidx.ui.text.font.FontWeight start, androidx.ui.text.font.FontWeight stop, float fraction);
+ method public static androidx.compose.ui.text.font.FontWeight lerp(androidx.compose.ui.text.font.FontWeight start, androidx.compose.ui.text.font.FontWeight stop, float fraction);
}
- @androidx.compose.Immutable public final class GenericFontFamily extends androidx.ui.text.font.SystemFontFamily {
+ @androidx.compose.Immutable public final class GenericFontFamily extends androidx.compose.ui.text.font.SystemFontFamily {
method public String getName();
}
- public final class LoadedFontFamily extends androidx.ui.text.font.FontFamily {
- ctor public LoadedFontFamily(androidx.ui.text.Typeface typeface);
- method public androidx.ui.text.Typeface component1();
- method public androidx.ui.text.font.LoadedFontFamily copy(androidx.ui.text.Typeface typeface);
- method public androidx.ui.text.Typeface getTypeface();
+ public final class LoadedFontFamily extends androidx.compose.ui.text.font.FontFamily {
+ ctor public LoadedFontFamily(androidx.compose.ui.text.Typeface typeface);
+ method public androidx.compose.ui.text.Typeface component1();
+ method public androidx.compose.ui.text.font.LoadedFontFamily copy(androidx.compose.ui.text.Typeface typeface);
+ method public androidx.compose.ui.text.Typeface getTypeface();
}
- public final class ResourceFont implements androidx.ui.text.font.Font {
- ctor public ResourceFont(int resId, androidx.ui.text.font.FontWeight weight, androidx.ui.text.font.FontStyle style);
+ public final class ResourceFont implements androidx.compose.ui.text.font.Font {
+ ctor public ResourceFont(int resId, androidx.compose.ui.text.font.FontWeight weight, androidx.compose.ui.text.font.FontStyle style);
method public int component1();
- method public androidx.ui.text.font.FontWeight component2();
- method public androidx.ui.text.font.FontStyle component3();
- method public androidx.ui.text.font.ResourceFont copy(int resId, androidx.ui.text.font.FontWeight weight, androidx.ui.text.font.FontStyle style);
+ method public androidx.compose.ui.text.font.FontWeight component2();
+ method public androidx.compose.ui.text.font.FontStyle component3();
+ method public androidx.compose.ui.text.font.ResourceFont copy(int resId, androidx.compose.ui.text.font.FontWeight weight, androidx.compose.ui.text.font.FontStyle style);
method public int getResId();
- method public androidx.ui.text.font.FontStyle getStyle();
- method public androidx.ui.text.font.FontWeight getWeight();
+ method public androidx.compose.ui.text.font.FontStyle getStyle();
+ method public androidx.compose.ui.text.font.FontWeight getWeight();
}
- public abstract sealed class SystemFontFamily extends androidx.ui.text.font.FontFamily {
+ public abstract sealed class SystemFontFamily extends androidx.compose.ui.text.font.FontFamily {
}
}
-package androidx.ui.text.platform {
+package androidx.compose.ui.text.input {
+
+ public final class BackspaceKeyEditOp implements androidx.compose.ui.text.input.EditOperation {
+ ctor public BackspaceKeyEditOp();
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public final class CommitTextEditOp implements androidx.compose.ui.text.input.EditOperation {
+ ctor public CommitTextEditOp(String text, int newCursorPosition);
+ method public String component1();
+ method public int component2();
+ method public androidx.compose.ui.text.input.CommitTextEditOp copy(String text, int newCursorPosition);
+ method public int getNewCursorPosition();
+ method public String getText();
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public final class DeleteAllEditOp implements androidx.compose.ui.text.input.EditOperation {
+ ctor public DeleteAllEditOp();
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public final class DeleteSurroundingTextEditOp implements androidx.compose.ui.text.input.EditOperation {
+ ctor public DeleteSurroundingTextEditOp(int beforeLength, int afterLength);
+ method public int component1();
+ method public int component2();
+ method public androidx.compose.ui.text.input.DeleteSurroundingTextEditOp copy(int beforeLength, int afterLength);
+ method public int getAfterLength();
+ method public int getBeforeLength();
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public final class DeleteSurroundingTextInCodePointsEditOp implements androidx.compose.ui.text.input.EditOperation {
+ ctor public DeleteSurroundingTextInCodePointsEditOp(int beforeLength, int afterLength);
+ method public int component1();
+ method public int component2();
+ method public androidx.compose.ui.text.input.DeleteSurroundingTextInCodePointsEditOp copy(int beforeLength, int afterLength);
+ method public int getAfterLength();
+ method public int getBeforeLength();
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public interface EditOperation {
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public final class EditingBuffer {
+ ctor public EditingBuffer(String initialText, androidx.compose.ui.text.TextRange initialSelection);
+ field public static final int NOWHERE = -1; // 0xffffffff
+ }
+
+ @Deprecated @androidx.compose.Immutable public final class EditorValue {
+ ctor @Deprecated public EditorValue(String text, androidx.compose.ui.text.TextRange selection, androidx.compose.ui.text.TextRange? composition);
+ ctor @Deprecated public EditorValue();
+ method @Deprecated public String component1();
+ method @Deprecated public androidx.compose.ui.text.TextRange component2();
+ method @Deprecated public androidx.compose.ui.text.TextRange? component3();
+ method @Deprecated @androidx.compose.Immutable public androidx.compose.ui.text.input.EditorValue copy(String text, androidx.compose.ui.text.TextRange selection, androidx.compose.ui.text.TextRange? composition);
+ method @Deprecated public androidx.compose.ui.text.TextRange? getComposition();
+ method @Deprecated public String getSelectedText();
+ method @Deprecated public androidx.compose.ui.text.TextRange getSelection();
+ method @Deprecated public String getText();
+ method @Deprecated public String getTextAfterSelection(int maxChars);
+ method @Deprecated public String getTextBeforeSelection(int maxChars);
+ }
+
+ public final class FinishComposingTextEditOp implements androidx.compose.ui.text.input.EditOperation {
+ ctor public FinishComposingTextEditOp();
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public final class GapBufferKt {
+ }
+
+ public enum ImeAction {
+ method public static androidx.compose.ui.text.input.ImeAction valueOf(String name) throws java.lang.IllegalArgumentException;
+ method public static androidx.compose.ui.text.input.ImeAction[] values();
+ enum_constant public static final androidx.compose.ui.text.input.ImeAction Done;
+ enum_constant public static final androidx.compose.ui.text.input.ImeAction Go;
+ enum_constant public static final androidx.compose.ui.text.input.ImeAction Next;
+ enum_constant public static final androidx.compose.ui.text.input.ImeAction NoAction;
+ enum_constant public static final androidx.compose.ui.text.input.ImeAction Previous;
+ enum_constant public static final androidx.compose.ui.text.input.ImeAction Search;
+ enum_constant public static final androidx.compose.ui.text.input.ImeAction Send;
+ enum_constant public static final androidx.compose.ui.text.input.ImeAction Unspecified;
+ }
+
+ public interface InputEventListener {
+ method public void onEditOperations(java.util.List<? extends androidx.compose.ui.text.input.EditOperation> editOps);
+ method public void onImeAction(androidx.compose.ui.text.input.ImeAction imeAction);
+ }
+
+ public enum KeyboardType {
+ method public static androidx.compose.ui.text.input.KeyboardType valueOf(String name) throws java.lang.IllegalArgumentException;
+ method public static androidx.compose.ui.text.input.KeyboardType[] values();
+ enum_constant public static final androidx.compose.ui.text.input.KeyboardType Ascii;
+ enum_constant public static final androidx.compose.ui.text.input.KeyboardType Email;
+ enum_constant public static final androidx.compose.ui.text.input.KeyboardType Number;
+ enum_constant public static final androidx.compose.ui.text.input.KeyboardType NumberPassword;
+ enum_constant public static final androidx.compose.ui.text.input.KeyboardType Password;
+ enum_constant public static final androidx.compose.ui.text.input.KeyboardType Phone;
+ enum_constant public static final androidx.compose.ui.text.input.KeyboardType Text;
+ enum_constant public static final androidx.compose.ui.text.input.KeyboardType Uri;
+ }
+
+ public final class MoveCursorEditOp implements androidx.compose.ui.text.input.EditOperation {
+ ctor public MoveCursorEditOp(int amount);
+ method public int component1();
+ method public androidx.compose.ui.text.input.MoveCursorEditOp copy(int amount);
+ method public int getAmount();
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public interface OffsetMap {
+ method public int originalToTransformed(int offset);
+ method public int transformedToOriginal(int offset);
+ field public static final androidx.compose.ui.text.input.OffsetMap.Companion Companion;
+ }
+
+ public static final class OffsetMap.Companion {
+ method public androidx.compose.ui.text.input.OffsetMap getIdentityOffsetMap();
+ property public final androidx.compose.ui.text.input.OffsetMap identityOffsetMap;
+ }
+
+ public final class PasswordVisualTransformation implements androidx.compose.ui.text.input.VisualTransformation {
+ ctor public PasswordVisualTransformation(char mask);
+ ctor public PasswordVisualTransformation();
+ method public char component1();
+ method public androidx.compose.ui.text.input.PasswordVisualTransformation copy(char mask);
+ method public androidx.compose.ui.text.input.TransformedText filter(androidx.compose.ui.text.AnnotatedString text);
+ method public char getMask();
+ }
+
+ public interface PlatformTextInputService {
+ method public void hideSoftwareKeyboard();
+ method public void notifyFocusedRect(androidx.ui.geometry.Rect rect);
+ method public void onStateUpdated(androidx.compose.ui.text.input.TextFieldValue value);
+ method public void showSoftwareKeyboard();
+ method public void startInput(androidx.compose.ui.text.input.TextFieldValue value, androidx.compose.ui.text.input.KeyboardType keyboardType, androidx.compose.ui.text.input.ImeAction imeAction, kotlin.jvm.functions.Function1<? super java.util.List<? extends androidx.compose.ui.text.input.EditOperation>,kotlin.Unit> onEditCommand, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.ImeAction,kotlin.Unit> onImeActionPerformed);
+ method public void stopInput();
+ }
+
+ public final class SetComposingRegionEditOp implements androidx.compose.ui.text.input.EditOperation {
+ ctor public SetComposingRegionEditOp(int start, int end);
+ method public int component1();
+ method public int component2();
+ method public androidx.compose.ui.text.input.SetComposingRegionEditOp copy(int start, int end);
+ method public int getEnd();
+ method public int getStart();
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public final class SetComposingTextEditOp implements androidx.compose.ui.text.input.EditOperation {
+ ctor public SetComposingTextEditOp(String text, int newCursorPosition);
+ method public String component1();
+ method public int component2();
+ method public androidx.compose.ui.text.input.SetComposingTextEditOp copy(String text, int newCursorPosition);
+ method public int getNewCursorPosition();
+ method public String getText();
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public final class SetSelectionEditOp implements androidx.compose.ui.text.input.EditOperation {
+ ctor public SetSelectionEditOp(int start, int end);
+ method public int component1();
+ method public int component2();
+ method public androidx.compose.ui.text.input.SetSelectionEditOp copy(int start, int end);
+ method public int getEnd();
+ method public int getStart();
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ @androidx.compose.Immutable public final class TextFieldValue {
+ ctor public TextFieldValue(String text, androidx.compose.ui.text.TextRange selection, androidx.compose.ui.text.TextRange? composition);
+ ctor public TextFieldValue();
+ method public String component1();
+ method public androidx.compose.ui.text.TextRange component2();
+ method public androidx.compose.ui.text.TextRange? component3();
+ method @androidx.compose.Immutable public androidx.compose.ui.text.input.TextFieldValue copy(String text, androidx.compose.ui.text.TextRange selection, androidx.compose.ui.text.TextRange? composition);
+ method public androidx.compose.ui.text.TextRange? getComposition();
+ method public androidx.compose.ui.text.TextRange getSelection();
+ method public String getText();
+ field public static final androidx.compose.ui.text.input.TextFieldValue.Companion Companion;
+ }
+
+ public static final class TextFieldValue.Companion {
+ method public androidx.compose.runtime.savedinstancestate.Saver<androidx.compose.ui.text.input.TextFieldValue,java.lang.Object> getSaver();
+ property public final androidx.compose.runtime.savedinstancestate.Saver<androidx.compose.ui.text.input.TextFieldValue,java.lang.Object> Saver;
+ }
+
+ public final class TextFieldValueKt {
+ method public static String getSelectedText(androidx.compose.ui.text.input.TextFieldValue);
+ method public static String getTextAfterSelection(androidx.compose.ui.text.input.TextFieldValue, int maxChars);
+ method public static String getTextBeforeSelection(androidx.compose.ui.text.input.TextFieldValue, int maxChars);
+ }
+
+ public class TextInputService {
+ ctor public TextInputService(androidx.compose.ui.text.input.PlatformTextInputService platformTextInputService);
+ method public void hideSoftwareKeyboard(int token);
+ method public void notifyFocusedRect(int token, androidx.ui.geometry.Rect rect);
+ method public void onStateUpdated(int token, androidx.compose.ui.text.input.TextFieldValue value);
+ method public void showSoftwareKeyboard(int token);
+ method public int startInput(androidx.compose.ui.text.input.TextFieldValue value, androidx.compose.ui.text.input.KeyboardType keyboardType, androidx.compose.ui.text.input.ImeAction imeAction, kotlin.jvm.functions.Function1<? super java.util.List<? extends androidx.compose.ui.text.input.EditOperation>,kotlin.Unit> onEditCommand, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.ImeAction,kotlin.Unit> onImeActionPerformed);
+ method public void stopInput(int token);
+ }
+
+ public final class TextInputServiceKt {
+ method @Deprecated public static kotlin.jvm.functions.Function1<androidx.compose.ui.text.input.PlatformTextInputService,androidx.compose.ui.text.input.TextInputService> getTextInputServiceFactory();
+ method @Deprecated public static void setTextInputServiceFactory(kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.PlatformTextInputService,? extends androidx.compose.ui.text.input.TextInputService> p);
+ field public static final int INVALID_SESSION = -1; // 0xffffffff
+ field public static final int NO_SESSION = 0; // 0x0
+ }
+
+ public final class TransformedText {
+ ctor public TransformedText(androidx.compose.ui.text.AnnotatedString transformedText, androidx.compose.ui.text.input.OffsetMap offsetMap);
+ method public androidx.compose.ui.text.AnnotatedString component1();
+ method public androidx.compose.ui.text.input.OffsetMap component2();
+ method public androidx.compose.ui.text.input.TransformedText copy(androidx.compose.ui.text.AnnotatedString transformedText, androidx.compose.ui.text.input.OffsetMap offsetMap);
+ method public androidx.compose.ui.text.input.OffsetMap getOffsetMap();
+ method public androidx.compose.ui.text.AnnotatedString getTransformedText();
+ }
+
+ @androidx.compose.Immutable public interface VisualTransformation {
+ method public androidx.compose.ui.text.input.TransformedText filter(androidx.compose.ui.text.AnnotatedString text);
+ field public static final androidx.compose.ui.text.input.VisualTransformation.Companion Companion;
+ }
+
+ public static final class VisualTransformation.Companion {
+ method public androidx.compose.ui.text.input.VisualTransformation getNone();
+ property public final androidx.compose.ui.text.input.VisualTransformation None;
+ }
+
+}
+
+package androidx.compose.ui.text.intl {
+
+ public final class AndroidPlatformLocaleKt {
+ }
+
+ @androidx.compose.Immutable public final class Locale {
+ ctor public Locale(String languageTag);
+ method public String getLanguage();
+ method public String getRegion();
+ method public String getScript();
+ method public String toLanguageTag();
+ property public final String language;
+ property public final String region;
+ property public final String script;
+ field public static final androidx.compose.ui.text.intl.Locale.Companion Companion;
+ }
+
+ public static final class Locale.Companion {
+ method public androidx.compose.ui.text.intl.Locale getCurrent();
+ property public final androidx.compose.ui.text.intl.Locale current;
+ }
+
+ @androidx.compose.Immutable public final class LocaleList implements java.util.Collection<androidx.compose.ui.text.intl.Locale> kotlin.jvm.internal.markers.KMappedMarker {
+ ctor public LocaleList(java.util.List<androidx.compose.ui.text.intl.Locale> localeList);
+ ctor public LocaleList(String languageTags);
+ ctor public LocaleList(androidx.compose.ui.text.intl.Locale... locales);
+ method public java.util.List<androidx.compose.ui.text.intl.Locale> component1();
+ method public operator boolean contains(androidx.compose.ui.text.intl.Locale element);
+ method public boolean containsAll(java.util.Collection<?> elements);
+ method @androidx.compose.Immutable public androidx.compose.ui.text.intl.LocaleList copy(java.util.List<androidx.compose.ui.text.intl.Locale> localeList);
+ method public operator androidx.compose.ui.text.intl.Locale get(int i);
+ method public java.util.List<androidx.compose.ui.text.intl.Locale> getLocaleList();
+ method public int getSize();
+ method public boolean isEmpty();
+ method public java.util.Iterator<androidx.compose.ui.text.intl.Locale> iterator();
+ property public int size;
+ field public static final androidx.compose.ui.text.intl.LocaleList.Companion Companion;
+ }
+
+ public static final class LocaleList.Companion {
+ method public androidx.compose.ui.text.intl.LocaleList getCurrent();
+ property public final androidx.compose.ui.text.intl.LocaleList current;
+ }
+
+ public final class PlatformLocaleKt {
+ }
+
+}
+
+package androidx.compose.ui.text.platform {
public final class AndroidParagraphHelperKt {
}
public final class AndroidParagraphIntrinsicsKt {
- method @Deprecated public static kotlin.jvm.functions.Function6<java.lang.String,androidx.ui.text.TextStyle,java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.SpanStyle>>,java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>>,androidx.ui.unit.Density,androidx.ui.text.font.Font.ResourceLoader,androidx.ui.text.ParagraphIntrinsics> getParagraphIntrinsicsActualFactory();
- method @Deprecated public static void setParagraphIntrinsicsActualFactory(kotlin.jvm.functions.Function6<? super java.lang.String,? super androidx.ui.text.TextStyle,? super java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.SpanStyle>>,? super java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>>,? super androidx.ui.unit.Density,? super androidx.ui.text.font.Font.ResourceLoader,? extends androidx.ui.text.ParagraphIntrinsics> p);
+ method @Deprecated public static kotlin.jvm.functions.Function6<java.lang.String,androidx.compose.ui.text.TextStyle,java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>>,java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>>,androidx.ui.unit.Density,androidx.compose.ui.text.font.Font.ResourceLoader,androidx.compose.ui.text.ParagraphIntrinsics> getParagraphIntrinsicsActualFactory();
+ method @Deprecated public static void setParagraphIntrinsicsActualFactory(kotlin.jvm.functions.Function6<? super java.lang.String,? super androidx.compose.ui.text.TextStyle,? super java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>>,? super java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>>,? super androidx.ui.unit.Density,? super androidx.compose.ui.text.font.Font.ResourceLoader,? extends androidx.compose.ui.text.ParagraphIntrinsics> p);
}
public final class AndroidParagraphKt {
- method @Deprecated public static kotlin.jvm.functions.Function4<androidx.ui.text.ParagraphIntrinsics,java.lang.Integer,java.lang.Boolean,androidx.ui.text.ParagraphConstraints,androidx.ui.text.Paragraph> getParagraphActualFactory();
- method @Deprecated public static void setParagraphActualFactory(kotlin.jvm.functions.Function4<? super androidx.ui.text.ParagraphIntrinsics,? super java.lang.Integer,? super java.lang.Boolean,? super androidx.ui.text.ParagraphConstraints,? extends androidx.ui.text.Paragraph> p);
+ method @Deprecated public static kotlin.jvm.functions.Function4<androidx.compose.ui.text.ParagraphIntrinsics,java.lang.Integer,java.lang.Boolean,androidx.compose.ui.text.ParagraphConstraints,androidx.compose.ui.text.Paragraph> getParagraphActualFactory();
+ method @Deprecated public static void setParagraphActualFactory(kotlin.jvm.functions.Function4<? super androidx.compose.ui.text.ParagraphIntrinsics,? super java.lang.Integer,? super java.lang.Boolean,? super androidx.compose.ui.text.ParagraphConstraints,? extends androidx.compose.ui.text.Paragraph> p);
}
public final class AndroidStringDelegateKt {
}
public final class TypefaceAdapterKt {
- method public static androidx.ui.text.Typeface typefaceFromFontFamily(android.content.Context context, androidx.ui.text.font.FontFamily fontFamily, java.util.List<? extends kotlin.Pair<androidx.ui.text.font.FontWeight,? extends androidx.ui.text.font.FontStyle>>? necessaryStyles = null);
+ method public static androidx.compose.ui.text.Typeface typefaceFromFontFamily(android.content.Context context, androidx.compose.ui.text.font.FontFamily fontFamily, java.util.List<? extends kotlin.Pair<androidx.compose.ui.text.font.FontWeight,? extends androidx.compose.ui.text.font.FontStyle>>? necessaryStyles = null);
}
}
-package androidx.ui.text.platform.extensions {
+package androidx.compose.ui.text.platform.extensions {
public final class LocaleExtensionsKt {
}
@@ -942,7 +942,7 @@
}
-package androidx.ui.text.style {
+package androidx.compose.ui.text.style {
@androidx.compose.Immutable public final inline class BaselineShift {
ctor public BaselineShift();
@@ -952,7 +952,7 @@
method public float getMultiplier();
method @androidx.compose.Immutable public static inline int hashCode-impl(float p);
method @androidx.compose.Immutable public static inline String! toString-impl(float p);
- field public static final androidx.ui.text.style.BaselineShift.Companion Companion;
+ field public static final androidx.compose.ui.text.style.BaselineShift.Companion Companion;
}
public static final class BaselineShift.Companion {
@@ -965,54 +965,54 @@
}
public final class BaselineShiftKt {
- method @androidx.compose.Stable public static float lerp-7csQwvo(float start, float stop, float fraction);
+ method @androidx.compose.Stable public static float lerp-ylBt8J4(float start, float stop, float fraction);
}
public enum ResolvedTextDirection {
- method public static androidx.ui.text.style.ResolvedTextDirection valueOf(String name) throws java.lang.IllegalArgumentException;
- method public static androidx.ui.text.style.ResolvedTextDirection[] values();
- enum_constant public static final androidx.ui.text.style.ResolvedTextDirection Ltr;
- enum_constant public static final androidx.ui.text.style.ResolvedTextDirection Rtl;
+ method public static androidx.compose.ui.text.style.ResolvedTextDirection valueOf(String name) throws java.lang.IllegalArgumentException;
+ method public static androidx.compose.ui.text.style.ResolvedTextDirection[] values();
+ enum_constant public static final androidx.compose.ui.text.style.ResolvedTextDirection Ltr;
+ enum_constant public static final androidx.compose.ui.text.style.ResolvedTextDirection Rtl;
}
public enum TextAlign {
- method public static androidx.ui.text.style.TextAlign valueOf(String name) throws java.lang.IllegalArgumentException;
- method public static androidx.ui.text.style.TextAlign[] values();
- enum_constant public static final androidx.ui.text.style.TextAlign Center;
- enum_constant public static final androidx.ui.text.style.TextAlign End;
- enum_constant public static final androidx.ui.text.style.TextAlign Justify;
- enum_constant public static final androidx.ui.text.style.TextAlign Left;
- enum_constant public static final androidx.ui.text.style.TextAlign Right;
- enum_constant public static final androidx.ui.text.style.TextAlign Start;
+ method public static androidx.compose.ui.text.style.TextAlign valueOf(String name) throws java.lang.IllegalArgumentException;
+ method public static androidx.compose.ui.text.style.TextAlign[] values();
+ enum_constant public static final androidx.compose.ui.text.style.TextAlign Center;
+ enum_constant public static final androidx.compose.ui.text.style.TextAlign End;
+ enum_constant public static final androidx.compose.ui.text.style.TextAlign Justify;
+ enum_constant public static final androidx.compose.ui.text.style.TextAlign Left;
+ enum_constant public static final androidx.compose.ui.text.style.TextAlign Right;
+ enum_constant public static final androidx.compose.ui.text.style.TextAlign Start;
}
@androidx.compose.Immutable public final class TextDecoration {
method public int component1();
- method public operator boolean contains(androidx.ui.text.style.TextDecoration other);
- method @androidx.compose.Immutable public androidx.ui.text.style.TextDecoration copy(int mask);
+ method public operator boolean contains(androidx.compose.ui.text.style.TextDecoration other);
+ method @androidx.compose.Immutable public androidx.compose.ui.text.style.TextDecoration copy(int mask);
method public int getMask();
- method public operator androidx.ui.text.style.TextDecoration plus(androidx.ui.text.style.TextDecoration decoration);
- field public static final androidx.ui.text.style.TextDecoration.Companion Companion;
+ method public operator androidx.compose.ui.text.style.TextDecoration plus(androidx.compose.ui.text.style.TextDecoration decoration);
+ field public static final androidx.compose.ui.text.style.TextDecoration.Companion Companion;
}
public static final class TextDecoration.Companion {
- method public androidx.ui.text.style.TextDecoration combine(java.util.List<androidx.ui.text.style.TextDecoration> decorations);
- method public androidx.ui.text.style.TextDecoration getLineThrough();
- method public androidx.ui.text.style.TextDecoration getNone();
- method public androidx.ui.text.style.TextDecoration getUnderline();
- property public final androidx.ui.text.style.TextDecoration LineThrough;
- property public final androidx.ui.text.style.TextDecoration None;
- property public final androidx.ui.text.style.TextDecoration Underline;
+ method public androidx.compose.ui.text.style.TextDecoration combine(java.util.List<androidx.compose.ui.text.style.TextDecoration> decorations);
+ method public androidx.compose.ui.text.style.TextDecoration getLineThrough();
+ method public androidx.compose.ui.text.style.TextDecoration getNone();
+ method public androidx.compose.ui.text.style.TextDecoration getUnderline();
+ property public final androidx.compose.ui.text.style.TextDecoration LineThrough;
+ property public final androidx.compose.ui.text.style.TextDecoration None;
+ property public final androidx.compose.ui.text.style.TextDecoration Underline;
}
public enum TextDirection {
- method public static androidx.ui.text.style.TextDirection valueOf(String name) throws java.lang.IllegalArgumentException;
- method public static androidx.ui.text.style.TextDirection[] values();
- enum_constant public static final androidx.ui.text.style.TextDirection Content;
- enum_constant public static final androidx.ui.text.style.TextDirection ContentOrLtr;
- enum_constant public static final androidx.ui.text.style.TextDirection ContentOrRtl;
- enum_constant public static final androidx.ui.text.style.TextDirection Ltr;
- enum_constant public static final androidx.ui.text.style.TextDirection Rtl;
+ method public static androidx.compose.ui.text.style.TextDirection valueOf(String name) throws java.lang.IllegalArgumentException;
+ method public static androidx.compose.ui.text.style.TextDirection[] values();
+ enum_constant public static final androidx.compose.ui.text.style.TextDirection Content;
+ enum_constant public static final androidx.compose.ui.text.style.TextDirection ContentOrLtr;
+ enum_constant public static final androidx.compose.ui.text.style.TextDirection ContentOrRtl;
+ enum_constant public static final androidx.compose.ui.text.style.TextDirection Ltr;
+ enum_constant public static final androidx.compose.ui.text.style.TextDirection Rtl;
}
@androidx.compose.Immutable public final class TextGeometricTransform {
@@ -1020,42 +1020,42 @@
ctor public TextGeometricTransform();
method public float component1();
method public float component2();
- method @androidx.compose.Immutable public androidx.ui.text.style.TextGeometricTransform copy(float scaleX, float skewX);
+ method @androidx.compose.Immutable public androidx.compose.ui.text.style.TextGeometricTransform copy(float scaleX, float skewX);
method public float getScaleX();
method public float getSkewX();
- field public static final androidx.ui.text.style.TextGeometricTransform.Companion Companion;
+ field public static final androidx.compose.ui.text.style.TextGeometricTransform.Companion Companion;
}
public static final class TextGeometricTransform.Companion {
}
public final class TextGeometricTransformKt {
- method public static androidx.ui.text.style.TextGeometricTransform lerp(androidx.ui.text.style.TextGeometricTransform start, androidx.ui.text.style.TextGeometricTransform stop, float fraction);
+ method public static androidx.compose.ui.text.style.TextGeometricTransform lerp(androidx.compose.ui.text.style.TextGeometricTransform start, androidx.compose.ui.text.style.TextGeometricTransform stop, float fraction);
}
@androidx.compose.Immutable public final class TextIndent {
method public long component1();
method public long component2();
- method @androidx.compose.Immutable public androidx.ui.text.style.TextIndent copy-gL_aCS0(long firstLine, long restLine);
+ method @androidx.compose.Immutable public androidx.compose.ui.text.style.TextIndent copy-gL_aCS0(long firstLine, long restLine);
method public long getFirstLine();
method public long getRestLine();
- field public static final androidx.ui.text.style.TextIndent.Companion Companion;
+ field public static final androidx.compose.ui.text.style.TextIndent.Companion Companion;
}
public static final class TextIndent.Companion {
- method public androidx.ui.text.style.TextIndent getNone();
- property public final androidx.ui.text.style.TextIndent None;
+ method public androidx.compose.ui.text.style.TextIndent getNone();
+ property public final androidx.compose.ui.text.style.TextIndent None;
}
public final class TextIndentKt {
- method public static androidx.ui.text.style.TextIndent lerp(androidx.ui.text.style.TextIndent start, androidx.ui.text.style.TextIndent stop, float fraction);
+ 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);
}
public enum TextOverflow {
- method public static androidx.ui.text.style.TextOverflow valueOf(String name) throws java.lang.IllegalArgumentException;
- method public static androidx.ui.text.style.TextOverflow[] values();
- enum_constant public static final androidx.ui.text.style.TextOverflow Clip;
- enum_constant public static final androidx.ui.text.style.TextOverflow Ellipsis;
+ method public static androidx.compose.ui.text.style.TextOverflow valueOf(String name) throws java.lang.IllegalArgumentException;
+ method public static androidx.compose.ui.text.style.TextOverflow[] values();
+ enum_constant public static final androidx.compose.ui.text.style.TextOverflow Clip;
+ enum_constant public static final androidx.compose.ui.text.style.TextOverflow Ellipsis;
}
}
diff --git a/ui/ui-text-core/api/api_lint.ignore b/ui/ui-text-core/api/api_lint.ignore
index 59bb5d5..b49230e 100644
--- a/ui/ui-text-core/api/api_lint.ignore
+++ b/ui/ui-text-core/api/api_lint.ignore
@@ -1,43 +1,43 @@
// Baseline format: 1.0
-BuilderSetStyle: androidx.ui.text.AnnotatedString.Builder#append(String):
- Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.ui.text.AnnotatedString.Builder.append(String)
-BuilderSetStyle: androidx.ui.text.AnnotatedString.Builder#append(androidx.ui.text.AnnotatedString):
- Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.ui.text.AnnotatedString.Builder.append(androidx.ui.text.AnnotatedString)
-BuilderSetStyle: androidx.ui.text.AnnotatedString.Builder#append(char):
- Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.ui.text.AnnotatedString.Builder.append(char)
-BuilderSetStyle: androidx.ui.text.AnnotatedString.Builder#pop():
- Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.ui.text.AnnotatedString.Builder.pop()
-BuilderSetStyle: androidx.ui.text.AnnotatedString.Builder#pop(int):
- Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.ui.text.AnnotatedString.Builder.pop(int)
-BuilderSetStyle: androidx.ui.text.AnnotatedString.Builder#pushStringAnnotation(String, String):
- Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.ui.text.AnnotatedString.Builder.pushStringAnnotation(String,String)
-BuilderSetStyle: androidx.ui.text.AnnotatedString.Builder#pushStyle(androidx.ui.text.ParagraphStyle):
- Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.ui.text.AnnotatedString.Builder.pushStyle(androidx.ui.text.ParagraphStyle)
-BuilderSetStyle: androidx.ui.text.AnnotatedString.Builder#pushStyle(androidx.ui.text.SpanStyle):
- Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.ui.text.AnnotatedString.Builder.pushStyle(androidx.ui.text.SpanStyle)
-BuilderSetStyle: androidx.ui.text.AnnotatedString.Builder#toAnnotatedString():
- Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.ui.text.AnnotatedString.Builder.toAnnotatedString()
-BuilderSetStyle: androidx.ui.text.AnnotatedString.Builder#toString():
- Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.ui.text.AnnotatedString.Builder.toString()
+BuilderSetStyle: androidx.compose.ui.text.AnnotatedString.Builder#append(String):
+ Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.compose.ui.text.AnnotatedString.Builder.append(String)
+BuilderSetStyle: androidx.compose.ui.text.AnnotatedString.Builder#append(androidx.compose.ui.text.AnnotatedString):
+ Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.compose.ui.text.AnnotatedString.Builder.append(androidx.compose.ui.text.AnnotatedString)
+BuilderSetStyle: androidx.compose.ui.text.AnnotatedString.Builder#append(char):
+ Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.compose.ui.text.AnnotatedString.Builder.append(char)
+BuilderSetStyle: androidx.compose.ui.text.AnnotatedString.Builder#pop():
+ Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.compose.ui.text.AnnotatedString.Builder.pop()
+BuilderSetStyle: androidx.compose.ui.text.AnnotatedString.Builder#pop(int):
+ Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.compose.ui.text.AnnotatedString.Builder.pop(int)
+BuilderSetStyle: androidx.compose.ui.text.AnnotatedString.Builder#pushStringAnnotation(String, String):
+ Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.compose.ui.text.AnnotatedString.Builder.pushStringAnnotation(String,String)
+BuilderSetStyle: androidx.compose.ui.text.AnnotatedString.Builder#pushStyle(androidx.compose.ui.text.ParagraphStyle):
+ Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.compose.ui.text.AnnotatedString.Builder.pushStyle(androidx.compose.ui.text.ParagraphStyle)
+BuilderSetStyle: androidx.compose.ui.text.AnnotatedString.Builder#pushStyle(androidx.compose.ui.text.SpanStyle):
+ Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.compose.ui.text.AnnotatedString.Builder.pushStyle(androidx.compose.ui.text.SpanStyle)
+BuilderSetStyle: androidx.compose.ui.text.AnnotatedString.Builder#toAnnotatedString():
+ Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.compose.ui.text.AnnotatedString.Builder.toAnnotatedString()
+BuilderSetStyle: androidx.compose.ui.text.AnnotatedString.Builder#toString():
+ Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.compose.ui.text.AnnotatedString.Builder.toString()
-KotlinOperator: androidx.ui.text.font.FontListFontFamily#contains(androidx.ui.text.font.Font):
+KotlinOperator: androidx.compose.ui.text.font.FontListFontFamily#contains(androidx.compose.ui.text.font.Font):
Note that adding the `operator` keyword would allow calling this method using operator syntax
-KotlinOperator: androidx.ui.text.style.TextDecoration#contains(androidx.ui.text.style.TextDecoration):
+KotlinOperator: androidx.compose.ui.text.style.TextDecoration#contains(androidx.compose.ui.text.style.TextDecoration):
Note that adding the `operator` keyword would allow calling this method using operator syntax
-MissingBuildMethod: androidx.ui.text.AnnotatedString.Builder:
- androidx.ui.text.AnnotatedString.Builder does not declare a `build()` method, but builder classes are expected to
+MissingBuildMethod: androidx.compose.ui.text.AnnotatedString.Builder:
+ androidx.compose.ui.text.AnnotatedString.Builder does not declare a `build()` method, but builder classes are expected to
-MissingNullability: androidx.ui.text.style.BaselineShift#toString-impl(float):
+MissingNullability: androidx.compose.ui.text.style.BaselineShift#toString-impl(float):
Missing nullability on method `toString-impl` return
-SetterReturnsThis: androidx.ui.text.AnnotatedString.Builder#addStringAnnotation(String, String, int, int):
- Methods must return the builder object (return type androidx.ui.text.AnnotatedString.Builder instead of void): method androidx.ui.text.AnnotatedString.Builder.addStringAnnotation(String,String,int,int)
-SetterReturnsThis: androidx.ui.text.AnnotatedString.Builder#addStyle(androidx.ui.text.ParagraphStyle, int, int):
- Methods must return the builder object (return type androidx.ui.text.AnnotatedString.Builder instead of void): method androidx.ui.text.AnnotatedString.Builder.addStyle(androidx.ui.text.ParagraphStyle,int,int)
-SetterReturnsThis: androidx.ui.text.AnnotatedString.Builder#addStyle(androidx.ui.text.SpanStyle, int, int):
- Methods must return the builder object (return type androidx.ui.text.AnnotatedString.Builder instead of void): method androidx.ui.text.AnnotatedString.Builder.addStyle(androidx.ui.text.SpanStyle,int,int)
+SetterReturnsThis: androidx.compose.ui.text.AnnotatedString.Builder#addStringAnnotation(String, String, int, int):
+ Methods must return the builder object (return type androidx.compose.ui.text.AnnotatedString.Builder instead of void): method androidx.compose.ui.text.AnnotatedString.Builder.addStringAnnotation(String,String,int,int)
+SetterReturnsThis: androidx.compose.ui.text.AnnotatedString.Builder#addStyle(androidx.compose.ui.text.ParagraphStyle, int, int):
+ Methods must return the builder object (return type androidx.compose.ui.text.AnnotatedString.Builder instead of void): method androidx.compose.ui.text.AnnotatedString.Builder.addStyle(androidx.compose.ui.text.ParagraphStyle,int,int)
+SetterReturnsThis: androidx.compose.ui.text.AnnotatedString.Builder#addStyle(androidx.compose.ui.text.SpanStyle, int, int):
+ Methods must return the builder object (return type androidx.compose.ui.text.AnnotatedString.Builder instead of void): method androidx.compose.ui.text.AnnotatedString.Builder.addStyle(androidx.compose.ui.text.SpanStyle,int,int)
diff --git a/ui/ui-text-core/api/current.txt b/ui/ui-text-core/api/current.txt
index b5c1f07..f75dd52 100644
--- a/ui/ui-text-core/api/current.txt
+++ b/ui/ui-text-core/api/current.txt
@@ -1,321 +1,38 @@
// Signature format: 3.0
-package androidx.ui.input {
-
- public final class BackspaceKeyEditOp implements androidx.ui.input.EditOperation {
- ctor public BackspaceKeyEditOp();
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- public final class CommitTextEditOp implements androidx.ui.input.EditOperation {
- ctor public CommitTextEditOp(String text, int newCursorPosition);
- method public String component1();
- method public int component2();
- method public androidx.ui.input.CommitTextEditOp copy(String text, int newCursorPosition);
- method public int getNewCursorPosition();
- method public String getText();
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- public final class DeleteAllEditOp implements androidx.ui.input.EditOperation {
- ctor public DeleteAllEditOp();
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- public final class DeleteSurroundingTextEditOp implements androidx.ui.input.EditOperation {
- ctor public DeleteSurroundingTextEditOp(int beforeLength, int afterLength);
- method public int component1();
- method public int component2();
- method public androidx.ui.input.DeleteSurroundingTextEditOp copy(int beforeLength, int afterLength);
- method public int getAfterLength();
- method public int getBeforeLength();
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- public final class DeleteSurroundingTextInCodePointsEditOp implements androidx.ui.input.EditOperation {
- ctor public DeleteSurroundingTextInCodePointsEditOp(int beforeLength, int afterLength);
- method public int component1();
- method public int component2();
- method public androidx.ui.input.DeleteSurroundingTextInCodePointsEditOp copy(int beforeLength, int afterLength);
- method public int getAfterLength();
- method public int getBeforeLength();
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- public interface EditOperation {
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- public final class EditingBuffer {
- ctor public EditingBuffer(String initialText, androidx.ui.text.TextRange initialSelection);
- field public static final int NOWHERE = -1; // 0xffffffff
- }
-
- @Deprecated @androidx.compose.Immutable public final class EditorValue {
- ctor @Deprecated public EditorValue(String text, androidx.ui.text.TextRange selection, androidx.ui.text.TextRange? composition);
- ctor @Deprecated public EditorValue();
- method @Deprecated public String component1();
- method @Deprecated public androidx.ui.text.TextRange component2();
- method @Deprecated public androidx.ui.text.TextRange? component3();
- method @Deprecated @androidx.compose.Immutable public androidx.ui.input.EditorValue copy(String text, androidx.ui.text.TextRange selection, androidx.ui.text.TextRange? composition);
- method @Deprecated public androidx.ui.text.TextRange? getComposition();
- method @Deprecated public String getSelectedText();
- method @Deprecated public androidx.ui.text.TextRange getSelection();
- method @Deprecated public String getText();
- method @Deprecated public String getTextAfterSelection(int maxChars);
- method @Deprecated public String getTextBeforeSelection(int maxChars);
- }
-
- public final class FinishComposingTextEditOp implements androidx.ui.input.EditOperation {
- ctor public FinishComposingTextEditOp();
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- public final class GapBufferKt {
- }
-
- public enum ImeAction {
- method public static androidx.ui.input.ImeAction valueOf(String name) throws java.lang.IllegalArgumentException;
- method public static androidx.ui.input.ImeAction[] values();
- enum_constant public static final androidx.ui.input.ImeAction Done;
- enum_constant public static final androidx.ui.input.ImeAction Go;
- enum_constant public static final androidx.ui.input.ImeAction Next;
- enum_constant public static final androidx.ui.input.ImeAction NoAction;
- enum_constant public static final androidx.ui.input.ImeAction Previous;
- enum_constant public static final androidx.ui.input.ImeAction Search;
- enum_constant public static final androidx.ui.input.ImeAction Send;
- enum_constant public static final androidx.ui.input.ImeAction Unspecified;
- }
-
- public interface InputEventListener {
- method public void onEditOperations(java.util.List<? extends androidx.ui.input.EditOperation> editOps);
- method public void onImeAction(androidx.ui.input.ImeAction imeAction);
- }
-
- public enum KeyboardType {
- method public static androidx.ui.input.KeyboardType valueOf(String name) throws java.lang.IllegalArgumentException;
- method public static androidx.ui.input.KeyboardType[] values();
- enum_constant public static final androidx.ui.input.KeyboardType Ascii;
- enum_constant public static final androidx.ui.input.KeyboardType Email;
- enum_constant public static final androidx.ui.input.KeyboardType Number;
- enum_constant public static final androidx.ui.input.KeyboardType NumberPassword;
- enum_constant public static final androidx.ui.input.KeyboardType Password;
- enum_constant public static final androidx.ui.input.KeyboardType Phone;
- enum_constant public static final androidx.ui.input.KeyboardType Text;
- enum_constant public static final androidx.ui.input.KeyboardType Uri;
- }
-
- public final class MoveCursorEditOp implements androidx.ui.input.EditOperation {
- ctor public MoveCursorEditOp(int amount);
- method public int component1();
- method public androidx.ui.input.MoveCursorEditOp copy(int amount);
- method public int getAmount();
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- public interface OffsetMap {
- method public int originalToTransformed(int offset);
- method public int transformedToOriginal(int offset);
- field public static final androidx.ui.input.OffsetMap.Companion Companion;
- }
-
- public static final class OffsetMap.Companion {
- method public androidx.ui.input.OffsetMap getIdentityOffsetMap();
- property public final androidx.ui.input.OffsetMap identityOffsetMap;
- }
-
- public final class PasswordVisualTransformation implements androidx.ui.input.VisualTransformation {
- ctor public PasswordVisualTransformation(char mask);
- ctor public PasswordVisualTransformation();
- method public char component1();
- method public androidx.ui.input.PasswordVisualTransformation copy(char mask);
- method public androidx.ui.input.TransformedText filter(androidx.ui.text.AnnotatedString text);
- method public char getMask();
- }
-
- public interface PlatformTextInputService {
- method public void hideSoftwareKeyboard();
- method public void notifyFocusedRect(androidx.ui.geometry.Rect rect);
- method public void onStateUpdated(androidx.ui.input.TextFieldValue value);
- method public void showSoftwareKeyboard();
- method public void startInput(androidx.ui.input.TextFieldValue value, androidx.ui.input.KeyboardType keyboardType, androidx.ui.input.ImeAction imeAction, kotlin.jvm.functions.Function1<? super java.util.List<? extends androidx.ui.input.EditOperation>,kotlin.Unit> onEditCommand, kotlin.jvm.functions.Function1<? super androidx.ui.input.ImeAction,kotlin.Unit> onImeActionPerformed);
- method public void stopInput();
- }
-
- public final class SetComposingRegionEditOp implements androidx.ui.input.EditOperation {
- ctor public SetComposingRegionEditOp(int start, int end);
- method public int component1();
- method public int component2();
- method public androidx.ui.input.SetComposingRegionEditOp copy(int start, int end);
- method public int getEnd();
- method public int getStart();
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- public final class SetComposingTextEditOp implements androidx.ui.input.EditOperation {
- ctor public SetComposingTextEditOp(String text, int newCursorPosition);
- method public String component1();
- method public int component2();
- method public androidx.ui.input.SetComposingTextEditOp copy(String text, int newCursorPosition);
- method public int getNewCursorPosition();
- method public String getText();
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- public final class SetSelectionEditOp implements androidx.ui.input.EditOperation {
- ctor public SetSelectionEditOp(int start, int end);
- method public int component1();
- method public int component2();
- method public androidx.ui.input.SetSelectionEditOp copy(int start, int end);
- method public int getEnd();
- method public int getStart();
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- @androidx.compose.Immutable public final class TextFieldValue {
- ctor public TextFieldValue(String text, androidx.ui.text.TextRange selection, androidx.ui.text.TextRange? composition);
- ctor public TextFieldValue();
- method public String component1();
- method public androidx.ui.text.TextRange component2();
- method public androidx.ui.text.TextRange? component3();
- method @androidx.compose.Immutable public androidx.ui.input.TextFieldValue copy(String text, androidx.ui.text.TextRange selection, androidx.ui.text.TextRange? composition);
- method public androidx.ui.text.TextRange? getComposition();
- method public androidx.ui.text.TextRange getSelection();
- method public String getText();
- field public static final androidx.ui.input.TextFieldValue.Companion Companion;
- }
-
- public static final class TextFieldValue.Companion {
- method public androidx.compose.runtime.savedinstancestate.Saver<androidx.ui.input.TextFieldValue,java.lang.Object> getSaver();
- property public final androidx.compose.runtime.savedinstancestate.Saver<androidx.ui.input.TextFieldValue,java.lang.Object> Saver;
- }
-
- public final class TextFieldValueKt {
- method public static String getSelectedText(androidx.ui.input.TextFieldValue);
- method public static String getTextAfterSelection(androidx.ui.input.TextFieldValue, int maxChars);
- method public static String getTextBeforeSelection(androidx.ui.input.TextFieldValue, int maxChars);
- }
-
- public class TextInputService {
- ctor public TextInputService(androidx.ui.input.PlatformTextInputService platformTextInputService);
- method public void hideSoftwareKeyboard(int token);
- method public void notifyFocusedRect(int token, androidx.ui.geometry.Rect rect);
- method public void onStateUpdated(int token, androidx.ui.input.TextFieldValue value);
- method public void showSoftwareKeyboard(int token);
- method public int startInput(androidx.ui.input.TextFieldValue value, androidx.ui.input.KeyboardType keyboardType, androidx.ui.input.ImeAction imeAction, kotlin.jvm.functions.Function1<? super java.util.List<? extends androidx.ui.input.EditOperation>,kotlin.Unit> onEditCommand, kotlin.jvm.functions.Function1<? super androidx.ui.input.ImeAction,kotlin.Unit> onImeActionPerformed);
- method public void stopInput(int token);
- }
-
- public final class TextInputServiceKt {
- method @Deprecated public static kotlin.jvm.functions.Function1<androidx.ui.input.PlatformTextInputService,androidx.ui.input.TextInputService> getTextInputServiceFactory();
- method @Deprecated public static void setTextInputServiceFactory(kotlin.jvm.functions.Function1<? super androidx.ui.input.PlatformTextInputService,? extends androidx.ui.input.TextInputService> p);
- field public static final int INVALID_SESSION = -1; // 0xffffffff
- field public static final int NO_SESSION = 0; // 0x0
- }
-
- public final class TransformedText {
- ctor public TransformedText(androidx.ui.text.AnnotatedString transformedText, androidx.ui.input.OffsetMap offsetMap);
- method public androidx.ui.text.AnnotatedString component1();
- method public androidx.ui.input.OffsetMap component2();
- method public androidx.ui.input.TransformedText copy(androidx.ui.text.AnnotatedString transformedText, androidx.ui.input.OffsetMap offsetMap);
- method public androidx.ui.input.OffsetMap getOffsetMap();
- method public androidx.ui.text.AnnotatedString getTransformedText();
- }
-
- @androidx.compose.Immutable public interface VisualTransformation {
- method public androidx.ui.input.TransformedText filter(androidx.ui.text.AnnotatedString text);
- field public static final androidx.ui.input.VisualTransformation.Companion Companion;
- }
-
- public static final class VisualTransformation.Companion {
- method public androidx.ui.input.VisualTransformation getNone();
- property public final androidx.ui.input.VisualTransformation None;
- }
-
-}
-
-package androidx.ui.intl {
-
- public final class AndroidPlatformLocaleKt {
- }
-
- @androidx.compose.Immutable public final class Locale {
- ctor public Locale(String languageTag);
- method public String getLanguage();
- method public String getRegion();
- method public String getScript();
- method public String toLanguageTag();
- property public final String language;
- property public final String region;
- property public final String script;
- field public static final androidx.ui.intl.Locale.Companion Companion;
- }
-
- public static final class Locale.Companion {
- method public androidx.ui.intl.Locale getCurrent();
- property public final androidx.ui.intl.Locale current;
- }
-
- @androidx.compose.Immutable public final class LocaleList implements java.util.Collection<androidx.ui.intl.Locale> kotlin.jvm.internal.markers.KMappedMarker {
- ctor public LocaleList(java.util.List<androidx.ui.intl.Locale> localeList);
- ctor public LocaleList(String languageTags);
- ctor public LocaleList(androidx.ui.intl.Locale... locales);
- method public java.util.List<androidx.ui.intl.Locale> component1();
- method public operator boolean contains(androidx.ui.intl.Locale element);
- method public boolean containsAll(java.util.Collection<?> elements);
- method @androidx.compose.Immutable public androidx.ui.intl.LocaleList copy(java.util.List<androidx.ui.intl.Locale> localeList);
- method public operator androidx.ui.intl.Locale get(int i);
- method public java.util.List<androidx.ui.intl.Locale> getLocaleList();
- method public int getSize();
- method public boolean isEmpty();
- method public java.util.Iterator<androidx.ui.intl.Locale> iterator();
- property public int size;
- field public static final androidx.ui.intl.LocaleList.Companion Companion;
- }
-
- public static final class LocaleList.Companion {
- method public androidx.ui.intl.LocaleList getCurrent();
- property public final androidx.ui.intl.LocaleList current;
- }
-
- public final class PlatformLocaleKt {
- }
-
-}
-
-package androidx.ui.text {
+package androidx.compose.ui.text {
@androidx.compose.Immutable public final class AnnotatedString {
- ctor public AnnotatedString(String text, java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.SpanStyle>> spanStyles, java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.ParagraphStyle>> paragraphStyles);
+ ctor public AnnotatedString(String text, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> spanStyles, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.ParagraphStyle>> paragraphStyles);
method public String component1();
- method public java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.SpanStyle>> component2();
- method public java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.ParagraphStyle>> component3();
- method @androidx.compose.Immutable public androidx.ui.text.AnnotatedString copy(String text, java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.SpanStyle>> spanStyles, java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.ParagraphStyle>> paragraphStyles, java.util.List<androidx.ui.text.AnnotatedString.Range<java.lang.String>> annotations);
- method public java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.ParagraphStyle>> getParagraphStyles();
- method public java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.SpanStyle>> getSpanStyles();
- method public java.util.List<androidx.ui.text.AnnotatedString.Range<java.lang.String>> getStringAnnotations(String tag, int start, int end);
- method public java.util.List<androidx.ui.text.AnnotatedString.Range<java.lang.String>> getStringAnnotations(int start, int end);
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> component2();
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.ParagraphStyle>> component3();
+ method @androidx.compose.Immutable public androidx.compose.ui.text.AnnotatedString copy(String text, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> spanStyles, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.ParagraphStyle>> paragraphStyles, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<java.lang.String>> annotations);
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.ParagraphStyle>> getParagraphStyles();
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> getSpanStyles();
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<java.lang.String>> getStringAnnotations(String tag, int start, int end);
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<java.lang.String>> getStringAnnotations(int start, int end);
method public String getText();
- method @androidx.compose.Stable public operator androidx.ui.text.AnnotatedString plus(androidx.ui.text.AnnotatedString other);
+ method @androidx.compose.Stable public operator androidx.compose.ui.text.AnnotatedString plus(androidx.compose.ui.text.AnnotatedString other);
}
public static final class AnnotatedString.Builder {
ctor public AnnotatedString.Builder(int capacity);
ctor public AnnotatedString.Builder();
ctor public AnnotatedString.Builder(String text);
- ctor public AnnotatedString.Builder(androidx.ui.text.AnnotatedString text);
+ ctor public AnnotatedString.Builder(androidx.compose.ui.text.AnnotatedString text);
method public void addStringAnnotation(String scope, String annotation, int start, int end);
- method public void addStyle(androidx.ui.text.SpanStyle style, int start, int end);
- method public void addStyle(androidx.ui.text.ParagraphStyle style, int start, int end);
+ method public void addStyle(androidx.compose.ui.text.SpanStyle style, int start, int end);
+ method public void addStyle(androidx.compose.ui.text.ParagraphStyle style, int start, int end);
method public void append(String text);
method public void append(char p);
- method public void append(androidx.ui.text.AnnotatedString text);
+ method public void append(androidx.compose.ui.text.AnnotatedString text);
method public int getLength();
method public void pop();
method public void pop(int index);
method public int pushStringAnnotation(String tag, String annotation);
- method public int pushStyle(androidx.ui.text.SpanStyle style);
- method public int pushStyle(androidx.ui.text.ParagraphStyle style);
- method public androidx.ui.text.AnnotatedString toAnnotatedString();
+ method public int pushStyle(androidx.compose.ui.text.SpanStyle style);
+ method public int pushStyle(androidx.compose.ui.text.ParagraphStyle style);
+ method public androidx.compose.ui.text.AnnotatedString toAnnotatedString();
property public final int length;
}
@@ -326,7 +43,7 @@
method public int component2();
method public int component3();
method public String component4();
- method public androidx.ui.text.AnnotatedString.Range<T> copy(T! item, int start, int end, String tag);
+ method public androidx.compose.ui.text.AnnotatedString.Range<T> copy(T! item, int start, int end, String tag);
method public int getEnd();
method public T! getItem();
method public int getStart();
@@ -334,18 +51,18 @@
}
public final class AnnotatedStringKt {
- method public static androidx.ui.text.AnnotatedString AnnotatedString(String text, androidx.ui.text.SpanStyle spanStyle, androidx.ui.text.ParagraphStyle? paragraphStyle = null);
- method public static androidx.ui.text.AnnotatedString AnnotatedString(String text, androidx.ui.text.ParagraphStyle paragraphStyle);
- method @Deprecated public static inline androidx.ui.text.AnnotatedString AnnotatedString(kotlin.jvm.functions.Function1<? super androidx.ui.text.AnnotatedString.Builder,kotlin.Unit> builder);
- method public static inline androidx.ui.text.AnnotatedString annotatedString(kotlin.jvm.functions.Function1<? super androidx.ui.text.AnnotatedString.Builder,kotlin.Unit> builder);
- method public static androidx.ui.text.AnnotatedString capitalize(androidx.ui.text.AnnotatedString, androidx.ui.intl.LocaleList localeList = LocaleList.current);
- method public static androidx.ui.text.AnnotatedString decapitalize(androidx.ui.text.AnnotatedString, androidx.ui.intl.LocaleList localeList = LocaleList.current);
- method public static int getLength(androidx.ui.text.AnnotatedString);
- method public static androidx.ui.text.AnnotatedString subSequence(androidx.ui.text.AnnotatedString, int start, int end);
- method public static androidx.ui.text.AnnotatedString toLowerCase(androidx.ui.text.AnnotatedString, androidx.ui.intl.LocaleList localeList = LocaleList.current);
- method public static androidx.ui.text.AnnotatedString toUpperCase(androidx.ui.text.AnnotatedString, androidx.ui.intl.LocaleList localeList = LocaleList.current);
- method public static inline <R> R withStyle(androidx.ui.text.AnnotatedString.Builder, androidx.ui.text.SpanStyle style, kotlin.jvm.functions.Function1<? super androidx.ui.text.AnnotatedString.Builder,? extends R> block);
- method public static inline <R> R withStyle(androidx.ui.text.AnnotatedString.Builder, androidx.ui.text.ParagraphStyle style, kotlin.jvm.functions.Function1<? super androidx.ui.text.AnnotatedString.Builder,? extends R> block);
+ method public static androidx.compose.ui.text.AnnotatedString AnnotatedString(String text, androidx.compose.ui.text.SpanStyle spanStyle, androidx.compose.ui.text.ParagraphStyle? paragraphStyle = null);
+ method public static androidx.compose.ui.text.AnnotatedString AnnotatedString(String text, androidx.compose.ui.text.ParagraphStyle paragraphStyle);
+ method @Deprecated public static inline androidx.compose.ui.text.AnnotatedString AnnotatedString(kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.AnnotatedString.Builder,kotlin.Unit> builder);
+ method public static inline androidx.compose.ui.text.AnnotatedString annotatedString(kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.AnnotatedString.Builder,kotlin.Unit> builder);
+ method public static androidx.compose.ui.text.AnnotatedString capitalize(androidx.compose.ui.text.AnnotatedString, androidx.compose.ui.text.intl.LocaleList localeList = LocaleList.current);
+ method public static androidx.compose.ui.text.AnnotatedString decapitalize(androidx.compose.ui.text.AnnotatedString, androidx.compose.ui.text.intl.LocaleList localeList = LocaleList.current);
+ method public static int getLength(androidx.compose.ui.text.AnnotatedString);
+ method public static androidx.compose.ui.text.AnnotatedString subSequence(androidx.compose.ui.text.AnnotatedString, int start, int end);
+ method public static androidx.compose.ui.text.AnnotatedString toLowerCase(androidx.compose.ui.text.AnnotatedString, androidx.compose.ui.text.intl.LocaleList localeList = LocaleList.current);
+ method public static androidx.compose.ui.text.AnnotatedString toUpperCase(androidx.compose.ui.text.AnnotatedString, androidx.compose.ui.text.intl.LocaleList localeList = LocaleList.current);
+ method public static inline <R> R withStyle(androidx.compose.ui.text.AnnotatedString.Builder, androidx.compose.ui.text.SpanStyle style, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.AnnotatedString.Builder,? extends R> block);
+ method public static inline <R> R withStyle(androidx.compose.ui.text.AnnotatedString.Builder, androidx.compose.ui.text.ParagraphStyle style, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.AnnotatedString.Builder,? extends R> block);
}
@kotlin.RequiresOptIn(level=RequiresOptIn.Level.ERROR, message="This is internal API that may change frequently and without warning.") @kotlin.annotation.Target(allowedTargets={AnnotationTarget.CLASS, AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY}) public @interface InternalTextApi {
@@ -355,16 +72,16 @@
}
public final class MultiParagraph {
- ctor public MultiParagraph(androidx.ui.text.MultiParagraphIntrinsics intrinsics, int maxLines, boolean ellipsis, androidx.ui.text.ParagraphConstraints constraints);
- ctor public MultiParagraph(androidx.ui.text.AnnotatedString annotatedString, androidx.ui.text.TextStyle style, java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>> placeholders, int maxLines, boolean ellipsis, androidx.ui.text.ParagraphConstraints constraints, androidx.ui.unit.Density density, androidx.ui.text.font.Font.ResourceLoader resourceLoader);
- method public androidx.ui.text.style.ResolvedTextDirection getBidiRunDirection(int offset);
+ ctor public MultiParagraph(androidx.compose.ui.text.MultiParagraphIntrinsics intrinsics, int maxLines, boolean ellipsis, androidx.compose.ui.text.ParagraphConstraints constraints);
+ ctor public MultiParagraph(androidx.compose.ui.text.AnnotatedString annotatedString, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, int maxLines, boolean ellipsis, androidx.compose.ui.text.ParagraphConstraints constraints, androidx.ui.unit.Density density, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getBidiRunDirection(int offset);
method public androidx.ui.geometry.Rect getBoundingBox(int offset);
method public androidx.ui.geometry.Rect getCursorRect(int offset);
method public boolean getDidExceedMaxLines();
method public float getFirstBaseline();
method public float getHeight();
method public float getHorizontalPosition(int offset, boolean usePrimaryDirection);
- method public androidx.ui.text.MultiParagraphIntrinsics getIntrinsics();
+ method public androidx.compose.ui.text.MultiParagraphIntrinsics getIntrinsics();
method public float getLastBaseline();
method public float getLineBottom(int lineIndex);
method public int getLineCount();
@@ -382,11 +99,11 @@
method public int getMaxLines();
method public float getMinIntrinsicWidth();
method public int getOffsetForPosition(androidx.ui.geometry.Offset position);
- method public androidx.ui.text.style.ResolvedTextDirection getParagraphDirection(int offset);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getParagraphDirection(int offset);
method public androidx.ui.graphics.Path getPathForRange(int start, int end);
method public java.util.List<androidx.ui.geometry.Rect> getPlaceholderRects();
method public float getWidth();
- method public androidx.ui.text.TextRange getWordBoundary(int offset);
+ method public androidx.compose.ui.text.TextRange getWordBoundary(int offset);
method public void paint(androidx.ui.graphics.Canvas canvas);
property public final boolean didExceedMaxLines;
property public final float firstBaseline;
@@ -399,12 +116,12 @@
property public final float width;
}
- public final class MultiParagraphIntrinsics implements androidx.ui.text.ParagraphIntrinsics {
- ctor public MultiParagraphIntrinsics(androidx.ui.text.AnnotatedString annotatedString, androidx.ui.text.TextStyle style, java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>> placeholders, androidx.ui.unit.Density density, androidx.ui.text.font.Font.ResourceLoader resourceLoader);
- method public androidx.ui.text.AnnotatedString getAnnotatedString();
+ public final class MultiParagraphIntrinsics implements androidx.compose.ui.text.ParagraphIntrinsics {
+ ctor public MultiParagraphIntrinsics(androidx.compose.ui.text.AnnotatedString annotatedString, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, androidx.ui.unit.Density density, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader);
+ method public androidx.compose.ui.text.AnnotatedString getAnnotatedString();
method public float getMaxIntrinsicWidth();
method public float getMinIntrinsicWidth();
- method public java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>> getPlaceholders();
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> getPlaceholders();
property public float maxIntrinsicWidth;
property public float minIntrinsicWidth;
}
@@ -416,7 +133,7 @@
}
public interface Paragraph {
- method public androidx.ui.text.style.ResolvedTextDirection getBidiRunDirection(int offset);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getBidiRunDirection(int offset);
method public androidx.ui.geometry.Rect getBoundingBox(int offset);
method public androidx.ui.geometry.Rect getCursorRect(int offset);
method public boolean getDidExceedMaxLines();
@@ -439,11 +156,11 @@
method public float getMaxIntrinsicWidth();
method public float getMinIntrinsicWidth();
method public int getOffsetForPosition(androidx.ui.geometry.Offset position);
- method public androidx.ui.text.style.ResolvedTextDirection getParagraphDirection(int offset);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getParagraphDirection(int offset);
method public androidx.ui.graphics.Path getPathForRange(int start, int end);
method public java.util.List<androidx.ui.geometry.Rect> getPlaceholderRects();
method public float getWidth();
- method public androidx.ui.text.TextRange getWordBoundary(int offset);
+ method public androidx.compose.ui.text.TextRange getWordBoundary(int offset);
method public void paint(androidx.ui.graphics.Canvas canvas);
property public abstract boolean didExceedMaxLines;
property public abstract float firstBaseline;
@@ -459,7 +176,7 @@
public final class ParagraphConstraints {
ctor public ParagraphConstraints(float width);
method public float component1();
- method public androidx.ui.text.ParagraphConstraints copy(float width);
+ method public androidx.compose.ui.text.ParagraphConstraints copy(float width);
method public float getWidth();
}
@@ -471,56 +188,56 @@
}
public final class ParagraphIntrinsicsKt {
- method public static androidx.ui.text.ParagraphIntrinsics ParagraphIntrinsics(String text, androidx.ui.text.TextStyle style, java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.SpanStyle>> spanStyles = listOf(), java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>> placeholders = listOf(), androidx.ui.unit.Density density, androidx.ui.text.font.Font.ResourceLoader resourceLoader);
+ method public static androidx.compose.ui.text.ParagraphIntrinsics ParagraphIntrinsics(String text, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> spanStyles = listOf(), java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders = listOf(), androidx.ui.unit.Density density, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader);
}
public final class ParagraphKt {
- method public static androidx.ui.text.Paragraph Paragraph(String text, androidx.ui.text.TextStyle style, java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.SpanStyle>> spanStyles = listOf(), java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>> placeholders = listOf(), int maxLines = 2147483647, boolean ellipsis = false, androidx.ui.text.ParagraphConstraints constraints, androidx.ui.unit.Density density, androidx.ui.text.font.Font.ResourceLoader resourceLoader);
- method public static androidx.ui.text.Paragraph Paragraph(androidx.ui.text.ParagraphIntrinsics paragraphIntrinsics, int maxLines = 2147483647, boolean ellipsis = false, androidx.ui.text.ParagraphConstraints constraints);
+ method public static androidx.compose.ui.text.Paragraph Paragraph(String text, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> spanStyles = listOf(), java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders = listOf(), int maxLines = 2147483647, boolean ellipsis = false, androidx.compose.ui.text.ParagraphConstraints constraints, androidx.ui.unit.Density density, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader);
+ method public static androidx.compose.ui.text.Paragraph Paragraph(androidx.compose.ui.text.ParagraphIntrinsics paragraphIntrinsics, int maxLines = 2147483647, boolean ellipsis = false, androidx.compose.ui.text.ParagraphConstraints constraints);
}
@androidx.compose.Immutable public final class ParagraphStyle {
- method public androidx.ui.text.style.TextAlign? component1();
- method public androidx.ui.text.style.TextDirection? component2();
+ method public androidx.compose.ui.text.style.TextAlign? component1();
+ method public androidx.compose.ui.text.style.TextDirection? component2();
method public long component3();
- method public androidx.ui.text.style.TextIndent? component4();
- method @androidx.compose.Immutable public androidx.ui.text.ParagraphStyle copy-JVmhFNw(androidx.ui.text.style.TextAlign? textAlign, androidx.ui.text.style.TextDirection? textDirection, long lineHeight, androidx.ui.text.style.TextIndent? textIndent);
+ method public androidx.compose.ui.text.style.TextIndent? component4();
+ method @androidx.compose.Immutable public androidx.compose.ui.text.ParagraphStyle copy-yfYFPjM(androidx.compose.ui.text.style.TextAlign? textAlign, androidx.compose.ui.text.style.TextDirection? textDirection, long lineHeight, androidx.compose.ui.text.style.TextIndent? textIndent);
method public long getLineHeight();
- method public androidx.ui.text.style.TextAlign? getTextAlign();
- method public androidx.ui.text.style.TextDirection? getTextDirection();
- method public androidx.ui.text.style.TextIndent? getTextIndent();
- method @androidx.compose.Stable public androidx.ui.text.ParagraphStyle merge(androidx.ui.text.ParagraphStyle? other = null);
- method @androidx.compose.Stable public operator androidx.ui.text.ParagraphStyle plus(androidx.ui.text.ParagraphStyle other);
+ 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.Stable public androidx.compose.ui.text.ParagraphStyle merge(androidx.compose.ui.text.ParagraphStyle? other = null);
+ method @androidx.compose.Stable public operator androidx.compose.ui.text.ParagraphStyle plus(androidx.compose.ui.text.ParagraphStyle other);
}
public final class ParagraphStyleKt {
- method @androidx.compose.Stable public static androidx.ui.text.ParagraphStyle lerp(androidx.ui.text.ParagraphStyle start, androidx.ui.text.ParagraphStyle stop, float fraction);
+ method @androidx.compose.Stable public static androidx.compose.ui.text.ParagraphStyle lerp(androidx.compose.ui.text.ParagraphStyle start, androidx.compose.ui.text.ParagraphStyle stop, float fraction);
}
@androidx.compose.Immutable public final class Placeholder {
method public long component1();
method public long component2();
- method public androidx.ui.text.PlaceholderVerticalAlign component3();
- method @androidx.compose.Immutable public androidx.ui.text.Placeholder copy-eLqjHCw(long width, long height, androidx.ui.text.PlaceholderVerticalAlign placeholderVerticalAlign);
+ method public androidx.compose.ui.text.PlaceholderVerticalAlign component3();
+ method @androidx.compose.Immutable public androidx.compose.ui.text.Placeholder copy-LxtbTAo(long width, long height, androidx.compose.ui.text.PlaceholderVerticalAlign placeholderVerticalAlign);
method public long getHeight();
- method public androidx.ui.text.PlaceholderVerticalAlign getPlaceholderVerticalAlign();
+ method public androidx.compose.ui.text.PlaceholderVerticalAlign getPlaceholderVerticalAlign();
method public long getWidth();
}
public enum PlaceholderVerticalAlign {
- method public static androidx.ui.text.PlaceholderVerticalAlign valueOf(String name) throws java.lang.IllegalArgumentException;
- method public static androidx.ui.text.PlaceholderVerticalAlign[] values();
- enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign AboveBaseline;
- enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign Bottom;
- enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign Center;
- enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign TextBottom;
- enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign TextCenter;
- enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign TextTop;
- enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign Top;
+ method public static androidx.compose.ui.text.PlaceholderVerticalAlign valueOf(String name) throws java.lang.IllegalArgumentException;
+ method public static androidx.compose.ui.text.PlaceholderVerticalAlign[] values();
+ enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign AboveBaseline;
+ enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign Bottom;
+ enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign Center;
+ enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign TextBottom;
+ enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign TextCenter;
+ enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign TextTop;
+ enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign Top;
}
public final class SoftwareKeyboardController {
- ctor public SoftwareKeyboardController(androidx.ui.input.TextInputService textInputService, int token);
+ ctor public SoftwareKeyboardController(androidx.compose.ui.text.input.TextInputService textInputService, int token);
method public void hideSoftwareKeyboard();
method public void notifyFocusedRect(androidx.ui.geometry.Rect rect);
method public void showSoftwareKeyboard();
@@ -528,86 +245,86 @@
@androidx.compose.Immutable public final class SpanStyle {
method public long component1();
- method public androidx.ui.text.style.TextGeometricTransform? component10();
- method public androidx.ui.intl.LocaleList? component11();
+ method public androidx.compose.ui.text.style.TextGeometricTransform? component10();
+ method public androidx.compose.ui.text.intl.LocaleList? component11();
method public long component12();
- method public androidx.ui.text.style.TextDecoration? component13();
+ method public androidx.compose.ui.text.style.TextDecoration? component13();
method public androidx.ui.graphics.Shadow? component14();
method public long component2();
- method public androidx.ui.text.font.FontWeight? component3();
- method public androidx.ui.text.font.FontStyle? component4();
- method public androidx.ui.text.font.FontSynthesis? component5();
- method public androidx.ui.text.font.FontFamily? component6();
+ method public androidx.compose.ui.text.font.FontWeight? component3();
+ method public androidx.compose.ui.text.font.FontStyle? component4();
+ method public androidx.compose.ui.text.font.FontSynthesis? component5();
+ method public androidx.compose.ui.text.font.FontFamily? component6();
method public String? component7();
method public long component8();
- method public androidx.ui.text.style.BaselineShift? component9();
- method @androidx.compose.Immutable public androidx.ui.text.SpanStyle copy-HjQ0eR4(long color, long fontSize, androidx.ui.text.font.FontWeight? fontWeight, androidx.ui.text.font.FontStyle? fontStyle, androidx.ui.text.font.FontSynthesis? fontSynthesis, androidx.ui.text.font.FontFamily? fontFamily, String? fontFeatureSettings, long letterSpacing, androidx.ui.text.style.BaselineShift? baselineShift, androidx.ui.text.style.TextGeometricTransform? textGeometricTransform, androidx.ui.intl.LocaleList? localeList, long background, androidx.ui.text.style.TextDecoration? textDecoration, androidx.ui.graphics.Shadow? shadow);
+ method public androidx.compose.ui.text.style.BaselineShift? component9();
+ method @androidx.compose.Immutable public androidx.compose.ui.text.SpanStyle copy-3JaCuMk(long color, long fontSize, androidx.compose.ui.text.font.FontWeight? fontWeight, androidx.compose.ui.text.font.FontStyle? fontStyle, androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, androidx.compose.ui.text.font.FontFamily? fontFamily, String? fontFeatureSettings, long letterSpacing, androidx.compose.ui.text.style.BaselineShift? baselineShift, androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, androidx.compose.ui.text.intl.LocaleList? localeList, long background, androidx.compose.ui.text.style.TextDecoration? textDecoration, androidx.ui.graphics.Shadow? shadow);
method public long getBackground();
- method public androidx.ui.text.style.BaselineShift? getBaselineShift();
+ method public androidx.compose.ui.text.style.BaselineShift? getBaselineShift();
method public long getColor();
- method public androidx.ui.text.font.FontFamily? getFontFamily();
+ method public androidx.compose.ui.text.font.FontFamily? getFontFamily();
method public String? getFontFeatureSettings();
method public long getFontSize();
- method public androidx.ui.text.font.FontStyle? getFontStyle();
- method public androidx.ui.text.font.FontSynthesis? getFontSynthesis();
- method public androidx.ui.text.font.FontWeight? getFontWeight();
+ method public androidx.compose.ui.text.font.FontStyle? getFontStyle();
+ method public androidx.compose.ui.text.font.FontSynthesis? getFontSynthesis();
+ method public androidx.compose.ui.text.font.FontWeight? getFontWeight();
method public long getLetterSpacing();
- method public androidx.ui.intl.LocaleList? getLocaleList();
+ method public androidx.compose.ui.text.intl.LocaleList? getLocaleList();
method public androidx.ui.graphics.Shadow? getShadow();
- method public androidx.ui.text.style.TextDecoration? getTextDecoration();
- method public androidx.ui.text.style.TextGeometricTransform? getTextGeometricTransform();
- method @androidx.compose.Stable public androidx.ui.text.SpanStyle merge(androidx.ui.text.SpanStyle? other = null);
- method @androidx.compose.Stable public operator androidx.ui.text.SpanStyle plus(androidx.ui.text.SpanStyle other);
+ method public androidx.compose.ui.text.style.TextDecoration? getTextDecoration();
+ method public androidx.compose.ui.text.style.TextGeometricTransform? getTextGeometricTransform();
+ method @androidx.compose.Stable public androidx.compose.ui.text.SpanStyle merge(androidx.compose.ui.text.SpanStyle? other = null);
+ method @androidx.compose.Stable public operator androidx.compose.ui.text.SpanStyle plus(androidx.compose.ui.text.SpanStyle other);
}
public final class SpanStyleKt {
- method public static androidx.ui.text.SpanStyle lerp(androidx.ui.text.SpanStyle start, androidx.ui.text.SpanStyle stop, float fraction);
+ method public static androidx.compose.ui.text.SpanStyle lerp(androidx.compose.ui.text.SpanStyle start, androidx.compose.ui.text.SpanStyle stop, float fraction);
}
public final class StringKt {
- method public static String capitalize(String, androidx.ui.intl.Locale locale);
- method public static String capitalize(String, androidx.ui.intl.LocaleList localeList);
- method public static String decapitalize(String, androidx.ui.intl.Locale locale);
- method public static String decapitalize(String, androidx.ui.intl.LocaleList localeList);
- method public static String toLowerCase(String, androidx.ui.intl.Locale locale);
- method public static String toLowerCase(String, androidx.ui.intl.LocaleList localeList);
- method public static String toUpperCase(String, androidx.ui.intl.Locale locale);
- method public static String toUpperCase(String, androidx.ui.intl.LocaleList localeList);
+ method public static String capitalize(String, androidx.compose.ui.text.intl.Locale locale);
+ method public static String capitalize(String, androidx.compose.ui.text.intl.LocaleList localeList);
+ method public static String decapitalize(String, androidx.compose.ui.text.intl.Locale locale);
+ method public static String decapitalize(String, androidx.compose.ui.text.intl.LocaleList localeList);
+ method public static String toLowerCase(String, androidx.compose.ui.text.intl.Locale locale);
+ method public static String toLowerCase(String, androidx.compose.ui.text.intl.LocaleList localeList);
+ method public static String toUpperCase(String, androidx.compose.ui.text.intl.Locale locale);
+ method public static String toUpperCase(String, androidx.compose.ui.text.intl.LocaleList localeList);
}
public final class TextLayoutHelperKt {
}
public final class TextLayoutInput {
- ctor public TextLayoutInput(androidx.ui.text.AnnotatedString text, androidx.ui.text.TextStyle style, java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>> placeholders, int maxLines, boolean softWrap, androidx.ui.text.style.TextOverflow overflow, androidx.ui.unit.Density density, androidx.ui.core.LayoutDirection layoutDirection, androidx.ui.text.font.Font.ResourceLoader resourceLoader, androidx.ui.core.Constraints constraints);
- method public androidx.ui.text.AnnotatedString component1();
+ ctor public TextLayoutInput(androidx.compose.ui.text.AnnotatedString text, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, int maxLines, boolean softWrap, androidx.compose.ui.text.style.TextOverflow overflow, androidx.ui.unit.Density density, androidx.ui.core.LayoutDirection layoutDirection, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader, androidx.ui.core.Constraints constraints);
+ method public androidx.compose.ui.text.AnnotatedString component1();
method public androidx.ui.core.Constraints component10();
- method public androidx.ui.text.TextStyle component2();
- method public java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>> component3();
+ method public androidx.compose.ui.text.TextStyle component2();
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> component3();
method public int component4();
method public boolean component5();
- method public androidx.ui.text.style.TextOverflow component6();
+ method public androidx.compose.ui.text.style.TextOverflow component6();
method public androidx.ui.unit.Density component7();
method public androidx.ui.core.LayoutDirection component8();
- method public androidx.ui.text.font.Font.ResourceLoader component9();
- method public androidx.ui.text.TextLayoutInput copy(androidx.ui.text.AnnotatedString text, androidx.ui.text.TextStyle style, java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>> placeholders, int maxLines, boolean softWrap, androidx.ui.text.style.TextOverflow overflow, androidx.ui.unit.Density density, androidx.ui.core.LayoutDirection layoutDirection, androidx.ui.text.font.Font.ResourceLoader resourceLoader, androidx.ui.core.Constraints constraints);
+ method public androidx.compose.ui.text.font.Font.ResourceLoader component9();
+ method public androidx.compose.ui.text.TextLayoutInput copy(androidx.compose.ui.text.AnnotatedString text, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, int maxLines, boolean softWrap, androidx.compose.ui.text.style.TextOverflow overflow, androidx.ui.unit.Density density, androidx.ui.core.LayoutDirection layoutDirection, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader, androidx.ui.core.Constraints constraints);
method public androidx.ui.core.Constraints getConstraints();
method public androidx.ui.unit.Density getDensity();
method public androidx.ui.core.LayoutDirection getLayoutDirection();
method public int getMaxLines();
- method public androidx.ui.text.style.TextOverflow getOverflow();
- method public java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>> getPlaceholders();
- method public androidx.ui.text.font.Font.ResourceLoader getResourceLoader();
+ method public androidx.compose.ui.text.style.TextOverflow getOverflow();
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> getPlaceholders();
+ method public androidx.compose.ui.text.font.Font.ResourceLoader getResourceLoader();
method public boolean getSoftWrap();
- method public androidx.ui.text.TextStyle getStyle();
- method public androidx.ui.text.AnnotatedString getText();
+ method public androidx.compose.ui.text.TextStyle getStyle();
+ method public androidx.compose.ui.text.AnnotatedString getText();
}
public final class TextLayoutResult {
- method public androidx.ui.text.TextLayoutInput component1();
+ method public androidx.compose.ui.text.TextLayoutInput component1();
method public androidx.ui.unit.IntSize component3();
- method public androidx.ui.text.TextLayoutResult copy(androidx.ui.text.TextLayoutInput layoutInput, androidx.ui.text.MultiParagraph multiParagraph, androidx.ui.unit.IntSize size);
- method public androidx.ui.text.style.ResolvedTextDirection getBidiRunDirection(int offset);
+ method public androidx.compose.ui.text.TextLayoutResult copy(androidx.compose.ui.text.TextLayoutInput layoutInput, androidx.compose.ui.text.MultiParagraph multiParagraph, androidx.ui.unit.IntSize size);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getBidiRunDirection(int offset);
method public androidx.ui.geometry.Rect getBoundingBox(int offset);
method public androidx.ui.geometry.Rect getCursorRect(int offset);
method public boolean getDidOverflowHeight();
@@ -616,7 +333,7 @@
method public boolean getHasVisualOverflow();
method public float getHorizontalPosition(int offset, boolean usePrimaryDirection);
method public float getLastBaseline();
- method public androidx.ui.text.TextLayoutInput getLayoutInput();
+ method public androidx.compose.ui.text.TextLayoutInput getLayoutInput();
method public float getLineBottom(int lineIndex);
method public int getLineCount();
method public int getLineEnd(int lineIndex);
@@ -626,11 +343,11 @@
method public int getLineStart(int lineIndex);
method public float getLineTop(int lineIndex);
method public int getOffsetForPosition(androidx.ui.geometry.Offset position);
- method public androidx.ui.text.style.ResolvedTextDirection getParagraphDirection(int offset);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getParagraphDirection(int offset);
method public androidx.ui.graphics.Path getPathForRange(int start, int end);
method public java.util.List<androidx.ui.geometry.Rect> getPlaceholderRects();
method public androidx.ui.unit.IntSize getSize();
- method public androidx.ui.text.TextRange getWordBoundary(int offset);
+ method public androidx.compose.ui.text.TextRange getWordBoundary(int offset);
property public final boolean didOverflowHeight;
property public final boolean didOverflowWidth;
property public final float firstBaseline;
@@ -641,17 +358,17 @@
}
public final class TextPainter {
- method public void paint(androidx.ui.graphics.Canvas canvas, androidx.ui.text.TextLayoutResult textLayoutResult);
- field public static final androidx.ui.text.TextPainter INSTANCE;
+ method public void paint(androidx.ui.graphics.Canvas canvas, androidx.compose.ui.text.TextLayoutResult textLayoutResult);
+ field public static final androidx.compose.ui.text.TextPainter INSTANCE;
}
@androidx.compose.Immutable public final class TextRange {
ctor public TextRange(@IntRange(from=null) int start, @IntRange(from=null) int end);
method public int component1();
method public int component2();
- method public operator boolean contains(androidx.ui.text.TextRange other);
+ method public operator boolean contains(androidx.compose.ui.text.TextRange other);
method public operator boolean contains(int offset);
- method @androidx.compose.Immutable public androidx.ui.text.TextRange copy(int start, int end);
+ method @androidx.compose.Immutable public androidx.compose.ui.text.TextRange copy(int start, int end);
method public boolean getCollapsed();
method public int getEnd();
method public int getLength();
@@ -659,274 +376,557 @@
method public int getMin();
method public boolean getReversed();
method public int getStart();
- method public boolean intersects(androidx.ui.text.TextRange other);
+ method public boolean intersects(androidx.compose.ui.text.TextRange other);
property public final boolean collapsed;
property public final int length;
property public final int max;
property public final int min;
property public final boolean reversed;
- field public static final androidx.ui.text.TextRange.Companion Companion;
+ field public static final androidx.compose.ui.text.TextRange.Companion Companion;
}
public static final class TextRange.Companion {
- method public androidx.ui.text.TextRange getZero();
- property public final androidx.ui.text.TextRange Zero;
+ method public androidx.compose.ui.text.TextRange getZero();
+ property public final androidx.compose.ui.text.TextRange Zero;
}
public final class TextRangeKt {
- method public static androidx.ui.text.TextRange TextRange(int index);
- method public static String substring(CharSequence, androidx.ui.text.TextRange range);
+ method public static androidx.compose.ui.text.TextRange TextRange(int index);
+ method public static String substring(CharSequence, androidx.compose.ui.text.TextRange range);
}
@androidx.compose.Immutable public final class TextStyle {
method public long component1();
- method public androidx.ui.text.style.TextGeometricTransform? component10();
- method public androidx.ui.intl.LocaleList? component11();
+ method public androidx.compose.ui.text.style.TextGeometricTransform? component10();
+ method public androidx.compose.ui.text.intl.LocaleList? component11();
method public long component12();
- method public androidx.ui.text.style.TextDecoration? component13();
+ method public androidx.compose.ui.text.style.TextDecoration? component13();
method public androidx.ui.graphics.Shadow? component14();
- method public androidx.ui.text.style.TextAlign? component15();
- method public androidx.ui.text.style.TextDirection? component16();
+ method public androidx.compose.ui.text.style.TextAlign? component15();
+ method public androidx.compose.ui.text.style.TextDirection? component16();
method public long component17();
- method public androidx.ui.text.style.TextIndent? component18();
+ method public androidx.compose.ui.text.style.TextIndent? component18();
method public long component2();
- method public androidx.ui.text.font.FontWeight? component3();
- method public androidx.ui.text.font.FontStyle? component4();
- method public androidx.ui.text.font.FontSynthesis? component5();
- method public androidx.ui.text.font.FontFamily? component6();
+ method public androidx.compose.ui.text.font.FontWeight? component3();
+ method public androidx.compose.ui.text.font.FontStyle? component4();
+ method public androidx.compose.ui.text.font.FontSynthesis? component5();
+ method public androidx.compose.ui.text.font.FontFamily? component6();
method public String? component7();
method public long component8();
- method public androidx.ui.text.style.BaselineShift? component9();
- method @androidx.compose.Immutable public androidx.ui.text.TextStyle copy-7aJ7aFo(long color, long fontSize, androidx.ui.text.font.FontWeight? fontWeight, androidx.ui.text.font.FontStyle? fontStyle, androidx.ui.text.font.FontSynthesis? fontSynthesis, androidx.ui.text.font.FontFamily? fontFamily, String? fontFeatureSettings, long letterSpacing, androidx.ui.text.style.BaselineShift? baselineShift, androidx.ui.text.style.TextGeometricTransform? textGeometricTransform, androidx.ui.intl.LocaleList? localeList, long background, androidx.ui.text.style.TextDecoration? textDecoration, androidx.ui.graphics.Shadow? shadow, androidx.ui.text.style.TextAlign? textAlign, androidx.ui.text.style.TextDirection? textDirection, long lineHeight, androidx.ui.text.style.TextIndent? textIndent);
+ method public androidx.compose.ui.text.style.BaselineShift? component9();
+ method @androidx.compose.Immutable public androidx.compose.ui.text.TextStyle copy-7Y_OIKU(long color, long fontSize, androidx.compose.ui.text.font.FontWeight? fontWeight, androidx.compose.ui.text.font.FontStyle? fontStyle, androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, androidx.compose.ui.text.font.FontFamily? fontFamily, String? fontFeatureSettings, long letterSpacing, androidx.compose.ui.text.style.BaselineShift? baselineShift, androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, androidx.compose.ui.text.intl.LocaleList? localeList, long background, androidx.compose.ui.text.style.TextDecoration? textDecoration, androidx.ui.graphics.Shadow? shadow, androidx.compose.ui.text.style.TextAlign? textAlign, androidx.compose.ui.text.style.TextDirection? textDirection, long lineHeight, androidx.compose.ui.text.style.TextIndent? textIndent);
method public long getBackground();
- method public androidx.ui.text.style.BaselineShift? getBaselineShift();
+ method public androidx.compose.ui.text.style.BaselineShift? getBaselineShift();
method public long getColor();
- method public androidx.ui.text.font.FontFamily? getFontFamily();
+ method public androidx.compose.ui.text.font.FontFamily? getFontFamily();
method public String? getFontFeatureSettings();
method public long getFontSize();
- method public androidx.ui.text.font.FontStyle? getFontStyle();
- method public androidx.ui.text.font.FontSynthesis? getFontSynthesis();
- method public androidx.ui.text.font.FontWeight? getFontWeight();
+ method public androidx.compose.ui.text.font.FontStyle? getFontStyle();
+ method public androidx.compose.ui.text.font.FontSynthesis? getFontSynthesis();
+ method public androidx.compose.ui.text.font.FontWeight? getFontWeight();
method public long getLetterSpacing();
method public long getLineHeight();
- method public androidx.ui.intl.LocaleList? getLocaleList();
+ method public androidx.compose.ui.text.intl.LocaleList? getLocaleList();
method public androidx.ui.graphics.Shadow? getShadow();
- method public androidx.ui.text.style.TextAlign? getTextAlign();
- method public androidx.ui.text.style.TextDecoration? getTextDecoration();
- method public androidx.ui.text.style.TextDirection? getTextDirection();
- method public androidx.ui.text.style.TextGeometricTransform? getTextGeometricTransform();
- method public androidx.ui.text.style.TextIndent? getTextIndent();
- method @androidx.compose.Stable public androidx.ui.text.TextStyle merge(androidx.ui.text.TextStyle? other = null);
- method @androidx.compose.Stable public androidx.ui.text.TextStyle merge(androidx.ui.text.SpanStyle other);
- method @androidx.compose.Stable public androidx.ui.text.TextStyle merge(androidx.ui.text.ParagraphStyle other);
- method @androidx.compose.Stable public operator androidx.ui.text.TextStyle plus(androidx.ui.text.TextStyle other);
- method @androidx.compose.Stable public operator androidx.ui.text.TextStyle plus(androidx.ui.text.ParagraphStyle other);
- method @androidx.compose.Stable public operator androidx.ui.text.TextStyle plus(androidx.ui.text.SpanStyle other);
- method @androidx.compose.Stable public androidx.ui.text.ParagraphStyle toParagraphStyle();
- method @androidx.compose.Stable public androidx.ui.text.SpanStyle toSpanStyle();
- field public static final androidx.ui.text.TextStyle.Companion Companion;
+ method public androidx.compose.ui.text.style.TextAlign? getTextAlign();
+ method public androidx.compose.ui.text.style.TextDecoration? getTextDecoration();
+ 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.Stable public androidx.compose.ui.text.TextStyle merge(androidx.compose.ui.text.TextStyle? other = null);
+ method @androidx.compose.Stable public androidx.compose.ui.text.TextStyle merge(androidx.compose.ui.text.SpanStyle other);
+ method @androidx.compose.Stable public androidx.compose.ui.text.TextStyle merge(androidx.compose.ui.text.ParagraphStyle other);
+ method @androidx.compose.Stable public operator androidx.compose.ui.text.TextStyle plus(androidx.compose.ui.text.TextStyle other);
+ method @androidx.compose.Stable public operator androidx.compose.ui.text.TextStyle plus(androidx.compose.ui.text.ParagraphStyle other);
+ method @androidx.compose.Stable public operator androidx.compose.ui.text.TextStyle plus(androidx.compose.ui.text.SpanStyle other);
+ method @androidx.compose.Stable public androidx.compose.ui.text.ParagraphStyle toParagraphStyle();
+ method @androidx.compose.Stable public androidx.compose.ui.text.SpanStyle toSpanStyle();
+ field public static final androidx.compose.ui.text.TextStyle.Companion Companion;
}
public static final class TextStyle.Companion {
- method public androidx.ui.text.TextStyle getDefault();
- property public final androidx.ui.text.TextStyle Default;
+ method public androidx.compose.ui.text.TextStyle getDefault();
+ property public final androidx.compose.ui.text.TextStyle Default;
}
public final class TextStyleKt {
- method public static androidx.ui.text.TextStyle lerp(androidx.ui.text.TextStyle start, androidx.ui.text.TextStyle stop, float fraction);
- method public static androidx.ui.text.TextStyle resolveDefaults(androidx.ui.text.TextStyle style, androidx.ui.core.LayoutDirection direction);
+ method public static androidx.compose.ui.text.TextStyle lerp(androidx.compose.ui.text.TextStyle start, androidx.compose.ui.text.TextStyle stop, float fraction);
+ method public static androidx.compose.ui.text.TextStyle resolveDefaults(androidx.compose.ui.text.TextStyle style, androidx.ui.core.LayoutDirection direction);
}
public interface Typeface {
- method public androidx.ui.text.font.FontFamily getFontFamily();
- property public abstract androidx.ui.text.font.FontFamily fontFamily;
+ method public androidx.compose.ui.text.font.FontFamily getFontFamily();
+ property public abstract androidx.compose.ui.text.font.FontFamily fontFamily;
}
}
-package androidx.ui.text.font {
+package androidx.compose.ui.text.font {
- public abstract sealed class FileBasedFontFamily extends androidx.ui.text.font.FontFamily {
+ public abstract sealed class FileBasedFontFamily extends androidx.compose.ui.text.font.FontFamily {
}
@androidx.compose.Immutable public interface Font {
- method public androidx.ui.text.font.FontStyle getStyle();
- method public androidx.ui.text.font.FontWeight getWeight();
- property public abstract androidx.ui.text.font.FontStyle style;
- property public abstract androidx.ui.text.font.FontWeight weight;
+ method public androidx.compose.ui.text.font.FontStyle getStyle();
+ method public androidx.compose.ui.text.font.FontWeight getWeight();
+ property public abstract androidx.compose.ui.text.font.FontStyle style;
+ property public abstract androidx.compose.ui.text.font.FontWeight weight;
}
public static interface Font.ResourceLoader {
- method public Object load(androidx.ui.text.font.Font font);
+ method public Object load(androidx.compose.ui.text.font.Font font);
}
@androidx.compose.Immutable public abstract sealed class FontFamily {
method public final boolean getCanLoadSynchronously();
- field public static final androidx.ui.text.font.FontFamily.Companion Companion;
+ field public static final androidx.compose.ui.text.font.FontFamily.Companion Companion;
}
public static final class FontFamily.Companion {
- method public androidx.ui.text.font.GenericFontFamily getCursive();
- method public androidx.ui.text.font.SystemFontFamily getDefault();
- method public androidx.ui.text.font.GenericFontFamily getMonospace();
- method public androidx.ui.text.font.GenericFontFamily getSansSerif();
- method public androidx.ui.text.font.GenericFontFamily getSerif();
- property public final androidx.ui.text.font.GenericFontFamily Cursive;
- property public final androidx.ui.text.font.SystemFontFamily Default;
- property public final androidx.ui.text.font.GenericFontFamily Monospace;
- property public final androidx.ui.text.font.GenericFontFamily SansSerif;
- property public final androidx.ui.text.font.GenericFontFamily Serif;
+ method public androidx.compose.ui.text.font.GenericFontFamily getCursive();
+ method public androidx.compose.ui.text.font.SystemFontFamily getDefault();
+ method public androidx.compose.ui.text.font.GenericFontFamily getMonospace();
+ method public androidx.compose.ui.text.font.GenericFontFamily getSansSerif();
+ method public androidx.compose.ui.text.font.GenericFontFamily getSerif();
+ property public final androidx.compose.ui.text.font.GenericFontFamily Cursive;
+ property public final androidx.compose.ui.text.font.SystemFontFamily Default;
+ property public final androidx.compose.ui.text.font.GenericFontFamily Monospace;
+ property public final androidx.compose.ui.text.font.GenericFontFamily SansSerif;
+ property public final androidx.compose.ui.text.font.GenericFontFamily Serif;
}
public final class FontFamilyKt {
- method @androidx.compose.Stable public static androidx.ui.text.font.FontListFontFamily fontFamily(java.util.List<? extends androidx.ui.text.font.Font> fonts);
- method @androidx.compose.Stable public static androidx.ui.text.font.FontListFontFamily fontFamily(androidx.ui.text.font.Font... fonts);
- method public static androidx.ui.text.font.LoadedFontFamily fontFamily(androidx.ui.text.Typeface typeface);
+ method @androidx.compose.Stable public static androidx.compose.ui.text.font.FontListFontFamily fontFamily(java.util.List<? extends androidx.compose.ui.text.font.Font> fonts);
+ method @androidx.compose.Stable public static androidx.compose.ui.text.font.FontListFontFamily fontFamily(androidx.compose.ui.text.font.Font... fonts);
+ method public static androidx.compose.ui.text.font.LoadedFontFamily fontFamily(androidx.compose.ui.text.Typeface typeface);
}
public final class FontKt {
- method @androidx.compose.Stable public static androidx.ui.text.font.FontListFontFamily asFontFamily(androidx.ui.text.font.Font);
- method @androidx.compose.Stable public static androidx.ui.text.font.Font font(int resId, androidx.ui.text.font.FontWeight weight = FontWeight.Normal, androidx.ui.text.font.FontStyle style = androidx.ui.text.font.FontStyle.Normal);
+ method @androidx.compose.Stable public static androidx.compose.ui.text.font.FontListFontFamily asFontFamily(androidx.compose.ui.text.font.Font);
+ method @androidx.compose.Stable public static androidx.compose.ui.text.font.Font font(int resId, androidx.compose.ui.text.font.FontWeight weight = FontWeight.Normal, androidx.compose.ui.text.font.FontStyle style = androidx.compose.ui.text.font.FontStyle.Normal);
}
- @androidx.compose.Immutable public final class FontListFontFamily extends androidx.ui.text.font.FileBasedFontFamily implements kotlin.jvm.internal.markers.KMappedMarker java.util.List<androidx.ui.text.font.Font> {
- ctor public FontListFontFamily(java.util.List<? extends androidx.ui.text.font.Font> fonts);
- method public java.util.List<androidx.ui.text.font.Font> component1();
- method public boolean contains(androidx.ui.text.font.Font element);
+ @androidx.compose.Immutable public final class FontListFontFamily extends androidx.compose.ui.text.font.FileBasedFontFamily implements kotlin.jvm.internal.markers.KMappedMarker java.util.List<androidx.compose.ui.text.font.Font> {
+ ctor public FontListFontFamily(java.util.List<? extends androidx.compose.ui.text.font.Font> fonts);
+ method public java.util.List<androidx.compose.ui.text.font.Font> component1();
+ method public boolean contains(androidx.compose.ui.text.font.Font element);
method public boolean containsAll(java.util.Collection<?> elements);
- method @androidx.compose.Immutable public androidx.ui.text.font.FontListFontFamily copy(java.util.List<? extends androidx.ui.text.font.Font> fonts);
- method public androidx.ui.text.font.Font get(int index);
- method public java.util.List<androidx.ui.text.font.Font> getFonts();
+ method @androidx.compose.Immutable public androidx.compose.ui.text.font.FontListFontFamily copy(java.util.List<? extends androidx.compose.ui.text.font.Font> fonts);
+ method public androidx.compose.ui.text.font.Font get(int index);
+ method public java.util.List<androidx.compose.ui.text.font.Font> getFonts();
method public int getSize();
- method public int indexOf(androidx.ui.text.font.Font element);
+ method public int indexOf(androidx.compose.ui.text.font.Font element);
method public boolean isEmpty();
- method public java.util.Iterator<androidx.ui.text.font.Font> iterator();
- method public int lastIndexOf(androidx.ui.text.font.Font element);
- method public java.util.ListIterator<androidx.ui.text.font.Font> listIterator();
- method public java.util.ListIterator<androidx.ui.text.font.Font> listIterator(int index);
- method public java.util.List<androidx.ui.text.font.Font> subList(int fromIndex, int toIndex);
+ method public java.util.Iterator<androidx.compose.ui.text.font.Font> iterator();
+ method public int lastIndexOf(androidx.compose.ui.text.font.Font element);
+ method public java.util.ListIterator<androidx.compose.ui.text.font.Font> listIterator();
+ method public java.util.ListIterator<androidx.compose.ui.text.font.Font> listIterator(int index);
+ method public java.util.List<androidx.compose.ui.text.font.Font> subList(int fromIndex, int toIndex);
}
public enum FontStyle {
- method public static androidx.ui.text.font.FontStyle valueOf(String name) throws java.lang.IllegalArgumentException;
- method public static androidx.ui.text.font.FontStyle[] values();
- enum_constant public static final androidx.ui.text.font.FontStyle Italic;
- enum_constant public static final androidx.ui.text.font.FontStyle Normal;
+ method public static androidx.compose.ui.text.font.FontStyle valueOf(String name) throws java.lang.IllegalArgumentException;
+ method public static androidx.compose.ui.text.font.FontStyle[] values();
+ enum_constant public static final androidx.compose.ui.text.font.FontStyle Italic;
+ enum_constant public static final androidx.compose.ui.text.font.FontStyle Normal;
}
public enum FontSynthesis {
- method public static androidx.ui.text.font.FontSynthesis valueOf(String name) throws java.lang.IllegalArgumentException;
- method public static androidx.ui.text.font.FontSynthesis[] values();
- enum_constant public static final androidx.ui.text.font.FontSynthesis All;
- enum_constant public static final androidx.ui.text.font.FontSynthesis None;
- enum_constant public static final androidx.ui.text.font.FontSynthesis Style;
- enum_constant public static final androidx.ui.text.font.FontSynthesis Weight;
+ method public static androidx.compose.ui.text.font.FontSynthesis valueOf(String name) throws java.lang.IllegalArgumentException;
+ method public static androidx.compose.ui.text.font.FontSynthesis[] values();
+ enum_constant public static final androidx.compose.ui.text.font.FontSynthesis All;
+ enum_constant public static final androidx.compose.ui.text.font.FontSynthesis None;
+ enum_constant public static final androidx.compose.ui.text.font.FontSynthesis Style;
+ enum_constant public static final androidx.compose.ui.text.font.FontSynthesis Weight;
}
- @androidx.compose.Immutable public final class FontWeight implements java.lang.Comparable<androidx.ui.text.font.FontWeight> {
+ @androidx.compose.Immutable public final class FontWeight implements java.lang.Comparable<androidx.compose.ui.text.font.FontWeight> {
ctor public FontWeight(int weight);
- method public int compareTo(androidx.ui.text.font.FontWeight other);
+ method public int compareTo(androidx.compose.ui.text.font.FontWeight other);
method public int component1();
- method @androidx.compose.Immutable public androidx.ui.text.font.FontWeight copy(int weight);
+ method @androidx.compose.Immutable public androidx.compose.ui.text.font.FontWeight copy(int weight);
method public int getWeight();
- field public static final androidx.ui.text.font.FontWeight.Companion Companion;
+ field public static final androidx.compose.ui.text.font.FontWeight.Companion Companion;
}
public static final class FontWeight.Companion {
- method public androidx.ui.text.font.FontWeight getBlack();
- method public androidx.ui.text.font.FontWeight getBold();
- method public androidx.ui.text.font.FontWeight getExtraBold();
- method public androidx.ui.text.font.FontWeight getExtraLight();
- method public androidx.ui.text.font.FontWeight getLight();
- method public androidx.ui.text.font.FontWeight getMedium();
- method public androidx.ui.text.font.FontWeight getNormal();
- method public androidx.ui.text.font.FontWeight getSemiBold();
- method public androidx.ui.text.font.FontWeight getThin();
- method public androidx.ui.text.font.FontWeight getW100();
- method public androidx.ui.text.font.FontWeight getW200();
- method public androidx.ui.text.font.FontWeight getW300();
- method public androidx.ui.text.font.FontWeight getW400();
- method public androidx.ui.text.font.FontWeight getW500();
- method public androidx.ui.text.font.FontWeight getW600();
- method public androidx.ui.text.font.FontWeight getW700();
- method public androidx.ui.text.font.FontWeight getW800();
- method public androidx.ui.text.font.FontWeight getW900();
- property public final androidx.ui.text.font.FontWeight Black;
- property public final androidx.ui.text.font.FontWeight Bold;
- property public final androidx.ui.text.font.FontWeight ExtraBold;
- property public final androidx.ui.text.font.FontWeight ExtraLight;
- property public final androidx.ui.text.font.FontWeight Light;
- property public final androidx.ui.text.font.FontWeight Medium;
- property public final androidx.ui.text.font.FontWeight Normal;
- property public final androidx.ui.text.font.FontWeight SemiBold;
- property public final androidx.ui.text.font.FontWeight Thin;
- property public final androidx.ui.text.font.FontWeight W100;
- property public final androidx.ui.text.font.FontWeight W200;
- property public final androidx.ui.text.font.FontWeight W300;
- property public final androidx.ui.text.font.FontWeight W400;
- property public final androidx.ui.text.font.FontWeight W500;
- property public final androidx.ui.text.font.FontWeight W600;
- property public final androidx.ui.text.font.FontWeight W700;
- property public final androidx.ui.text.font.FontWeight W800;
- property public final androidx.ui.text.font.FontWeight W900;
+ method public androidx.compose.ui.text.font.FontWeight getBlack();
+ method public androidx.compose.ui.text.font.FontWeight getBold();
+ method public androidx.compose.ui.text.font.FontWeight getExtraBold();
+ method public androidx.compose.ui.text.font.FontWeight getExtraLight();
+ method public androidx.compose.ui.text.font.FontWeight getLight();
+ method public androidx.compose.ui.text.font.FontWeight getMedium();
+ method public androidx.compose.ui.text.font.FontWeight getNormal();
+ method public androidx.compose.ui.text.font.FontWeight getSemiBold();
+ method public androidx.compose.ui.text.font.FontWeight getThin();
+ method public androidx.compose.ui.text.font.FontWeight getW100();
+ method public androidx.compose.ui.text.font.FontWeight getW200();
+ method public androidx.compose.ui.text.font.FontWeight getW300();
+ method public androidx.compose.ui.text.font.FontWeight getW400();
+ method public androidx.compose.ui.text.font.FontWeight getW500();
+ method public androidx.compose.ui.text.font.FontWeight getW600();
+ method public androidx.compose.ui.text.font.FontWeight getW700();
+ method public androidx.compose.ui.text.font.FontWeight getW800();
+ method public androidx.compose.ui.text.font.FontWeight getW900();
+ property public final androidx.compose.ui.text.font.FontWeight Black;
+ property public final androidx.compose.ui.text.font.FontWeight Bold;
+ property public final androidx.compose.ui.text.font.FontWeight ExtraBold;
+ property public final androidx.compose.ui.text.font.FontWeight ExtraLight;
+ property public final androidx.compose.ui.text.font.FontWeight Light;
+ property public final androidx.compose.ui.text.font.FontWeight Medium;
+ property public final androidx.compose.ui.text.font.FontWeight Normal;
+ property public final androidx.compose.ui.text.font.FontWeight SemiBold;
+ property public final androidx.compose.ui.text.font.FontWeight Thin;
+ property public final androidx.compose.ui.text.font.FontWeight W100;
+ property public final androidx.compose.ui.text.font.FontWeight W200;
+ property public final androidx.compose.ui.text.font.FontWeight W300;
+ property public final androidx.compose.ui.text.font.FontWeight W400;
+ property public final androidx.compose.ui.text.font.FontWeight W500;
+ property public final androidx.compose.ui.text.font.FontWeight W600;
+ property public final androidx.compose.ui.text.font.FontWeight W700;
+ property public final androidx.compose.ui.text.font.FontWeight W800;
+ property public final androidx.compose.ui.text.font.FontWeight W900;
}
public final class FontWeightKt {
- method public static androidx.ui.text.font.FontWeight lerp(androidx.ui.text.font.FontWeight start, androidx.ui.text.font.FontWeight stop, float fraction);
+ method public static androidx.compose.ui.text.font.FontWeight lerp(androidx.compose.ui.text.font.FontWeight start, androidx.compose.ui.text.font.FontWeight stop, float fraction);
}
- @androidx.compose.Immutable public final class GenericFontFamily extends androidx.ui.text.font.SystemFontFamily {
+ @androidx.compose.Immutable public final class GenericFontFamily extends androidx.compose.ui.text.font.SystemFontFamily {
method public String getName();
}
- public final class LoadedFontFamily extends androidx.ui.text.font.FontFamily {
- ctor public LoadedFontFamily(androidx.ui.text.Typeface typeface);
- method public androidx.ui.text.Typeface component1();
- method public androidx.ui.text.font.LoadedFontFamily copy(androidx.ui.text.Typeface typeface);
- method public androidx.ui.text.Typeface getTypeface();
+ public final class LoadedFontFamily extends androidx.compose.ui.text.font.FontFamily {
+ ctor public LoadedFontFamily(androidx.compose.ui.text.Typeface typeface);
+ method public androidx.compose.ui.text.Typeface component1();
+ method public androidx.compose.ui.text.font.LoadedFontFamily copy(androidx.compose.ui.text.Typeface typeface);
+ method public androidx.compose.ui.text.Typeface getTypeface();
}
- public final class ResourceFont implements androidx.ui.text.font.Font {
- ctor public ResourceFont(int resId, androidx.ui.text.font.FontWeight weight, androidx.ui.text.font.FontStyle style);
+ public final class ResourceFont implements androidx.compose.ui.text.font.Font {
+ ctor public ResourceFont(int resId, androidx.compose.ui.text.font.FontWeight weight, androidx.compose.ui.text.font.FontStyle style);
method public int component1();
- method public androidx.ui.text.font.FontWeight component2();
- method public androidx.ui.text.font.FontStyle component3();
- method public androidx.ui.text.font.ResourceFont copy(int resId, androidx.ui.text.font.FontWeight weight, androidx.ui.text.font.FontStyle style);
+ method public androidx.compose.ui.text.font.FontWeight component2();
+ method public androidx.compose.ui.text.font.FontStyle component3();
+ method public androidx.compose.ui.text.font.ResourceFont copy(int resId, androidx.compose.ui.text.font.FontWeight weight, androidx.compose.ui.text.font.FontStyle style);
method public int getResId();
- method public androidx.ui.text.font.FontStyle getStyle();
- method public androidx.ui.text.font.FontWeight getWeight();
+ method public androidx.compose.ui.text.font.FontStyle getStyle();
+ method public androidx.compose.ui.text.font.FontWeight getWeight();
}
- public abstract sealed class SystemFontFamily extends androidx.ui.text.font.FontFamily {
+ public abstract sealed class SystemFontFamily extends androidx.compose.ui.text.font.FontFamily {
}
}
-package androidx.ui.text.platform {
+package androidx.compose.ui.text.input {
+
+ public final class BackspaceKeyEditOp implements androidx.compose.ui.text.input.EditOperation {
+ ctor public BackspaceKeyEditOp();
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public final class CommitTextEditOp implements androidx.compose.ui.text.input.EditOperation {
+ ctor public CommitTextEditOp(String text, int newCursorPosition);
+ method public String component1();
+ method public int component2();
+ method public androidx.compose.ui.text.input.CommitTextEditOp copy(String text, int newCursorPosition);
+ method public int getNewCursorPosition();
+ method public String getText();
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public final class DeleteAllEditOp implements androidx.compose.ui.text.input.EditOperation {
+ ctor public DeleteAllEditOp();
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public final class DeleteSurroundingTextEditOp implements androidx.compose.ui.text.input.EditOperation {
+ ctor public DeleteSurroundingTextEditOp(int beforeLength, int afterLength);
+ method public int component1();
+ method public int component2();
+ method public androidx.compose.ui.text.input.DeleteSurroundingTextEditOp copy(int beforeLength, int afterLength);
+ method public int getAfterLength();
+ method public int getBeforeLength();
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public final class DeleteSurroundingTextInCodePointsEditOp implements androidx.compose.ui.text.input.EditOperation {
+ ctor public DeleteSurroundingTextInCodePointsEditOp(int beforeLength, int afterLength);
+ method public int component1();
+ method public int component2();
+ method public androidx.compose.ui.text.input.DeleteSurroundingTextInCodePointsEditOp copy(int beforeLength, int afterLength);
+ method public int getAfterLength();
+ method public int getBeforeLength();
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public interface EditOperation {
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public final class EditingBuffer {
+ ctor public EditingBuffer(String initialText, androidx.compose.ui.text.TextRange initialSelection);
+ field public static final int NOWHERE = -1; // 0xffffffff
+ }
+
+ @Deprecated @androidx.compose.Immutable public final class EditorValue {
+ ctor @Deprecated public EditorValue(String text, androidx.compose.ui.text.TextRange selection, androidx.compose.ui.text.TextRange? composition);
+ ctor @Deprecated public EditorValue();
+ method @Deprecated public String component1();
+ method @Deprecated public androidx.compose.ui.text.TextRange component2();
+ method @Deprecated public androidx.compose.ui.text.TextRange? component3();
+ method @Deprecated @androidx.compose.Immutable public androidx.compose.ui.text.input.EditorValue copy(String text, androidx.compose.ui.text.TextRange selection, androidx.compose.ui.text.TextRange? composition);
+ method @Deprecated public androidx.compose.ui.text.TextRange? getComposition();
+ method @Deprecated public String getSelectedText();
+ method @Deprecated public androidx.compose.ui.text.TextRange getSelection();
+ method @Deprecated public String getText();
+ method @Deprecated public String getTextAfterSelection(int maxChars);
+ method @Deprecated public String getTextBeforeSelection(int maxChars);
+ }
+
+ public final class FinishComposingTextEditOp implements androidx.compose.ui.text.input.EditOperation {
+ ctor public FinishComposingTextEditOp();
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public final class GapBufferKt {
+ }
+
+ public enum ImeAction {
+ method public static androidx.compose.ui.text.input.ImeAction valueOf(String name) throws java.lang.IllegalArgumentException;
+ method public static androidx.compose.ui.text.input.ImeAction[] values();
+ enum_constant public static final androidx.compose.ui.text.input.ImeAction Done;
+ enum_constant public static final androidx.compose.ui.text.input.ImeAction Go;
+ enum_constant public static final androidx.compose.ui.text.input.ImeAction Next;
+ enum_constant public static final androidx.compose.ui.text.input.ImeAction NoAction;
+ enum_constant public static final androidx.compose.ui.text.input.ImeAction Previous;
+ enum_constant public static final androidx.compose.ui.text.input.ImeAction Search;
+ enum_constant public static final androidx.compose.ui.text.input.ImeAction Send;
+ enum_constant public static final androidx.compose.ui.text.input.ImeAction Unspecified;
+ }
+
+ public interface InputEventListener {
+ method public void onEditOperations(java.util.List<? extends androidx.compose.ui.text.input.EditOperation> editOps);
+ method public void onImeAction(androidx.compose.ui.text.input.ImeAction imeAction);
+ }
+
+ public enum KeyboardType {
+ method public static androidx.compose.ui.text.input.KeyboardType valueOf(String name) throws java.lang.IllegalArgumentException;
+ method public static androidx.compose.ui.text.input.KeyboardType[] values();
+ enum_constant public static final androidx.compose.ui.text.input.KeyboardType Ascii;
+ enum_constant public static final androidx.compose.ui.text.input.KeyboardType Email;
+ enum_constant public static final androidx.compose.ui.text.input.KeyboardType Number;
+ enum_constant public static final androidx.compose.ui.text.input.KeyboardType NumberPassword;
+ enum_constant public static final androidx.compose.ui.text.input.KeyboardType Password;
+ enum_constant public static final androidx.compose.ui.text.input.KeyboardType Phone;
+ enum_constant public static final androidx.compose.ui.text.input.KeyboardType Text;
+ enum_constant public static final androidx.compose.ui.text.input.KeyboardType Uri;
+ }
+
+ public final class MoveCursorEditOp implements androidx.compose.ui.text.input.EditOperation {
+ ctor public MoveCursorEditOp(int amount);
+ method public int component1();
+ method public androidx.compose.ui.text.input.MoveCursorEditOp copy(int amount);
+ method public int getAmount();
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public interface OffsetMap {
+ method public int originalToTransformed(int offset);
+ method public int transformedToOriginal(int offset);
+ field public static final androidx.compose.ui.text.input.OffsetMap.Companion Companion;
+ }
+
+ public static final class OffsetMap.Companion {
+ method public androidx.compose.ui.text.input.OffsetMap getIdentityOffsetMap();
+ property public final androidx.compose.ui.text.input.OffsetMap identityOffsetMap;
+ }
+
+ public final class PasswordVisualTransformation implements androidx.compose.ui.text.input.VisualTransformation {
+ ctor public PasswordVisualTransformation(char mask);
+ ctor public PasswordVisualTransformation();
+ method public char component1();
+ method public androidx.compose.ui.text.input.PasswordVisualTransformation copy(char mask);
+ method public androidx.compose.ui.text.input.TransformedText filter(androidx.compose.ui.text.AnnotatedString text);
+ method public char getMask();
+ }
+
+ public interface PlatformTextInputService {
+ method public void hideSoftwareKeyboard();
+ method public void notifyFocusedRect(androidx.ui.geometry.Rect rect);
+ method public void onStateUpdated(androidx.compose.ui.text.input.TextFieldValue value);
+ method public void showSoftwareKeyboard();
+ method public void startInput(androidx.compose.ui.text.input.TextFieldValue value, androidx.compose.ui.text.input.KeyboardType keyboardType, androidx.compose.ui.text.input.ImeAction imeAction, kotlin.jvm.functions.Function1<? super java.util.List<? extends androidx.compose.ui.text.input.EditOperation>,kotlin.Unit> onEditCommand, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.ImeAction,kotlin.Unit> onImeActionPerformed);
+ method public void stopInput();
+ }
+
+ public final class SetComposingRegionEditOp implements androidx.compose.ui.text.input.EditOperation {
+ ctor public SetComposingRegionEditOp(int start, int end);
+ method public int component1();
+ method public int component2();
+ method public androidx.compose.ui.text.input.SetComposingRegionEditOp copy(int start, int end);
+ method public int getEnd();
+ method public int getStart();
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public final class SetComposingTextEditOp implements androidx.compose.ui.text.input.EditOperation {
+ ctor public SetComposingTextEditOp(String text, int newCursorPosition);
+ method public String component1();
+ method public int component2();
+ method public androidx.compose.ui.text.input.SetComposingTextEditOp copy(String text, int newCursorPosition);
+ method public int getNewCursorPosition();
+ method public String getText();
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public final class SetSelectionEditOp implements androidx.compose.ui.text.input.EditOperation {
+ ctor public SetSelectionEditOp(int start, int end);
+ method public int component1();
+ method public int component2();
+ method public androidx.compose.ui.text.input.SetSelectionEditOp copy(int start, int end);
+ method public int getEnd();
+ method public int getStart();
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ @androidx.compose.Immutable public final class TextFieldValue {
+ ctor public TextFieldValue(String text, androidx.compose.ui.text.TextRange selection, androidx.compose.ui.text.TextRange? composition);
+ ctor public TextFieldValue();
+ method public String component1();
+ method public androidx.compose.ui.text.TextRange component2();
+ method public androidx.compose.ui.text.TextRange? component3();
+ method @androidx.compose.Immutable public androidx.compose.ui.text.input.TextFieldValue copy(String text, androidx.compose.ui.text.TextRange selection, androidx.compose.ui.text.TextRange? composition);
+ method public androidx.compose.ui.text.TextRange? getComposition();
+ method public androidx.compose.ui.text.TextRange getSelection();
+ method public String getText();
+ field public static final androidx.compose.ui.text.input.TextFieldValue.Companion Companion;
+ }
+
+ public static final class TextFieldValue.Companion {
+ method public androidx.compose.runtime.savedinstancestate.Saver<androidx.compose.ui.text.input.TextFieldValue,java.lang.Object> getSaver();
+ property public final androidx.compose.runtime.savedinstancestate.Saver<androidx.compose.ui.text.input.TextFieldValue,java.lang.Object> Saver;
+ }
+
+ public final class TextFieldValueKt {
+ method public static String getSelectedText(androidx.compose.ui.text.input.TextFieldValue);
+ method public static String getTextAfterSelection(androidx.compose.ui.text.input.TextFieldValue, int maxChars);
+ method public static String getTextBeforeSelection(androidx.compose.ui.text.input.TextFieldValue, int maxChars);
+ }
+
+ public class TextInputService {
+ ctor public TextInputService(androidx.compose.ui.text.input.PlatformTextInputService platformTextInputService);
+ method public void hideSoftwareKeyboard(int token);
+ method public void notifyFocusedRect(int token, androidx.ui.geometry.Rect rect);
+ method public void onStateUpdated(int token, androidx.compose.ui.text.input.TextFieldValue value);
+ method public void showSoftwareKeyboard(int token);
+ method public int startInput(androidx.compose.ui.text.input.TextFieldValue value, androidx.compose.ui.text.input.KeyboardType keyboardType, androidx.compose.ui.text.input.ImeAction imeAction, kotlin.jvm.functions.Function1<? super java.util.List<? extends androidx.compose.ui.text.input.EditOperation>,kotlin.Unit> onEditCommand, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.ImeAction,kotlin.Unit> onImeActionPerformed);
+ method public void stopInput(int token);
+ }
+
+ public final class TextInputServiceKt {
+ method @Deprecated public static kotlin.jvm.functions.Function1<androidx.compose.ui.text.input.PlatformTextInputService,androidx.compose.ui.text.input.TextInputService> getTextInputServiceFactory();
+ method @Deprecated public static void setTextInputServiceFactory(kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.PlatformTextInputService,? extends androidx.compose.ui.text.input.TextInputService> p);
+ field public static final int INVALID_SESSION = -1; // 0xffffffff
+ field public static final int NO_SESSION = 0; // 0x0
+ }
+
+ public final class TransformedText {
+ ctor public TransformedText(androidx.compose.ui.text.AnnotatedString transformedText, androidx.compose.ui.text.input.OffsetMap offsetMap);
+ method public androidx.compose.ui.text.AnnotatedString component1();
+ method public androidx.compose.ui.text.input.OffsetMap component2();
+ method public androidx.compose.ui.text.input.TransformedText copy(androidx.compose.ui.text.AnnotatedString transformedText, androidx.compose.ui.text.input.OffsetMap offsetMap);
+ method public androidx.compose.ui.text.input.OffsetMap getOffsetMap();
+ method public androidx.compose.ui.text.AnnotatedString getTransformedText();
+ }
+
+ @androidx.compose.Immutable public interface VisualTransformation {
+ method public androidx.compose.ui.text.input.TransformedText filter(androidx.compose.ui.text.AnnotatedString text);
+ field public static final androidx.compose.ui.text.input.VisualTransformation.Companion Companion;
+ }
+
+ public static final class VisualTransformation.Companion {
+ method public androidx.compose.ui.text.input.VisualTransformation getNone();
+ property public final androidx.compose.ui.text.input.VisualTransformation None;
+ }
+
+}
+
+package androidx.compose.ui.text.intl {
+
+ public final class AndroidPlatformLocaleKt {
+ }
+
+ @androidx.compose.Immutable public final class Locale {
+ ctor public Locale(String languageTag);
+ method public String getLanguage();
+ method public String getRegion();
+ method public String getScript();
+ method public String toLanguageTag();
+ property public final String language;
+ property public final String region;
+ property public final String script;
+ field public static final androidx.compose.ui.text.intl.Locale.Companion Companion;
+ }
+
+ public static final class Locale.Companion {
+ method public androidx.compose.ui.text.intl.Locale getCurrent();
+ property public final androidx.compose.ui.text.intl.Locale current;
+ }
+
+ @androidx.compose.Immutable public final class LocaleList implements java.util.Collection<androidx.compose.ui.text.intl.Locale> kotlin.jvm.internal.markers.KMappedMarker {
+ ctor public LocaleList(java.util.List<androidx.compose.ui.text.intl.Locale> localeList);
+ ctor public LocaleList(String languageTags);
+ ctor public LocaleList(androidx.compose.ui.text.intl.Locale... locales);
+ method public java.util.List<androidx.compose.ui.text.intl.Locale> component1();
+ method public operator boolean contains(androidx.compose.ui.text.intl.Locale element);
+ method public boolean containsAll(java.util.Collection<?> elements);
+ method @androidx.compose.Immutable public androidx.compose.ui.text.intl.LocaleList copy(java.util.List<androidx.compose.ui.text.intl.Locale> localeList);
+ method public operator androidx.compose.ui.text.intl.Locale get(int i);
+ method public java.util.List<androidx.compose.ui.text.intl.Locale> getLocaleList();
+ method public int getSize();
+ method public boolean isEmpty();
+ method public java.util.Iterator<androidx.compose.ui.text.intl.Locale> iterator();
+ property public int size;
+ field public static final androidx.compose.ui.text.intl.LocaleList.Companion Companion;
+ }
+
+ public static final class LocaleList.Companion {
+ method public androidx.compose.ui.text.intl.LocaleList getCurrent();
+ property public final androidx.compose.ui.text.intl.LocaleList current;
+ }
+
+ public final class PlatformLocaleKt {
+ }
+
+}
+
+package androidx.compose.ui.text.platform {
public final class AndroidParagraphHelperKt {
}
public final class AndroidParagraphIntrinsicsKt {
- method @Deprecated public static kotlin.jvm.functions.Function6<java.lang.String,androidx.ui.text.TextStyle,java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.SpanStyle>>,java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>>,androidx.ui.unit.Density,androidx.ui.text.font.Font.ResourceLoader,androidx.ui.text.ParagraphIntrinsics> getParagraphIntrinsicsActualFactory();
- method @Deprecated public static void setParagraphIntrinsicsActualFactory(kotlin.jvm.functions.Function6<? super java.lang.String,? super androidx.ui.text.TextStyle,? super java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.SpanStyle>>,? super java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>>,? super androidx.ui.unit.Density,? super androidx.ui.text.font.Font.ResourceLoader,? extends androidx.ui.text.ParagraphIntrinsics> p);
+ method @Deprecated public static kotlin.jvm.functions.Function6<java.lang.String,androidx.compose.ui.text.TextStyle,java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>>,java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>>,androidx.ui.unit.Density,androidx.compose.ui.text.font.Font.ResourceLoader,androidx.compose.ui.text.ParagraphIntrinsics> getParagraphIntrinsicsActualFactory();
+ method @Deprecated public static void setParagraphIntrinsicsActualFactory(kotlin.jvm.functions.Function6<? super java.lang.String,? super androidx.compose.ui.text.TextStyle,? super java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>>,? super java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>>,? super androidx.ui.unit.Density,? super androidx.compose.ui.text.font.Font.ResourceLoader,? extends androidx.compose.ui.text.ParagraphIntrinsics> p);
}
public final class AndroidParagraphKt {
- method @Deprecated public static kotlin.jvm.functions.Function4<androidx.ui.text.ParagraphIntrinsics,java.lang.Integer,java.lang.Boolean,androidx.ui.text.ParagraphConstraints,androidx.ui.text.Paragraph> getParagraphActualFactory();
- method @Deprecated public static void setParagraphActualFactory(kotlin.jvm.functions.Function4<? super androidx.ui.text.ParagraphIntrinsics,? super java.lang.Integer,? super java.lang.Boolean,? super androidx.ui.text.ParagraphConstraints,? extends androidx.ui.text.Paragraph> p);
+ method @Deprecated public static kotlin.jvm.functions.Function4<androidx.compose.ui.text.ParagraphIntrinsics,java.lang.Integer,java.lang.Boolean,androidx.compose.ui.text.ParagraphConstraints,androidx.compose.ui.text.Paragraph> getParagraphActualFactory();
+ method @Deprecated public static void setParagraphActualFactory(kotlin.jvm.functions.Function4<? super androidx.compose.ui.text.ParagraphIntrinsics,? super java.lang.Integer,? super java.lang.Boolean,? super androidx.compose.ui.text.ParagraphConstraints,? extends androidx.compose.ui.text.Paragraph> p);
}
public final class AndroidStringDelegateKt {
}
public final class TypefaceAdapterKt {
- method public static androidx.ui.text.Typeface typefaceFromFontFamily(android.content.Context context, androidx.ui.text.font.FontFamily fontFamily, java.util.List<? extends kotlin.Pair<androidx.ui.text.font.FontWeight,? extends androidx.ui.text.font.FontStyle>>? necessaryStyles = null);
+ method public static androidx.compose.ui.text.Typeface typefaceFromFontFamily(android.content.Context context, androidx.compose.ui.text.font.FontFamily fontFamily, java.util.List<? extends kotlin.Pair<androidx.compose.ui.text.font.FontWeight,? extends androidx.compose.ui.text.font.FontStyle>>? necessaryStyles = null);
}
}
-package androidx.ui.text.platform.extensions {
+package androidx.compose.ui.text.platform.extensions {
public final class LocaleExtensionsKt {
}
@@ -942,7 +942,7 @@
}
-package androidx.ui.text.style {
+package androidx.compose.ui.text.style {
@androidx.compose.Immutable public final inline class BaselineShift {
ctor public BaselineShift();
@@ -952,7 +952,7 @@
method public float getMultiplier();
method @androidx.compose.Immutable public static inline int hashCode-impl(float p);
method @androidx.compose.Immutable public static inline String! toString-impl(float p);
- field public static final androidx.ui.text.style.BaselineShift.Companion Companion;
+ field public static final androidx.compose.ui.text.style.BaselineShift.Companion Companion;
}
public static final class BaselineShift.Companion {
@@ -965,54 +965,54 @@
}
public final class BaselineShiftKt {
- method @androidx.compose.Stable public static float lerp-7csQwvo(float start, float stop, float fraction);
+ method @androidx.compose.Stable public static float lerp-ylBt8J4(float start, float stop, float fraction);
}
public enum ResolvedTextDirection {
- method public static androidx.ui.text.style.ResolvedTextDirection valueOf(String name) throws java.lang.IllegalArgumentException;
- method public static androidx.ui.text.style.ResolvedTextDirection[] values();
- enum_constant public static final androidx.ui.text.style.ResolvedTextDirection Ltr;
- enum_constant public static final androidx.ui.text.style.ResolvedTextDirection Rtl;
+ method public static androidx.compose.ui.text.style.ResolvedTextDirection valueOf(String name) throws java.lang.IllegalArgumentException;
+ method public static androidx.compose.ui.text.style.ResolvedTextDirection[] values();
+ enum_constant public static final androidx.compose.ui.text.style.ResolvedTextDirection Ltr;
+ enum_constant public static final androidx.compose.ui.text.style.ResolvedTextDirection Rtl;
}
public enum TextAlign {
- method public static androidx.ui.text.style.TextAlign valueOf(String name) throws java.lang.IllegalArgumentException;
- method public static androidx.ui.text.style.TextAlign[] values();
- enum_constant public static final androidx.ui.text.style.TextAlign Center;
- enum_constant public static final androidx.ui.text.style.TextAlign End;
- enum_constant public static final androidx.ui.text.style.TextAlign Justify;
- enum_constant public static final androidx.ui.text.style.TextAlign Left;
- enum_constant public static final androidx.ui.text.style.TextAlign Right;
- enum_constant public static final androidx.ui.text.style.TextAlign Start;
+ method public static androidx.compose.ui.text.style.TextAlign valueOf(String name) throws java.lang.IllegalArgumentException;
+ method public static androidx.compose.ui.text.style.TextAlign[] values();
+ enum_constant public static final androidx.compose.ui.text.style.TextAlign Center;
+ enum_constant public static final androidx.compose.ui.text.style.TextAlign End;
+ enum_constant public static final androidx.compose.ui.text.style.TextAlign Justify;
+ enum_constant public static final androidx.compose.ui.text.style.TextAlign Left;
+ enum_constant public static final androidx.compose.ui.text.style.TextAlign Right;
+ enum_constant public static final androidx.compose.ui.text.style.TextAlign Start;
}
@androidx.compose.Immutable public final class TextDecoration {
method public int component1();
- method public operator boolean contains(androidx.ui.text.style.TextDecoration other);
- method @androidx.compose.Immutable public androidx.ui.text.style.TextDecoration copy(int mask);
+ method public operator boolean contains(androidx.compose.ui.text.style.TextDecoration other);
+ method @androidx.compose.Immutable public androidx.compose.ui.text.style.TextDecoration copy(int mask);
method public int getMask();
- method public operator androidx.ui.text.style.TextDecoration plus(androidx.ui.text.style.TextDecoration decoration);
- field public static final androidx.ui.text.style.TextDecoration.Companion Companion;
+ method public operator androidx.compose.ui.text.style.TextDecoration plus(androidx.compose.ui.text.style.TextDecoration decoration);
+ field public static final androidx.compose.ui.text.style.TextDecoration.Companion Companion;
}
public static final class TextDecoration.Companion {
- method public androidx.ui.text.style.TextDecoration combine(java.util.List<androidx.ui.text.style.TextDecoration> decorations);
- method public androidx.ui.text.style.TextDecoration getLineThrough();
- method public androidx.ui.text.style.TextDecoration getNone();
- method public androidx.ui.text.style.TextDecoration getUnderline();
- property public final androidx.ui.text.style.TextDecoration LineThrough;
- property public final androidx.ui.text.style.TextDecoration None;
- property public final androidx.ui.text.style.TextDecoration Underline;
+ method public androidx.compose.ui.text.style.TextDecoration combine(java.util.List<androidx.compose.ui.text.style.TextDecoration> decorations);
+ method public androidx.compose.ui.text.style.TextDecoration getLineThrough();
+ method public androidx.compose.ui.text.style.TextDecoration getNone();
+ method public androidx.compose.ui.text.style.TextDecoration getUnderline();
+ property public final androidx.compose.ui.text.style.TextDecoration LineThrough;
+ property public final androidx.compose.ui.text.style.TextDecoration None;
+ property public final androidx.compose.ui.text.style.TextDecoration Underline;
}
public enum TextDirection {
- method public static androidx.ui.text.style.TextDirection valueOf(String name) throws java.lang.IllegalArgumentException;
- method public static androidx.ui.text.style.TextDirection[] values();
- enum_constant public static final androidx.ui.text.style.TextDirection Content;
- enum_constant public static final androidx.ui.text.style.TextDirection ContentOrLtr;
- enum_constant public static final androidx.ui.text.style.TextDirection ContentOrRtl;
- enum_constant public static final androidx.ui.text.style.TextDirection Ltr;
- enum_constant public static final androidx.ui.text.style.TextDirection Rtl;
+ method public static androidx.compose.ui.text.style.TextDirection valueOf(String name) throws java.lang.IllegalArgumentException;
+ method public static androidx.compose.ui.text.style.TextDirection[] values();
+ enum_constant public static final androidx.compose.ui.text.style.TextDirection Content;
+ enum_constant public static final androidx.compose.ui.text.style.TextDirection ContentOrLtr;
+ enum_constant public static final androidx.compose.ui.text.style.TextDirection ContentOrRtl;
+ enum_constant public static final androidx.compose.ui.text.style.TextDirection Ltr;
+ enum_constant public static final androidx.compose.ui.text.style.TextDirection Rtl;
}
@androidx.compose.Immutable public final class TextGeometricTransform {
@@ -1020,42 +1020,42 @@
ctor public TextGeometricTransform();
method public float component1();
method public float component2();
- method @androidx.compose.Immutable public androidx.ui.text.style.TextGeometricTransform copy(float scaleX, float skewX);
+ method @androidx.compose.Immutable public androidx.compose.ui.text.style.TextGeometricTransform copy(float scaleX, float skewX);
method public float getScaleX();
method public float getSkewX();
- field public static final androidx.ui.text.style.TextGeometricTransform.Companion Companion;
+ field public static final androidx.compose.ui.text.style.TextGeometricTransform.Companion Companion;
}
public static final class TextGeometricTransform.Companion {
}
public final class TextGeometricTransformKt {
- method public static androidx.ui.text.style.TextGeometricTransform lerp(androidx.ui.text.style.TextGeometricTransform start, androidx.ui.text.style.TextGeometricTransform stop, float fraction);
+ method public static androidx.compose.ui.text.style.TextGeometricTransform lerp(androidx.compose.ui.text.style.TextGeometricTransform start, androidx.compose.ui.text.style.TextGeometricTransform stop, float fraction);
}
@androidx.compose.Immutable public final class TextIndent {
method public long component1();
method public long component2();
- method @androidx.compose.Immutable public androidx.ui.text.style.TextIndent copy-gL_aCS0(long firstLine, long restLine);
+ method @androidx.compose.Immutable public androidx.compose.ui.text.style.TextIndent copy-gL_aCS0(long firstLine, long restLine);
method public long getFirstLine();
method public long getRestLine();
- field public static final androidx.ui.text.style.TextIndent.Companion Companion;
+ field public static final androidx.compose.ui.text.style.TextIndent.Companion Companion;
}
public static final class TextIndent.Companion {
- method public androidx.ui.text.style.TextIndent getNone();
- property public final androidx.ui.text.style.TextIndent None;
+ method public androidx.compose.ui.text.style.TextIndent getNone();
+ property public final androidx.compose.ui.text.style.TextIndent None;
}
public final class TextIndentKt {
- method public static androidx.ui.text.style.TextIndent lerp(androidx.ui.text.style.TextIndent start, androidx.ui.text.style.TextIndent stop, float fraction);
+ 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);
}
public enum TextOverflow {
- method public static androidx.ui.text.style.TextOverflow valueOf(String name) throws java.lang.IllegalArgumentException;
- method public static androidx.ui.text.style.TextOverflow[] values();
- enum_constant public static final androidx.ui.text.style.TextOverflow Clip;
- enum_constant public static final androidx.ui.text.style.TextOverflow Ellipsis;
+ method public static androidx.compose.ui.text.style.TextOverflow valueOf(String name) throws java.lang.IllegalArgumentException;
+ method public static androidx.compose.ui.text.style.TextOverflow[] values();
+ enum_constant public static final androidx.compose.ui.text.style.TextOverflow Clip;
+ enum_constant public static final androidx.compose.ui.text.style.TextOverflow Ellipsis;
}
}
diff --git a/ui/ui-text-core/api/public_plus_experimental_0.1.0-dev16.txt b/ui/ui-text-core/api/public_plus_experimental_0.1.0-dev16.txt
index b5c1f07..f75dd52 100644
--- a/ui/ui-text-core/api/public_plus_experimental_0.1.0-dev16.txt
+++ b/ui/ui-text-core/api/public_plus_experimental_0.1.0-dev16.txt
@@ -1,321 +1,38 @@
// Signature format: 3.0
-package androidx.ui.input {
-
- public final class BackspaceKeyEditOp implements androidx.ui.input.EditOperation {
- ctor public BackspaceKeyEditOp();
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- public final class CommitTextEditOp implements androidx.ui.input.EditOperation {
- ctor public CommitTextEditOp(String text, int newCursorPosition);
- method public String component1();
- method public int component2();
- method public androidx.ui.input.CommitTextEditOp copy(String text, int newCursorPosition);
- method public int getNewCursorPosition();
- method public String getText();
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- public final class DeleteAllEditOp implements androidx.ui.input.EditOperation {
- ctor public DeleteAllEditOp();
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- public final class DeleteSurroundingTextEditOp implements androidx.ui.input.EditOperation {
- ctor public DeleteSurroundingTextEditOp(int beforeLength, int afterLength);
- method public int component1();
- method public int component2();
- method public androidx.ui.input.DeleteSurroundingTextEditOp copy(int beforeLength, int afterLength);
- method public int getAfterLength();
- method public int getBeforeLength();
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- public final class DeleteSurroundingTextInCodePointsEditOp implements androidx.ui.input.EditOperation {
- ctor public DeleteSurroundingTextInCodePointsEditOp(int beforeLength, int afterLength);
- method public int component1();
- method public int component2();
- method public androidx.ui.input.DeleteSurroundingTextInCodePointsEditOp copy(int beforeLength, int afterLength);
- method public int getAfterLength();
- method public int getBeforeLength();
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- public interface EditOperation {
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- public final class EditingBuffer {
- ctor public EditingBuffer(String initialText, androidx.ui.text.TextRange initialSelection);
- field public static final int NOWHERE = -1; // 0xffffffff
- }
-
- @Deprecated @androidx.compose.Immutable public final class EditorValue {
- ctor @Deprecated public EditorValue(String text, androidx.ui.text.TextRange selection, androidx.ui.text.TextRange? composition);
- ctor @Deprecated public EditorValue();
- method @Deprecated public String component1();
- method @Deprecated public androidx.ui.text.TextRange component2();
- method @Deprecated public androidx.ui.text.TextRange? component3();
- method @Deprecated @androidx.compose.Immutable public androidx.ui.input.EditorValue copy(String text, androidx.ui.text.TextRange selection, androidx.ui.text.TextRange? composition);
- method @Deprecated public androidx.ui.text.TextRange? getComposition();
- method @Deprecated public String getSelectedText();
- method @Deprecated public androidx.ui.text.TextRange getSelection();
- method @Deprecated public String getText();
- method @Deprecated public String getTextAfterSelection(int maxChars);
- method @Deprecated public String getTextBeforeSelection(int maxChars);
- }
-
- public final class FinishComposingTextEditOp implements androidx.ui.input.EditOperation {
- ctor public FinishComposingTextEditOp();
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- public final class GapBufferKt {
- }
-
- public enum ImeAction {
- method public static androidx.ui.input.ImeAction valueOf(String name) throws java.lang.IllegalArgumentException;
- method public static androidx.ui.input.ImeAction[] values();
- enum_constant public static final androidx.ui.input.ImeAction Done;
- enum_constant public static final androidx.ui.input.ImeAction Go;
- enum_constant public static final androidx.ui.input.ImeAction Next;
- enum_constant public static final androidx.ui.input.ImeAction NoAction;
- enum_constant public static final androidx.ui.input.ImeAction Previous;
- enum_constant public static final androidx.ui.input.ImeAction Search;
- enum_constant public static final androidx.ui.input.ImeAction Send;
- enum_constant public static final androidx.ui.input.ImeAction Unspecified;
- }
-
- public interface InputEventListener {
- method public void onEditOperations(java.util.List<? extends androidx.ui.input.EditOperation> editOps);
- method public void onImeAction(androidx.ui.input.ImeAction imeAction);
- }
-
- public enum KeyboardType {
- method public static androidx.ui.input.KeyboardType valueOf(String name) throws java.lang.IllegalArgumentException;
- method public static androidx.ui.input.KeyboardType[] values();
- enum_constant public static final androidx.ui.input.KeyboardType Ascii;
- enum_constant public static final androidx.ui.input.KeyboardType Email;
- enum_constant public static final androidx.ui.input.KeyboardType Number;
- enum_constant public static final androidx.ui.input.KeyboardType NumberPassword;
- enum_constant public static final androidx.ui.input.KeyboardType Password;
- enum_constant public static final androidx.ui.input.KeyboardType Phone;
- enum_constant public static final androidx.ui.input.KeyboardType Text;
- enum_constant public static final androidx.ui.input.KeyboardType Uri;
- }
-
- public final class MoveCursorEditOp implements androidx.ui.input.EditOperation {
- ctor public MoveCursorEditOp(int amount);
- method public int component1();
- method public androidx.ui.input.MoveCursorEditOp copy(int amount);
- method public int getAmount();
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- public interface OffsetMap {
- method public int originalToTransformed(int offset);
- method public int transformedToOriginal(int offset);
- field public static final androidx.ui.input.OffsetMap.Companion Companion;
- }
-
- public static final class OffsetMap.Companion {
- method public androidx.ui.input.OffsetMap getIdentityOffsetMap();
- property public final androidx.ui.input.OffsetMap identityOffsetMap;
- }
-
- public final class PasswordVisualTransformation implements androidx.ui.input.VisualTransformation {
- ctor public PasswordVisualTransformation(char mask);
- ctor public PasswordVisualTransformation();
- method public char component1();
- method public androidx.ui.input.PasswordVisualTransformation copy(char mask);
- method public androidx.ui.input.TransformedText filter(androidx.ui.text.AnnotatedString text);
- method public char getMask();
- }
-
- public interface PlatformTextInputService {
- method public void hideSoftwareKeyboard();
- method public void notifyFocusedRect(androidx.ui.geometry.Rect rect);
- method public void onStateUpdated(androidx.ui.input.TextFieldValue value);
- method public void showSoftwareKeyboard();
- method public void startInput(androidx.ui.input.TextFieldValue value, androidx.ui.input.KeyboardType keyboardType, androidx.ui.input.ImeAction imeAction, kotlin.jvm.functions.Function1<? super java.util.List<? extends androidx.ui.input.EditOperation>,kotlin.Unit> onEditCommand, kotlin.jvm.functions.Function1<? super androidx.ui.input.ImeAction,kotlin.Unit> onImeActionPerformed);
- method public void stopInput();
- }
-
- public final class SetComposingRegionEditOp implements androidx.ui.input.EditOperation {
- ctor public SetComposingRegionEditOp(int start, int end);
- method public int component1();
- method public int component2();
- method public androidx.ui.input.SetComposingRegionEditOp copy(int start, int end);
- method public int getEnd();
- method public int getStart();
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- public final class SetComposingTextEditOp implements androidx.ui.input.EditOperation {
- ctor public SetComposingTextEditOp(String text, int newCursorPosition);
- method public String component1();
- method public int component2();
- method public androidx.ui.input.SetComposingTextEditOp copy(String text, int newCursorPosition);
- method public int getNewCursorPosition();
- method public String getText();
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- public final class SetSelectionEditOp implements androidx.ui.input.EditOperation {
- ctor public SetSelectionEditOp(int start, int end);
- method public int component1();
- method public int component2();
- method public androidx.ui.input.SetSelectionEditOp copy(int start, int end);
- method public int getEnd();
- method public int getStart();
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- @androidx.compose.Immutable public final class TextFieldValue {
- ctor public TextFieldValue(String text, androidx.ui.text.TextRange selection, androidx.ui.text.TextRange? composition);
- ctor public TextFieldValue();
- method public String component1();
- method public androidx.ui.text.TextRange component2();
- method public androidx.ui.text.TextRange? component3();
- method @androidx.compose.Immutable public androidx.ui.input.TextFieldValue copy(String text, androidx.ui.text.TextRange selection, androidx.ui.text.TextRange? composition);
- method public androidx.ui.text.TextRange? getComposition();
- method public androidx.ui.text.TextRange getSelection();
- method public String getText();
- field public static final androidx.ui.input.TextFieldValue.Companion Companion;
- }
-
- public static final class TextFieldValue.Companion {
- method public androidx.compose.runtime.savedinstancestate.Saver<androidx.ui.input.TextFieldValue,java.lang.Object> getSaver();
- property public final androidx.compose.runtime.savedinstancestate.Saver<androidx.ui.input.TextFieldValue,java.lang.Object> Saver;
- }
-
- public final class TextFieldValueKt {
- method public static String getSelectedText(androidx.ui.input.TextFieldValue);
- method public static String getTextAfterSelection(androidx.ui.input.TextFieldValue, int maxChars);
- method public static String getTextBeforeSelection(androidx.ui.input.TextFieldValue, int maxChars);
- }
-
- public class TextInputService {
- ctor public TextInputService(androidx.ui.input.PlatformTextInputService platformTextInputService);
- method public void hideSoftwareKeyboard(int token);
- method public void notifyFocusedRect(int token, androidx.ui.geometry.Rect rect);
- method public void onStateUpdated(int token, androidx.ui.input.TextFieldValue value);
- method public void showSoftwareKeyboard(int token);
- method public int startInput(androidx.ui.input.TextFieldValue value, androidx.ui.input.KeyboardType keyboardType, androidx.ui.input.ImeAction imeAction, kotlin.jvm.functions.Function1<? super java.util.List<? extends androidx.ui.input.EditOperation>,kotlin.Unit> onEditCommand, kotlin.jvm.functions.Function1<? super androidx.ui.input.ImeAction,kotlin.Unit> onImeActionPerformed);
- method public void stopInput(int token);
- }
-
- public final class TextInputServiceKt {
- method @Deprecated public static kotlin.jvm.functions.Function1<androidx.ui.input.PlatformTextInputService,androidx.ui.input.TextInputService> getTextInputServiceFactory();
- method @Deprecated public static void setTextInputServiceFactory(kotlin.jvm.functions.Function1<? super androidx.ui.input.PlatformTextInputService,? extends androidx.ui.input.TextInputService> p);
- field public static final int INVALID_SESSION = -1; // 0xffffffff
- field public static final int NO_SESSION = 0; // 0x0
- }
-
- public final class TransformedText {
- ctor public TransformedText(androidx.ui.text.AnnotatedString transformedText, androidx.ui.input.OffsetMap offsetMap);
- method public androidx.ui.text.AnnotatedString component1();
- method public androidx.ui.input.OffsetMap component2();
- method public androidx.ui.input.TransformedText copy(androidx.ui.text.AnnotatedString transformedText, androidx.ui.input.OffsetMap offsetMap);
- method public androidx.ui.input.OffsetMap getOffsetMap();
- method public androidx.ui.text.AnnotatedString getTransformedText();
- }
-
- @androidx.compose.Immutable public interface VisualTransformation {
- method public androidx.ui.input.TransformedText filter(androidx.ui.text.AnnotatedString text);
- field public static final androidx.ui.input.VisualTransformation.Companion Companion;
- }
-
- public static final class VisualTransformation.Companion {
- method public androidx.ui.input.VisualTransformation getNone();
- property public final androidx.ui.input.VisualTransformation None;
- }
-
-}
-
-package androidx.ui.intl {
-
- public final class AndroidPlatformLocaleKt {
- }
-
- @androidx.compose.Immutable public final class Locale {
- ctor public Locale(String languageTag);
- method public String getLanguage();
- method public String getRegion();
- method public String getScript();
- method public String toLanguageTag();
- property public final String language;
- property public final String region;
- property public final String script;
- field public static final androidx.ui.intl.Locale.Companion Companion;
- }
-
- public static final class Locale.Companion {
- method public androidx.ui.intl.Locale getCurrent();
- property public final androidx.ui.intl.Locale current;
- }
-
- @androidx.compose.Immutable public final class LocaleList implements java.util.Collection<androidx.ui.intl.Locale> kotlin.jvm.internal.markers.KMappedMarker {
- ctor public LocaleList(java.util.List<androidx.ui.intl.Locale> localeList);
- ctor public LocaleList(String languageTags);
- ctor public LocaleList(androidx.ui.intl.Locale... locales);
- method public java.util.List<androidx.ui.intl.Locale> component1();
- method public operator boolean contains(androidx.ui.intl.Locale element);
- method public boolean containsAll(java.util.Collection<?> elements);
- method @androidx.compose.Immutable public androidx.ui.intl.LocaleList copy(java.util.List<androidx.ui.intl.Locale> localeList);
- method public operator androidx.ui.intl.Locale get(int i);
- method public java.util.List<androidx.ui.intl.Locale> getLocaleList();
- method public int getSize();
- method public boolean isEmpty();
- method public java.util.Iterator<androidx.ui.intl.Locale> iterator();
- property public int size;
- field public static final androidx.ui.intl.LocaleList.Companion Companion;
- }
-
- public static final class LocaleList.Companion {
- method public androidx.ui.intl.LocaleList getCurrent();
- property public final androidx.ui.intl.LocaleList current;
- }
-
- public final class PlatformLocaleKt {
- }
-
-}
-
-package androidx.ui.text {
+package androidx.compose.ui.text {
@androidx.compose.Immutable public final class AnnotatedString {
- ctor public AnnotatedString(String text, java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.SpanStyle>> spanStyles, java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.ParagraphStyle>> paragraphStyles);
+ ctor public AnnotatedString(String text, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> spanStyles, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.ParagraphStyle>> paragraphStyles);
method public String component1();
- method public java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.SpanStyle>> component2();
- method public java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.ParagraphStyle>> component3();
- method @androidx.compose.Immutable public androidx.ui.text.AnnotatedString copy(String text, java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.SpanStyle>> spanStyles, java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.ParagraphStyle>> paragraphStyles, java.util.List<androidx.ui.text.AnnotatedString.Range<java.lang.String>> annotations);
- method public java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.ParagraphStyle>> getParagraphStyles();
- method public java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.SpanStyle>> getSpanStyles();
- method public java.util.List<androidx.ui.text.AnnotatedString.Range<java.lang.String>> getStringAnnotations(String tag, int start, int end);
- method public java.util.List<androidx.ui.text.AnnotatedString.Range<java.lang.String>> getStringAnnotations(int start, int end);
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> component2();
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.ParagraphStyle>> component3();
+ method @androidx.compose.Immutable public androidx.compose.ui.text.AnnotatedString copy(String text, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> spanStyles, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.ParagraphStyle>> paragraphStyles, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<java.lang.String>> annotations);
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.ParagraphStyle>> getParagraphStyles();
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> getSpanStyles();
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<java.lang.String>> getStringAnnotations(String tag, int start, int end);
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<java.lang.String>> getStringAnnotations(int start, int end);
method public String getText();
- method @androidx.compose.Stable public operator androidx.ui.text.AnnotatedString plus(androidx.ui.text.AnnotatedString other);
+ method @androidx.compose.Stable public operator androidx.compose.ui.text.AnnotatedString plus(androidx.compose.ui.text.AnnotatedString other);
}
public static final class AnnotatedString.Builder {
ctor public AnnotatedString.Builder(int capacity);
ctor public AnnotatedString.Builder();
ctor public AnnotatedString.Builder(String text);
- ctor public AnnotatedString.Builder(androidx.ui.text.AnnotatedString text);
+ ctor public AnnotatedString.Builder(androidx.compose.ui.text.AnnotatedString text);
method public void addStringAnnotation(String scope, String annotation, int start, int end);
- method public void addStyle(androidx.ui.text.SpanStyle style, int start, int end);
- method public void addStyle(androidx.ui.text.ParagraphStyle style, int start, int end);
+ method public void addStyle(androidx.compose.ui.text.SpanStyle style, int start, int end);
+ method public void addStyle(androidx.compose.ui.text.ParagraphStyle style, int start, int end);
method public void append(String text);
method public void append(char p);
- method public void append(androidx.ui.text.AnnotatedString text);
+ method public void append(androidx.compose.ui.text.AnnotatedString text);
method public int getLength();
method public void pop();
method public void pop(int index);
method public int pushStringAnnotation(String tag, String annotation);
- method public int pushStyle(androidx.ui.text.SpanStyle style);
- method public int pushStyle(androidx.ui.text.ParagraphStyle style);
- method public androidx.ui.text.AnnotatedString toAnnotatedString();
+ method public int pushStyle(androidx.compose.ui.text.SpanStyle style);
+ method public int pushStyle(androidx.compose.ui.text.ParagraphStyle style);
+ method public androidx.compose.ui.text.AnnotatedString toAnnotatedString();
property public final int length;
}
@@ -326,7 +43,7 @@
method public int component2();
method public int component3();
method public String component4();
- method public androidx.ui.text.AnnotatedString.Range<T> copy(T! item, int start, int end, String tag);
+ method public androidx.compose.ui.text.AnnotatedString.Range<T> copy(T! item, int start, int end, String tag);
method public int getEnd();
method public T! getItem();
method public int getStart();
@@ -334,18 +51,18 @@
}
public final class AnnotatedStringKt {
- method public static androidx.ui.text.AnnotatedString AnnotatedString(String text, androidx.ui.text.SpanStyle spanStyle, androidx.ui.text.ParagraphStyle? paragraphStyle = null);
- method public static androidx.ui.text.AnnotatedString AnnotatedString(String text, androidx.ui.text.ParagraphStyle paragraphStyle);
- method @Deprecated public static inline androidx.ui.text.AnnotatedString AnnotatedString(kotlin.jvm.functions.Function1<? super androidx.ui.text.AnnotatedString.Builder,kotlin.Unit> builder);
- method public static inline androidx.ui.text.AnnotatedString annotatedString(kotlin.jvm.functions.Function1<? super androidx.ui.text.AnnotatedString.Builder,kotlin.Unit> builder);
- method public static androidx.ui.text.AnnotatedString capitalize(androidx.ui.text.AnnotatedString, androidx.ui.intl.LocaleList localeList = LocaleList.current);
- method public static androidx.ui.text.AnnotatedString decapitalize(androidx.ui.text.AnnotatedString, androidx.ui.intl.LocaleList localeList = LocaleList.current);
- method public static int getLength(androidx.ui.text.AnnotatedString);
- method public static androidx.ui.text.AnnotatedString subSequence(androidx.ui.text.AnnotatedString, int start, int end);
- method public static androidx.ui.text.AnnotatedString toLowerCase(androidx.ui.text.AnnotatedString, androidx.ui.intl.LocaleList localeList = LocaleList.current);
- method public static androidx.ui.text.AnnotatedString toUpperCase(androidx.ui.text.AnnotatedString, androidx.ui.intl.LocaleList localeList = LocaleList.current);
- method public static inline <R> R withStyle(androidx.ui.text.AnnotatedString.Builder, androidx.ui.text.SpanStyle style, kotlin.jvm.functions.Function1<? super androidx.ui.text.AnnotatedString.Builder,? extends R> block);
- method public static inline <R> R withStyle(androidx.ui.text.AnnotatedString.Builder, androidx.ui.text.ParagraphStyle style, kotlin.jvm.functions.Function1<? super androidx.ui.text.AnnotatedString.Builder,? extends R> block);
+ method public static androidx.compose.ui.text.AnnotatedString AnnotatedString(String text, androidx.compose.ui.text.SpanStyle spanStyle, androidx.compose.ui.text.ParagraphStyle? paragraphStyle = null);
+ method public static androidx.compose.ui.text.AnnotatedString AnnotatedString(String text, androidx.compose.ui.text.ParagraphStyle paragraphStyle);
+ method @Deprecated public static inline androidx.compose.ui.text.AnnotatedString AnnotatedString(kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.AnnotatedString.Builder,kotlin.Unit> builder);
+ method public static inline androidx.compose.ui.text.AnnotatedString annotatedString(kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.AnnotatedString.Builder,kotlin.Unit> builder);
+ method public static androidx.compose.ui.text.AnnotatedString capitalize(androidx.compose.ui.text.AnnotatedString, androidx.compose.ui.text.intl.LocaleList localeList = LocaleList.current);
+ method public static androidx.compose.ui.text.AnnotatedString decapitalize(androidx.compose.ui.text.AnnotatedString, androidx.compose.ui.text.intl.LocaleList localeList = LocaleList.current);
+ method public static int getLength(androidx.compose.ui.text.AnnotatedString);
+ method public static androidx.compose.ui.text.AnnotatedString subSequence(androidx.compose.ui.text.AnnotatedString, int start, int end);
+ method public static androidx.compose.ui.text.AnnotatedString toLowerCase(androidx.compose.ui.text.AnnotatedString, androidx.compose.ui.text.intl.LocaleList localeList = LocaleList.current);
+ method public static androidx.compose.ui.text.AnnotatedString toUpperCase(androidx.compose.ui.text.AnnotatedString, androidx.compose.ui.text.intl.LocaleList localeList = LocaleList.current);
+ method public static inline <R> R withStyle(androidx.compose.ui.text.AnnotatedString.Builder, androidx.compose.ui.text.SpanStyle style, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.AnnotatedString.Builder,? extends R> block);
+ method public static inline <R> R withStyle(androidx.compose.ui.text.AnnotatedString.Builder, androidx.compose.ui.text.ParagraphStyle style, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.AnnotatedString.Builder,? extends R> block);
}
@kotlin.RequiresOptIn(level=RequiresOptIn.Level.ERROR, message="This is internal API that may change frequently and without warning.") @kotlin.annotation.Target(allowedTargets={AnnotationTarget.CLASS, AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY}) public @interface InternalTextApi {
@@ -355,16 +72,16 @@
}
public final class MultiParagraph {
- ctor public MultiParagraph(androidx.ui.text.MultiParagraphIntrinsics intrinsics, int maxLines, boolean ellipsis, androidx.ui.text.ParagraphConstraints constraints);
- ctor public MultiParagraph(androidx.ui.text.AnnotatedString annotatedString, androidx.ui.text.TextStyle style, java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>> placeholders, int maxLines, boolean ellipsis, androidx.ui.text.ParagraphConstraints constraints, androidx.ui.unit.Density density, androidx.ui.text.font.Font.ResourceLoader resourceLoader);
- method public androidx.ui.text.style.ResolvedTextDirection getBidiRunDirection(int offset);
+ ctor public MultiParagraph(androidx.compose.ui.text.MultiParagraphIntrinsics intrinsics, int maxLines, boolean ellipsis, androidx.compose.ui.text.ParagraphConstraints constraints);
+ ctor public MultiParagraph(androidx.compose.ui.text.AnnotatedString annotatedString, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, int maxLines, boolean ellipsis, androidx.compose.ui.text.ParagraphConstraints constraints, androidx.ui.unit.Density density, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getBidiRunDirection(int offset);
method public androidx.ui.geometry.Rect getBoundingBox(int offset);
method public androidx.ui.geometry.Rect getCursorRect(int offset);
method public boolean getDidExceedMaxLines();
method public float getFirstBaseline();
method public float getHeight();
method public float getHorizontalPosition(int offset, boolean usePrimaryDirection);
- method public androidx.ui.text.MultiParagraphIntrinsics getIntrinsics();
+ method public androidx.compose.ui.text.MultiParagraphIntrinsics getIntrinsics();
method public float getLastBaseline();
method public float getLineBottom(int lineIndex);
method public int getLineCount();
@@ -382,11 +99,11 @@
method public int getMaxLines();
method public float getMinIntrinsicWidth();
method public int getOffsetForPosition(androidx.ui.geometry.Offset position);
- method public androidx.ui.text.style.ResolvedTextDirection getParagraphDirection(int offset);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getParagraphDirection(int offset);
method public androidx.ui.graphics.Path getPathForRange(int start, int end);
method public java.util.List<androidx.ui.geometry.Rect> getPlaceholderRects();
method public float getWidth();
- method public androidx.ui.text.TextRange getWordBoundary(int offset);
+ method public androidx.compose.ui.text.TextRange getWordBoundary(int offset);
method public void paint(androidx.ui.graphics.Canvas canvas);
property public final boolean didExceedMaxLines;
property public final float firstBaseline;
@@ -399,12 +116,12 @@
property public final float width;
}
- public final class MultiParagraphIntrinsics implements androidx.ui.text.ParagraphIntrinsics {
- ctor public MultiParagraphIntrinsics(androidx.ui.text.AnnotatedString annotatedString, androidx.ui.text.TextStyle style, java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>> placeholders, androidx.ui.unit.Density density, androidx.ui.text.font.Font.ResourceLoader resourceLoader);
- method public androidx.ui.text.AnnotatedString getAnnotatedString();
+ public final class MultiParagraphIntrinsics implements androidx.compose.ui.text.ParagraphIntrinsics {
+ ctor public MultiParagraphIntrinsics(androidx.compose.ui.text.AnnotatedString annotatedString, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, androidx.ui.unit.Density density, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader);
+ method public androidx.compose.ui.text.AnnotatedString getAnnotatedString();
method public float getMaxIntrinsicWidth();
method public float getMinIntrinsicWidth();
- method public java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>> getPlaceholders();
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> getPlaceholders();
property public float maxIntrinsicWidth;
property public float minIntrinsicWidth;
}
@@ -416,7 +133,7 @@
}
public interface Paragraph {
- method public androidx.ui.text.style.ResolvedTextDirection getBidiRunDirection(int offset);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getBidiRunDirection(int offset);
method public androidx.ui.geometry.Rect getBoundingBox(int offset);
method public androidx.ui.geometry.Rect getCursorRect(int offset);
method public boolean getDidExceedMaxLines();
@@ -439,11 +156,11 @@
method public float getMaxIntrinsicWidth();
method public float getMinIntrinsicWidth();
method public int getOffsetForPosition(androidx.ui.geometry.Offset position);
- method public androidx.ui.text.style.ResolvedTextDirection getParagraphDirection(int offset);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getParagraphDirection(int offset);
method public androidx.ui.graphics.Path getPathForRange(int start, int end);
method public java.util.List<androidx.ui.geometry.Rect> getPlaceholderRects();
method public float getWidth();
- method public androidx.ui.text.TextRange getWordBoundary(int offset);
+ method public androidx.compose.ui.text.TextRange getWordBoundary(int offset);
method public void paint(androidx.ui.graphics.Canvas canvas);
property public abstract boolean didExceedMaxLines;
property public abstract float firstBaseline;
@@ -459,7 +176,7 @@
public final class ParagraphConstraints {
ctor public ParagraphConstraints(float width);
method public float component1();
- method public androidx.ui.text.ParagraphConstraints copy(float width);
+ method public androidx.compose.ui.text.ParagraphConstraints copy(float width);
method public float getWidth();
}
@@ -471,56 +188,56 @@
}
public final class ParagraphIntrinsicsKt {
- method public static androidx.ui.text.ParagraphIntrinsics ParagraphIntrinsics(String text, androidx.ui.text.TextStyle style, java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.SpanStyle>> spanStyles = listOf(), java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>> placeholders = listOf(), androidx.ui.unit.Density density, androidx.ui.text.font.Font.ResourceLoader resourceLoader);
+ method public static androidx.compose.ui.text.ParagraphIntrinsics ParagraphIntrinsics(String text, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> spanStyles = listOf(), java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders = listOf(), androidx.ui.unit.Density density, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader);
}
public final class ParagraphKt {
- method public static androidx.ui.text.Paragraph Paragraph(String text, androidx.ui.text.TextStyle style, java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.SpanStyle>> spanStyles = listOf(), java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>> placeholders = listOf(), int maxLines = 2147483647, boolean ellipsis = false, androidx.ui.text.ParagraphConstraints constraints, androidx.ui.unit.Density density, androidx.ui.text.font.Font.ResourceLoader resourceLoader);
- method public static androidx.ui.text.Paragraph Paragraph(androidx.ui.text.ParagraphIntrinsics paragraphIntrinsics, int maxLines = 2147483647, boolean ellipsis = false, androidx.ui.text.ParagraphConstraints constraints);
+ method public static androidx.compose.ui.text.Paragraph Paragraph(String text, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> spanStyles = listOf(), java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders = listOf(), int maxLines = 2147483647, boolean ellipsis = false, androidx.compose.ui.text.ParagraphConstraints constraints, androidx.ui.unit.Density density, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader);
+ method public static androidx.compose.ui.text.Paragraph Paragraph(androidx.compose.ui.text.ParagraphIntrinsics paragraphIntrinsics, int maxLines = 2147483647, boolean ellipsis = false, androidx.compose.ui.text.ParagraphConstraints constraints);
}
@androidx.compose.Immutable public final class ParagraphStyle {
- method public androidx.ui.text.style.TextAlign? component1();
- method public androidx.ui.text.style.TextDirection? component2();
+ method public androidx.compose.ui.text.style.TextAlign? component1();
+ method public androidx.compose.ui.text.style.TextDirection? component2();
method public long component3();
- method public androidx.ui.text.style.TextIndent? component4();
- method @androidx.compose.Immutable public androidx.ui.text.ParagraphStyle copy-JVmhFNw(androidx.ui.text.style.TextAlign? textAlign, androidx.ui.text.style.TextDirection? textDirection, long lineHeight, androidx.ui.text.style.TextIndent? textIndent);
+ method public androidx.compose.ui.text.style.TextIndent? component4();
+ method @androidx.compose.Immutable public androidx.compose.ui.text.ParagraphStyle copy-yfYFPjM(androidx.compose.ui.text.style.TextAlign? textAlign, androidx.compose.ui.text.style.TextDirection? textDirection, long lineHeight, androidx.compose.ui.text.style.TextIndent? textIndent);
method public long getLineHeight();
- method public androidx.ui.text.style.TextAlign? getTextAlign();
- method public androidx.ui.text.style.TextDirection? getTextDirection();
- method public androidx.ui.text.style.TextIndent? getTextIndent();
- method @androidx.compose.Stable public androidx.ui.text.ParagraphStyle merge(androidx.ui.text.ParagraphStyle? other = null);
- method @androidx.compose.Stable public operator androidx.ui.text.ParagraphStyle plus(androidx.ui.text.ParagraphStyle other);
+ 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.Stable public androidx.compose.ui.text.ParagraphStyle merge(androidx.compose.ui.text.ParagraphStyle? other = null);
+ method @androidx.compose.Stable public operator androidx.compose.ui.text.ParagraphStyle plus(androidx.compose.ui.text.ParagraphStyle other);
}
public final class ParagraphStyleKt {
- method @androidx.compose.Stable public static androidx.ui.text.ParagraphStyle lerp(androidx.ui.text.ParagraphStyle start, androidx.ui.text.ParagraphStyle stop, float fraction);
+ method @androidx.compose.Stable public static androidx.compose.ui.text.ParagraphStyle lerp(androidx.compose.ui.text.ParagraphStyle start, androidx.compose.ui.text.ParagraphStyle stop, float fraction);
}
@androidx.compose.Immutable public final class Placeholder {
method public long component1();
method public long component2();
- method public androidx.ui.text.PlaceholderVerticalAlign component3();
- method @androidx.compose.Immutable public androidx.ui.text.Placeholder copy-eLqjHCw(long width, long height, androidx.ui.text.PlaceholderVerticalAlign placeholderVerticalAlign);
+ method public androidx.compose.ui.text.PlaceholderVerticalAlign component3();
+ method @androidx.compose.Immutable public androidx.compose.ui.text.Placeholder copy-LxtbTAo(long width, long height, androidx.compose.ui.text.PlaceholderVerticalAlign placeholderVerticalAlign);
method public long getHeight();
- method public androidx.ui.text.PlaceholderVerticalAlign getPlaceholderVerticalAlign();
+ method public androidx.compose.ui.text.PlaceholderVerticalAlign getPlaceholderVerticalAlign();
method public long getWidth();
}
public enum PlaceholderVerticalAlign {
- method public static androidx.ui.text.PlaceholderVerticalAlign valueOf(String name) throws java.lang.IllegalArgumentException;
- method public static androidx.ui.text.PlaceholderVerticalAlign[] values();
- enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign AboveBaseline;
- enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign Bottom;
- enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign Center;
- enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign TextBottom;
- enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign TextCenter;
- enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign TextTop;
- enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign Top;
+ method public static androidx.compose.ui.text.PlaceholderVerticalAlign valueOf(String name) throws java.lang.IllegalArgumentException;
+ method public static androidx.compose.ui.text.PlaceholderVerticalAlign[] values();
+ enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign AboveBaseline;
+ enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign Bottom;
+ enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign Center;
+ enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign TextBottom;
+ enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign TextCenter;
+ enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign TextTop;
+ enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign Top;
}
public final class SoftwareKeyboardController {
- ctor public SoftwareKeyboardController(androidx.ui.input.TextInputService textInputService, int token);
+ ctor public SoftwareKeyboardController(androidx.compose.ui.text.input.TextInputService textInputService, int token);
method public void hideSoftwareKeyboard();
method public void notifyFocusedRect(androidx.ui.geometry.Rect rect);
method public void showSoftwareKeyboard();
@@ -528,86 +245,86 @@
@androidx.compose.Immutable public final class SpanStyle {
method public long component1();
- method public androidx.ui.text.style.TextGeometricTransform? component10();
- method public androidx.ui.intl.LocaleList? component11();
+ method public androidx.compose.ui.text.style.TextGeometricTransform? component10();
+ method public androidx.compose.ui.text.intl.LocaleList? component11();
method public long component12();
- method public androidx.ui.text.style.TextDecoration? component13();
+ method public androidx.compose.ui.text.style.TextDecoration? component13();
method public androidx.ui.graphics.Shadow? component14();
method public long component2();
- method public androidx.ui.text.font.FontWeight? component3();
- method public androidx.ui.text.font.FontStyle? component4();
- method public androidx.ui.text.font.FontSynthesis? component5();
- method public androidx.ui.text.font.FontFamily? component6();
+ method public androidx.compose.ui.text.font.FontWeight? component3();
+ method public androidx.compose.ui.text.font.FontStyle? component4();
+ method public androidx.compose.ui.text.font.FontSynthesis? component5();
+ method public androidx.compose.ui.text.font.FontFamily? component6();
method public String? component7();
method public long component8();
- method public androidx.ui.text.style.BaselineShift? component9();
- method @androidx.compose.Immutable public androidx.ui.text.SpanStyle copy-HjQ0eR4(long color, long fontSize, androidx.ui.text.font.FontWeight? fontWeight, androidx.ui.text.font.FontStyle? fontStyle, androidx.ui.text.font.FontSynthesis? fontSynthesis, androidx.ui.text.font.FontFamily? fontFamily, String? fontFeatureSettings, long letterSpacing, androidx.ui.text.style.BaselineShift? baselineShift, androidx.ui.text.style.TextGeometricTransform? textGeometricTransform, androidx.ui.intl.LocaleList? localeList, long background, androidx.ui.text.style.TextDecoration? textDecoration, androidx.ui.graphics.Shadow? shadow);
+ method public androidx.compose.ui.text.style.BaselineShift? component9();
+ method @androidx.compose.Immutable public androidx.compose.ui.text.SpanStyle copy-3JaCuMk(long color, long fontSize, androidx.compose.ui.text.font.FontWeight? fontWeight, androidx.compose.ui.text.font.FontStyle? fontStyle, androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, androidx.compose.ui.text.font.FontFamily? fontFamily, String? fontFeatureSettings, long letterSpacing, androidx.compose.ui.text.style.BaselineShift? baselineShift, androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, androidx.compose.ui.text.intl.LocaleList? localeList, long background, androidx.compose.ui.text.style.TextDecoration? textDecoration, androidx.ui.graphics.Shadow? shadow);
method public long getBackground();
- method public androidx.ui.text.style.BaselineShift? getBaselineShift();
+ method public androidx.compose.ui.text.style.BaselineShift? getBaselineShift();
method public long getColor();
- method public androidx.ui.text.font.FontFamily? getFontFamily();
+ method public androidx.compose.ui.text.font.FontFamily? getFontFamily();
method public String? getFontFeatureSettings();
method public long getFontSize();
- method public androidx.ui.text.font.FontStyle? getFontStyle();
- method public androidx.ui.text.font.FontSynthesis? getFontSynthesis();
- method public androidx.ui.text.font.FontWeight? getFontWeight();
+ method public androidx.compose.ui.text.font.FontStyle? getFontStyle();
+ method public androidx.compose.ui.text.font.FontSynthesis? getFontSynthesis();
+ method public androidx.compose.ui.text.font.FontWeight? getFontWeight();
method public long getLetterSpacing();
- method public androidx.ui.intl.LocaleList? getLocaleList();
+ method public androidx.compose.ui.text.intl.LocaleList? getLocaleList();
method public androidx.ui.graphics.Shadow? getShadow();
- method public androidx.ui.text.style.TextDecoration? getTextDecoration();
- method public androidx.ui.text.style.TextGeometricTransform? getTextGeometricTransform();
- method @androidx.compose.Stable public androidx.ui.text.SpanStyle merge(androidx.ui.text.SpanStyle? other = null);
- method @androidx.compose.Stable public operator androidx.ui.text.SpanStyle plus(androidx.ui.text.SpanStyle other);
+ method public androidx.compose.ui.text.style.TextDecoration? getTextDecoration();
+ method public androidx.compose.ui.text.style.TextGeometricTransform? getTextGeometricTransform();
+ method @androidx.compose.Stable public androidx.compose.ui.text.SpanStyle merge(androidx.compose.ui.text.SpanStyle? other = null);
+ method @androidx.compose.Stable public operator androidx.compose.ui.text.SpanStyle plus(androidx.compose.ui.text.SpanStyle other);
}
public final class SpanStyleKt {
- method public static androidx.ui.text.SpanStyle lerp(androidx.ui.text.SpanStyle start, androidx.ui.text.SpanStyle stop, float fraction);
+ method public static androidx.compose.ui.text.SpanStyle lerp(androidx.compose.ui.text.SpanStyle start, androidx.compose.ui.text.SpanStyle stop, float fraction);
}
public final class StringKt {
- method public static String capitalize(String, androidx.ui.intl.Locale locale);
- method public static String capitalize(String, androidx.ui.intl.LocaleList localeList);
- method public static String decapitalize(String, androidx.ui.intl.Locale locale);
- method public static String decapitalize(String, androidx.ui.intl.LocaleList localeList);
- method public static String toLowerCase(String, androidx.ui.intl.Locale locale);
- method public static String toLowerCase(String, androidx.ui.intl.LocaleList localeList);
- method public static String toUpperCase(String, androidx.ui.intl.Locale locale);
- method public static String toUpperCase(String, androidx.ui.intl.LocaleList localeList);
+ method public static String capitalize(String, androidx.compose.ui.text.intl.Locale locale);
+ method public static String capitalize(String, androidx.compose.ui.text.intl.LocaleList localeList);
+ method public static String decapitalize(String, androidx.compose.ui.text.intl.Locale locale);
+ method public static String decapitalize(String, androidx.compose.ui.text.intl.LocaleList localeList);
+ method public static String toLowerCase(String, androidx.compose.ui.text.intl.Locale locale);
+ method public static String toLowerCase(String, androidx.compose.ui.text.intl.LocaleList localeList);
+ method public static String toUpperCase(String, androidx.compose.ui.text.intl.Locale locale);
+ method public static String toUpperCase(String, androidx.compose.ui.text.intl.LocaleList localeList);
}
public final class TextLayoutHelperKt {
}
public final class TextLayoutInput {
- ctor public TextLayoutInput(androidx.ui.text.AnnotatedString text, androidx.ui.text.TextStyle style, java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>> placeholders, int maxLines, boolean softWrap, androidx.ui.text.style.TextOverflow overflow, androidx.ui.unit.Density density, androidx.ui.core.LayoutDirection layoutDirection, androidx.ui.text.font.Font.ResourceLoader resourceLoader, androidx.ui.core.Constraints constraints);
- method public androidx.ui.text.AnnotatedString component1();
+ ctor public TextLayoutInput(androidx.compose.ui.text.AnnotatedString text, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, int maxLines, boolean softWrap, androidx.compose.ui.text.style.TextOverflow overflow, androidx.ui.unit.Density density, androidx.ui.core.LayoutDirection layoutDirection, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader, androidx.ui.core.Constraints constraints);
+ method public androidx.compose.ui.text.AnnotatedString component1();
method public androidx.ui.core.Constraints component10();
- method public androidx.ui.text.TextStyle component2();
- method public java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>> component3();
+ method public androidx.compose.ui.text.TextStyle component2();
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> component3();
method public int component4();
method public boolean component5();
- method public androidx.ui.text.style.TextOverflow component6();
+ method public androidx.compose.ui.text.style.TextOverflow component6();
method public androidx.ui.unit.Density component7();
method public androidx.ui.core.LayoutDirection component8();
- method public androidx.ui.text.font.Font.ResourceLoader component9();
- method public androidx.ui.text.TextLayoutInput copy(androidx.ui.text.AnnotatedString text, androidx.ui.text.TextStyle style, java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>> placeholders, int maxLines, boolean softWrap, androidx.ui.text.style.TextOverflow overflow, androidx.ui.unit.Density density, androidx.ui.core.LayoutDirection layoutDirection, androidx.ui.text.font.Font.ResourceLoader resourceLoader, androidx.ui.core.Constraints constraints);
+ method public androidx.compose.ui.text.font.Font.ResourceLoader component9();
+ method public androidx.compose.ui.text.TextLayoutInput copy(androidx.compose.ui.text.AnnotatedString text, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, int maxLines, boolean softWrap, androidx.compose.ui.text.style.TextOverflow overflow, androidx.ui.unit.Density density, androidx.ui.core.LayoutDirection layoutDirection, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader, androidx.ui.core.Constraints constraints);
method public androidx.ui.core.Constraints getConstraints();
method public androidx.ui.unit.Density getDensity();
method public androidx.ui.core.LayoutDirection getLayoutDirection();
method public int getMaxLines();
- method public androidx.ui.text.style.TextOverflow getOverflow();
- method public java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>> getPlaceholders();
- method public androidx.ui.text.font.Font.ResourceLoader getResourceLoader();
+ method public androidx.compose.ui.text.style.TextOverflow getOverflow();
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> getPlaceholders();
+ method public androidx.compose.ui.text.font.Font.ResourceLoader getResourceLoader();
method public boolean getSoftWrap();
- method public androidx.ui.text.TextStyle getStyle();
- method public androidx.ui.text.AnnotatedString getText();
+ method public androidx.compose.ui.text.TextStyle getStyle();
+ method public androidx.compose.ui.text.AnnotatedString getText();
}
public final class TextLayoutResult {
- method public androidx.ui.text.TextLayoutInput component1();
+ method public androidx.compose.ui.text.TextLayoutInput component1();
method public androidx.ui.unit.IntSize component3();
- method public androidx.ui.text.TextLayoutResult copy(androidx.ui.text.TextLayoutInput layoutInput, androidx.ui.text.MultiParagraph multiParagraph, androidx.ui.unit.IntSize size);
- method public androidx.ui.text.style.ResolvedTextDirection getBidiRunDirection(int offset);
+ method public androidx.compose.ui.text.TextLayoutResult copy(androidx.compose.ui.text.TextLayoutInput layoutInput, androidx.compose.ui.text.MultiParagraph multiParagraph, androidx.ui.unit.IntSize size);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getBidiRunDirection(int offset);
method public androidx.ui.geometry.Rect getBoundingBox(int offset);
method public androidx.ui.geometry.Rect getCursorRect(int offset);
method public boolean getDidOverflowHeight();
@@ -616,7 +333,7 @@
method public boolean getHasVisualOverflow();
method public float getHorizontalPosition(int offset, boolean usePrimaryDirection);
method public float getLastBaseline();
- method public androidx.ui.text.TextLayoutInput getLayoutInput();
+ method public androidx.compose.ui.text.TextLayoutInput getLayoutInput();
method public float getLineBottom(int lineIndex);
method public int getLineCount();
method public int getLineEnd(int lineIndex);
@@ -626,11 +343,11 @@
method public int getLineStart(int lineIndex);
method public float getLineTop(int lineIndex);
method public int getOffsetForPosition(androidx.ui.geometry.Offset position);
- method public androidx.ui.text.style.ResolvedTextDirection getParagraphDirection(int offset);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getParagraphDirection(int offset);
method public androidx.ui.graphics.Path getPathForRange(int start, int end);
method public java.util.List<androidx.ui.geometry.Rect> getPlaceholderRects();
method public androidx.ui.unit.IntSize getSize();
- method public androidx.ui.text.TextRange getWordBoundary(int offset);
+ method public androidx.compose.ui.text.TextRange getWordBoundary(int offset);
property public final boolean didOverflowHeight;
property public final boolean didOverflowWidth;
property public final float firstBaseline;
@@ -641,17 +358,17 @@
}
public final class TextPainter {
- method public void paint(androidx.ui.graphics.Canvas canvas, androidx.ui.text.TextLayoutResult textLayoutResult);
- field public static final androidx.ui.text.TextPainter INSTANCE;
+ method public void paint(androidx.ui.graphics.Canvas canvas, androidx.compose.ui.text.TextLayoutResult textLayoutResult);
+ field public static final androidx.compose.ui.text.TextPainter INSTANCE;
}
@androidx.compose.Immutable public final class TextRange {
ctor public TextRange(@IntRange(from=null) int start, @IntRange(from=null) int end);
method public int component1();
method public int component2();
- method public operator boolean contains(androidx.ui.text.TextRange other);
+ method public operator boolean contains(androidx.compose.ui.text.TextRange other);
method public operator boolean contains(int offset);
- method @androidx.compose.Immutable public androidx.ui.text.TextRange copy(int start, int end);
+ method @androidx.compose.Immutable public androidx.compose.ui.text.TextRange copy(int start, int end);
method public boolean getCollapsed();
method public int getEnd();
method public int getLength();
@@ -659,274 +376,557 @@
method public int getMin();
method public boolean getReversed();
method public int getStart();
- method public boolean intersects(androidx.ui.text.TextRange other);
+ method public boolean intersects(androidx.compose.ui.text.TextRange other);
property public final boolean collapsed;
property public final int length;
property public final int max;
property public final int min;
property public final boolean reversed;
- field public static final androidx.ui.text.TextRange.Companion Companion;
+ field public static final androidx.compose.ui.text.TextRange.Companion Companion;
}
public static final class TextRange.Companion {
- method public androidx.ui.text.TextRange getZero();
- property public final androidx.ui.text.TextRange Zero;
+ method public androidx.compose.ui.text.TextRange getZero();
+ property public final androidx.compose.ui.text.TextRange Zero;
}
public final class TextRangeKt {
- method public static androidx.ui.text.TextRange TextRange(int index);
- method public static String substring(CharSequence, androidx.ui.text.TextRange range);
+ method public static androidx.compose.ui.text.TextRange TextRange(int index);
+ method public static String substring(CharSequence, androidx.compose.ui.text.TextRange range);
}
@androidx.compose.Immutable public final class TextStyle {
method public long component1();
- method public androidx.ui.text.style.TextGeometricTransform? component10();
- method public androidx.ui.intl.LocaleList? component11();
+ method public androidx.compose.ui.text.style.TextGeometricTransform? component10();
+ method public androidx.compose.ui.text.intl.LocaleList? component11();
method public long component12();
- method public androidx.ui.text.style.TextDecoration? component13();
+ method public androidx.compose.ui.text.style.TextDecoration? component13();
method public androidx.ui.graphics.Shadow? component14();
- method public androidx.ui.text.style.TextAlign? component15();
- method public androidx.ui.text.style.TextDirection? component16();
+ method public androidx.compose.ui.text.style.TextAlign? component15();
+ method public androidx.compose.ui.text.style.TextDirection? component16();
method public long component17();
- method public androidx.ui.text.style.TextIndent? component18();
+ method public androidx.compose.ui.text.style.TextIndent? component18();
method public long component2();
- method public androidx.ui.text.font.FontWeight? component3();
- method public androidx.ui.text.font.FontStyle? component4();
- method public androidx.ui.text.font.FontSynthesis? component5();
- method public androidx.ui.text.font.FontFamily? component6();
+ method public androidx.compose.ui.text.font.FontWeight? component3();
+ method public androidx.compose.ui.text.font.FontStyle? component4();
+ method public androidx.compose.ui.text.font.FontSynthesis? component5();
+ method public androidx.compose.ui.text.font.FontFamily? component6();
method public String? component7();
method public long component8();
- method public androidx.ui.text.style.BaselineShift? component9();
- method @androidx.compose.Immutable public androidx.ui.text.TextStyle copy-7aJ7aFo(long color, long fontSize, androidx.ui.text.font.FontWeight? fontWeight, androidx.ui.text.font.FontStyle? fontStyle, androidx.ui.text.font.FontSynthesis? fontSynthesis, androidx.ui.text.font.FontFamily? fontFamily, String? fontFeatureSettings, long letterSpacing, androidx.ui.text.style.BaselineShift? baselineShift, androidx.ui.text.style.TextGeometricTransform? textGeometricTransform, androidx.ui.intl.LocaleList? localeList, long background, androidx.ui.text.style.TextDecoration? textDecoration, androidx.ui.graphics.Shadow? shadow, androidx.ui.text.style.TextAlign? textAlign, androidx.ui.text.style.TextDirection? textDirection, long lineHeight, androidx.ui.text.style.TextIndent? textIndent);
+ method public androidx.compose.ui.text.style.BaselineShift? component9();
+ method @androidx.compose.Immutable public androidx.compose.ui.text.TextStyle copy-7Y_OIKU(long color, long fontSize, androidx.compose.ui.text.font.FontWeight? fontWeight, androidx.compose.ui.text.font.FontStyle? fontStyle, androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, androidx.compose.ui.text.font.FontFamily? fontFamily, String? fontFeatureSettings, long letterSpacing, androidx.compose.ui.text.style.BaselineShift? baselineShift, androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, androidx.compose.ui.text.intl.LocaleList? localeList, long background, androidx.compose.ui.text.style.TextDecoration? textDecoration, androidx.ui.graphics.Shadow? shadow, androidx.compose.ui.text.style.TextAlign? textAlign, androidx.compose.ui.text.style.TextDirection? textDirection, long lineHeight, androidx.compose.ui.text.style.TextIndent? textIndent);
method public long getBackground();
- method public androidx.ui.text.style.BaselineShift? getBaselineShift();
+ method public androidx.compose.ui.text.style.BaselineShift? getBaselineShift();
method public long getColor();
- method public androidx.ui.text.font.FontFamily? getFontFamily();
+ method public androidx.compose.ui.text.font.FontFamily? getFontFamily();
method public String? getFontFeatureSettings();
method public long getFontSize();
- method public androidx.ui.text.font.FontStyle? getFontStyle();
- method public androidx.ui.text.font.FontSynthesis? getFontSynthesis();
- method public androidx.ui.text.font.FontWeight? getFontWeight();
+ method public androidx.compose.ui.text.font.FontStyle? getFontStyle();
+ method public androidx.compose.ui.text.font.FontSynthesis? getFontSynthesis();
+ method public androidx.compose.ui.text.font.FontWeight? getFontWeight();
method public long getLetterSpacing();
method public long getLineHeight();
- method public androidx.ui.intl.LocaleList? getLocaleList();
+ method public androidx.compose.ui.text.intl.LocaleList? getLocaleList();
method public androidx.ui.graphics.Shadow? getShadow();
- method public androidx.ui.text.style.TextAlign? getTextAlign();
- method public androidx.ui.text.style.TextDecoration? getTextDecoration();
- method public androidx.ui.text.style.TextDirection? getTextDirection();
- method public androidx.ui.text.style.TextGeometricTransform? getTextGeometricTransform();
- method public androidx.ui.text.style.TextIndent? getTextIndent();
- method @androidx.compose.Stable public androidx.ui.text.TextStyle merge(androidx.ui.text.TextStyle? other = null);
- method @androidx.compose.Stable public androidx.ui.text.TextStyle merge(androidx.ui.text.SpanStyle other);
- method @androidx.compose.Stable public androidx.ui.text.TextStyle merge(androidx.ui.text.ParagraphStyle other);
- method @androidx.compose.Stable public operator androidx.ui.text.TextStyle plus(androidx.ui.text.TextStyle other);
- method @androidx.compose.Stable public operator androidx.ui.text.TextStyle plus(androidx.ui.text.ParagraphStyle other);
- method @androidx.compose.Stable public operator androidx.ui.text.TextStyle plus(androidx.ui.text.SpanStyle other);
- method @androidx.compose.Stable public androidx.ui.text.ParagraphStyle toParagraphStyle();
- method @androidx.compose.Stable public androidx.ui.text.SpanStyle toSpanStyle();
- field public static final androidx.ui.text.TextStyle.Companion Companion;
+ method public androidx.compose.ui.text.style.TextAlign? getTextAlign();
+ method public androidx.compose.ui.text.style.TextDecoration? getTextDecoration();
+ 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.Stable public androidx.compose.ui.text.TextStyle merge(androidx.compose.ui.text.TextStyle? other = null);
+ method @androidx.compose.Stable public androidx.compose.ui.text.TextStyle merge(androidx.compose.ui.text.SpanStyle other);
+ method @androidx.compose.Stable public androidx.compose.ui.text.TextStyle merge(androidx.compose.ui.text.ParagraphStyle other);
+ method @androidx.compose.Stable public operator androidx.compose.ui.text.TextStyle plus(androidx.compose.ui.text.TextStyle other);
+ method @androidx.compose.Stable public operator androidx.compose.ui.text.TextStyle plus(androidx.compose.ui.text.ParagraphStyle other);
+ method @androidx.compose.Stable public operator androidx.compose.ui.text.TextStyle plus(androidx.compose.ui.text.SpanStyle other);
+ method @androidx.compose.Stable public androidx.compose.ui.text.ParagraphStyle toParagraphStyle();
+ method @androidx.compose.Stable public androidx.compose.ui.text.SpanStyle toSpanStyle();
+ field public static final androidx.compose.ui.text.TextStyle.Companion Companion;
}
public static final class TextStyle.Companion {
- method public androidx.ui.text.TextStyle getDefault();
- property public final androidx.ui.text.TextStyle Default;
+ method public androidx.compose.ui.text.TextStyle getDefault();
+ property public final androidx.compose.ui.text.TextStyle Default;
}
public final class TextStyleKt {
- method public static androidx.ui.text.TextStyle lerp(androidx.ui.text.TextStyle start, androidx.ui.text.TextStyle stop, float fraction);
- method public static androidx.ui.text.TextStyle resolveDefaults(androidx.ui.text.TextStyle style, androidx.ui.core.LayoutDirection direction);
+ method public static androidx.compose.ui.text.TextStyle lerp(androidx.compose.ui.text.TextStyle start, androidx.compose.ui.text.TextStyle stop, float fraction);
+ method public static androidx.compose.ui.text.TextStyle resolveDefaults(androidx.compose.ui.text.TextStyle style, androidx.ui.core.LayoutDirection direction);
}
public interface Typeface {
- method public androidx.ui.text.font.FontFamily getFontFamily();
- property public abstract androidx.ui.text.font.FontFamily fontFamily;
+ method public androidx.compose.ui.text.font.FontFamily getFontFamily();
+ property public abstract androidx.compose.ui.text.font.FontFamily fontFamily;
}
}
-package androidx.ui.text.font {
+package androidx.compose.ui.text.font {
- public abstract sealed class FileBasedFontFamily extends androidx.ui.text.font.FontFamily {
+ public abstract sealed class FileBasedFontFamily extends androidx.compose.ui.text.font.FontFamily {
}
@androidx.compose.Immutable public interface Font {
- method public androidx.ui.text.font.FontStyle getStyle();
- method public androidx.ui.text.font.FontWeight getWeight();
- property public abstract androidx.ui.text.font.FontStyle style;
- property public abstract androidx.ui.text.font.FontWeight weight;
+ method public androidx.compose.ui.text.font.FontStyle getStyle();
+ method public androidx.compose.ui.text.font.FontWeight getWeight();
+ property public abstract androidx.compose.ui.text.font.FontStyle style;
+ property public abstract androidx.compose.ui.text.font.FontWeight weight;
}
public static interface Font.ResourceLoader {
- method public Object load(androidx.ui.text.font.Font font);
+ method public Object load(androidx.compose.ui.text.font.Font font);
}
@androidx.compose.Immutable public abstract sealed class FontFamily {
method public final boolean getCanLoadSynchronously();
- field public static final androidx.ui.text.font.FontFamily.Companion Companion;
+ field public static final androidx.compose.ui.text.font.FontFamily.Companion Companion;
}
public static final class FontFamily.Companion {
- method public androidx.ui.text.font.GenericFontFamily getCursive();
- method public androidx.ui.text.font.SystemFontFamily getDefault();
- method public androidx.ui.text.font.GenericFontFamily getMonospace();
- method public androidx.ui.text.font.GenericFontFamily getSansSerif();
- method public androidx.ui.text.font.GenericFontFamily getSerif();
- property public final androidx.ui.text.font.GenericFontFamily Cursive;
- property public final androidx.ui.text.font.SystemFontFamily Default;
- property public final androidx.ui.text.font.GenericFontFamily Monospace;
- property public final androidx.ui.text.font.GenericFontFamily SansSerif;
- property public final androidx.ui.text.font.GenericFontFamily Serif;
+ method public androidx.compose.ui.text.font.GenericFontFamily getCursive();
+ method public androidx.compose.ui.text.font.SystemFontFamily getDefault();
+ method public androidx.compose.ui.text.font.GenericFontFamily getMonospace();
+ method public androidx.compose.ui.text.font.GenericFontFamily getSansSerif();
+ method public androidx.compose.ui.text.font.GenericFontFamily getSerif();
+ property public final androidx.compose.ui.text.font.GenericFontFamily Cursive;
+ property public final androidx.compose.ui.text.font.SystemFontFamily Default;
+ property public final androidx.compose.ui.text.font.GenericFontFamily Monospace;
+ property public final androidx.compose.ui.text.font.GenericFontFamily SansSerif;
+ property public final androidx.compose.ui.text.font.GenericFontFamily Serif;
}
public final class FontFamilyKt {
- method @androidx.compose.Stable public static androidx.ui.text.font.FontListFontFamily fontFamily(java.util.List<? extends androidx.ui.text.font.Font> fonts);
- method @androidx.compose.Stable public static androidx.ui.text.font.FontListFontFamily fontFamily(androidx.ui.text.font.Font... fonts);
- method public static androidx.ui.text.font.LoadedFontFamily fontFamily(androidx.ui.text.Typeface typeface);
+ method @androidx.compose.Stable public static androidx.compose.ui.text.font.FontListFontFamily fontFamily(java.util.List<? extends androidx.compose.ui.text.font.Font> fonts);
+ method @androidx.compose.Stable public static androidx.compose.ui.text.font.FontListFontFamily fontFamily(androidx.compose.ui.text.font.Font... fonts);
+ method public static androidx.compose.ui.text.font.LoadedFontFamily fontFamily(androidx.compose.ui.text.Typeface typeface);
}
public final class FontKt {
- method @androidx.compose.Stable public static androidx.ui.text.font.FontListFontFamily asFontFamily(androidx.ui.text.font.Font);
- method @androidx.compose.Stable public static androidx.ui.text.font.Font font(int resId, androidx.ui.text.font.FontWeight weight = FontWeight.Normal, androidx.ui.text.font.FontStyle style = androidx.ui.text.font.FontStyle.Normal);
+ method @androidx.compose.Stable public static androidx.compose.ui.text.font.FontListFontFamily asFontFamily(androidx.compose.ui.text.font.Font);
+ method @androidx.compose.Stable public static androidx.compose.ui.text.font.Font font(int resId, androidx.compose.ui.text.font.FontWeight weight = FontWeight.Normal, androidx.compose.ui.text.font.FontStyle style = androidx.compose.ui.text.font.FontStyle.Normal);
}
- @androidx.compose.Immutable public final class FontListFontFamily extends androidx.ui.text.font.FileBasedFontFamily implements kotlin.jvm.internal.markers.KMappedMarker java.util.List<androidx.ui.text.font.Font> {
- ctor public FontListFontFamily(java.util.List<? extends androidx.ui.text.font.Font> fonts);
- method public java.util.List<androidx.ui.text.font.Font> component1();
- method public boolean contains(androidx.ui.text.font.Font element);
+ @androidx.compose.Immutable public final class FontListFontFamily extends androidx.compose.ui.text.font.FileBasedFontFamily implements kotlin.jvm.internal.markers.KMappedMarker java.util.List<androidx.compose.ui.text.font.Font> {
+ ctor public FontListFontFamily(java.util.List<? extends androidx.compose.ui.text.font.Font> fonts);
+ method public java.util.List<androidx.compose.ui.text.font.Font> component1();
+ method public boolean contains(androidx.compose.ui.text.font.Font element);
method public boolean containsAll(java.util.Collection<?> elements);
- method @androidx.compose.Immutable public androidx.ui.text.font.FontListFontFamily copy(java.util.List<? extends androidx.ui.text.font.Font> fonts);
- method public androidx.ui.text.font.Font get(int index);
- method public java.util.List<androidx.ui.text.font.Font> getFonts();
+ method @androidx.compose.Immutable public androidx.compose.ui.text.font.FontListFontFamily copy(java.util.List<? extends androidx.compose.ui.text.font.Font> fonts);
+ method public androidx.compose.ui.text.font.Font get(int index);
+ method public java.util.List<androidx.compose.ui.text.font.Font> getFonts();
method public int getSize();
- method public int indexOf(androidx.ui.text.font.Font element);
+ method public int indexOf(androidx.compose.ui.text.font.Font element);
method public boolean isEmpty();
- method public java.util.Iterator<androidx.ui.text.font.Font> iterator();
- method public int lastIndexOf(androidx.ui.text.font.Font element);
- method public java.util.ListIterator<androidx.ui.text.font.Font> listIterator();
- method public java.util.ListIterator<androidx.ui.text.font.Font> listIterator(int index);
- method public java.util.List<androidx.ui.text.font.Font> subList(int fromIndex, int toIndex);
+ method public java.util.Iterator<androidx.compose.ui.text.font.Font> iterator();
+ method public int lastIndexOf(androidx.compose.ui.text.font.Font element);
+ method public java.util.ListIterator<androidx.compose.ui.text.font.Font> listIterator();
+ method public java.util.ListIterator<androidx.compose.ui.text.font.Font> listIterator(int index);
+ method public java.util.List<androidx.compose.ui.text.font.Font> subList(int fromIndex, int toIndex);
}
public enum FontStyle {
- method public static androidx.ui.text.font.FontStyle valueOf(String name) throws java.lang.IllegalArgumentException;
- method public static androidx.ui.text.font.FontStyle[] values();
- enum_constant public static final androidx.ui.text.font.FontStyle Italic;
- enum_constant public static final androidx.ui.text.font.FontStyle Normal;
+ method public static androidx.compose.ui.text.font.FontStyle valueOf(String name) throws java.lang.IllegalArgumentException;
+ method public static androidx.compose.ui.text.font.FontStyle[] values();
+ enum_constant public static final androidx.compose.ui.text.font.FontStyle Italic;
+ enum_constant public static final androidx.compose.ui.text.font.FontStyle Normal;
}
public enum FontSynthesis {
- method public static androidx.ui.text.font.FontSynthesis valueOf(String name) throws java.lang.IllegalArgumentException;
- method public static androidx.ui.text.font.FontSynthesis[] values();
- enum_constant public static final androidx.ui.text.font.FontSynthesis All;
- enum_constant public static final androidx.ui.text.font.FontSynthesis None;
- enum_constant public static final androidx.ui.text.font.FontSynthesis Style;
- enum_constant public static final androidx.ui.text.font.FontSynthesis Weight;
+ method public static androidx.compose.ui.text.font.FontSynthesis valueOf(String name) throws java.lang.IllegalArgumentException;
+ method public static androidx.compose.ui.text.font.FontSynthesis[] values();
+ enum_constant public static final androidx.compose.ui.text.font.FontSynthesis All;
+ enum_constant public static final androidx.compose.ui.text.font.FontSynthesis None;
+ enum_constant public static final androidx.compose.ui.text.font.FontSynthesis Style;
+ enum_constant public static final androidx.compose.ui.text.font.FontSynthesis Weight;
}
- @androidx.compose.Immutable public final class FontWeight implements java.lang.Comparable<androidx.ui.text.font.FontWeight> {
+ @androidx.compose.Immutable public final class FontWeight implements java.lang.Comparable<androidx.compose.ui.text.font.FontWeight> {
ctor public FontWeight(int weight);
- method public int compareTo(androidx.ui.text.font.FontWeight other);
+ method public int compareTo(androidx.compose.ui.text.font.FontWeight other);
method public int component1();
- method @androidx.compose.Immutable public androidx.ui.text.font.FontWeight copy(int weight);
+ method @androidx.compose.Immutable public androidx.compose.ui.text.font.FontWeight copy(int weight);
method public int getWeight();
- field public static final androidx.ui.text.font.FontWeight.Companion Companion;
+ field public static final androidx.compose.ui.text.font.FontWeight.Companion Companion;
}
public static final class FontWeight.Companion {
- method public androidx.ui.text.font.FontWeight getBlack();
- method public androidx.ui.text.font.FontWeight getBold();
- method public androidx.ui.text.font.FontWeight getExtraBold();
- method public androidx.ui.text.font.FontWeight getExtraLight();
- method public androidx.ui.text.font.FontWeight getLight();
- method public androidx.ui.text.font.FontWeight getMedium();
- method public androidx.ui.text.font.FontWeight getNormal();
- method public androidx.ui.text.font.FontWeight getSemiBold();
- method public androidx.ui.text.font.FontWeight getThin();
- method public androidx.ui.text.font.FontWeight getW100();
- method public androidx.ui.text.font.FontWeight getW200();
- method public androidx.ui.text.font.FontWeight getW300();
- method public androidx.ui.text.font.FontWeight getW400();
- method public androidx.ui.text.font.FontWeight getW500();
- method public androidx.ui.text.font.FontWeight getW600();
- method public androidx.ui.text.font.FontWeight getW700();
- method public androidx.ui.text.font.FontWeight getW800();
- method public androidx.ui.text.font.FontWeight getW900();
- property public final androidx.ui.text.font.FontWeight Black;
- property public final androidx.ui.text.font.FontWeight Bold;
- property public final androidx.ui.text.font.FontWeight ExtraBold;
- property public final androidx.ui.text.font.FontWeight ExtraLight;
- property public final androidx.ui.text.font.FontWeight Light;
- property public final androidx.ui.text.font.FontWeight Medium;
- property public final androidx.ui.text.font.FontWeight Normal;
- property public final androidx.ui.text.font.FontWeight SemiBold;
- property public final androidx.ui.text.font.FontWeight Thin;
- property public final androidx.ui.text.font.FontWeight W100;
- property public final androidx.ui.text.font.FontWeight W200;
- property public final androidx.ui.text.font.FontWeight W300;
- property public final androidx.ui.text.font.FontWeight W400;
- property public final androidx.ui.text.font.FontWeight W500;
- property public final androidx.ui.text.font.FontWeight W600;
- property public final androidx.ui.text.font.FontWeight W700;
- property public final androidx.ui.text.font.FontWeight W800;
- property public final androidx.ui.text.font.FontWeight W900;
+ method public androidx.compose.ui.text.font.FontWeight getBlack();
+ method public androidx.compose.ui.text.font.FontWeight getBold();
+ method public androidx.compose.ui.text.font.FontWeight getExtraBold();
+ method public androidx.compose.ui.text.font.FontWeight getExtraLight();
+ method public androidx.compose.ui.text.font.FontWeight getLight();
+ method public androidx.compose.ui.text.font.FontWeight getMedium();
+ method public androidx.compose.ui.text.font.FontWeight getNormal();
+ method public androidx.compose.ui.text.font.FontWeight getSemiBold();
+ method public androidx.compose.ui.text.font.FontWeight getThin();
+ method public androidx.compose.ui.text.font.FontWeight getW100();
+ method public androidx.compose.ui.text.font.FontWeight getW200();
+ method public androidx.compose.ui.text.font.FontWeight getW300();
+ method public androidx.compose.ui.text.font.FontWeight getW400();
+ method public androidx.compose.ui.text.font.FontWeight getW500();
+ method public androidx.compose.ui.text.font.FontWeight getW600();
+ method public androidx.compose.ui.text.font.FontWeight getW700();
+ method public androidx.compose.ui.text.font.FontWeight getW800();
+ method public androidx.compose.ui.text.font.FontWeight getW900();
+ property public final androidx.compose.ui.text.font.FontWeight Black;
+ property public final androidx.compose.ui.text.font.FontWeight Bold;
+ property public final androidx.compose.ui.text.font.FontWeight ExtraBold;
+ property public final androidx.compose.ui.text.font.FontWeight ExtraLight;
+ property public final androidx.compose.ui.text.font.FontWeight Light;
+ property public final androidx.compose.ui.text.font.FontWeight Medium;
+ property public final androidx.compose.ui.text.font.FontWeight Normal;
+ property public final androidx.compose.ui.text.font.FontWeight SemiBold;
+ property public final androidx.compose.ui.text.font.FontWeight Thin;
+ property public final androidx.compose.ui.text.font.FontWeight W100;
+ property public final androidx.compose.ui.text.font.FontWeight W200;
+ property public final androidx.compose.ui.text.font.FontWeight W300;
+ property public final androidx.compose.ui.text.font.FontWeight W400;
+ property public final androidx.compose.ui.text.font.FontWeight W500;
+ property public final androidx.compose.ui.text.font.FontWeight W600;
+ property public final androidx.compose.ui.text.font.FontWeight W700;
+ property public final androidx.compose.ui.text.font.FontWeight W800;
+ property public final androidx.compose.ui.text.font.FontWeight W900;
}
public final class FontWeightKt {
- method public static androidx.ui.text.font.FontWeight lerp(androidx.ui.text.font.FontWeight start, androidx.ui.text.font.FontWeight stop, float fraction);
+ method public static androidx.compose.ui.text.font.FontWeight lerp(androidx.compose.ui.text.font.FontWeight start, androidx.compose.ui.text.font.FontWeight stop, float fraction);
}
- @androidx.compose.Immutable public final class GenericFontFamily extends androidx.ui.text.font.SystemFontFamily {
+ @androidx.compose.Immutable public final class GenericFontFamily extends androidx.compose.ui.text.font.SystemFontFamily {
method public String getName();
}
- public final class LoadedFontFamily extends androidx.ui.text.font.FontFamily {
- ctor public LoadedFontFamily(androidx.ui.text.Typeface typeface);
- method public androidx.ui.text.Typeface component1();
- method public androidx.ui.text.font.LoadedFontFamily copy(androidx.ui.text.Typeface typeface);
- method public androidx.ui.text.Typeface getTypeface();
+ public final class LoadedFontFamily extends androidx.compose.ui.text.font.FontFamily {
+ ctor public LoadedFontFamily(androidx.compose.ui.text.Typeface typeface);
+ method public androidx.compose.ui.text.Typeface component1();
+ method public androidx.compose.ui.text.font.LoadedFontFamily copy(androidx.compose.ui.text.Typeface typeface);
+ method public androidx.compose.ui.text.Typeface getTypeface();
}
- public final class ResourceFont implements androidx.ui.text.font.Font {
- ctor public ResourceFont(int resId, androidx.ui.text.font.FontWeight weight, androidx.ui.text.font.FontStyle style);
+ public final class ResourceFont implements androidx.compose.ui.text.font.Font {
+ ctor public ResourceFont(int resId, androidx.compose.ui.text.font.FontWeight weight, androidx.compose.ui.text.font.FontStyle style);
method public int component1();
- method public androidx.ui.text.font.FontWeight component2();
- method public androidx.ui.text.font.FontStyle component3();
- method public androidx.ui.text.font.ResourceFont copy(int resId, androidx.ui.text.font.FontWeight weight, androidx.ui.text.font.FontStyle style);
+ method public androidx.compose.ui.text.font.FontWeight component2();
+ method public androidx.compose.ui.text.font.FontStyle component3();
+ method public androidx.compose.ui.text.font.ResourceFont copy(int resId, androidx.compose.ui.text.font.FontWeight weight, androidx.compose.ui.text.font.FontStyle style);
method public int getResId();
- method public androidx.ui.text.font.FontStyle getStyle();
- method public androidx.ui.text.font.FontWeight getWeight();
+ method public androidx.compose.ui.text.font.FontStyle getStyle();
+ method public androidx.compose.ui.text.font.FontWeight getWeight();
}
- public abstract sealed class SystemFontFamily extends androidx.ui.text.font.FontFamily {
+ public abstract sealed class SystemFontFamily extends androidx.compose.ui.text.font.FontFamily {
}
}
-package androidx.ui.text.platform {
+package androidx.compose.ui.text.input {
+
+ public final class BackspaceKeyEditOp implements androidx.compose.ui.text.input.EditOperation {
+ ctor public BackspaceKeyEditOp();
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public final class CommitTextEditOp implements androidx.compose.ui.text.input.EditOperation {
+ ctor public CommitTextEditOp(String text, int newCursorPosition);
+ method public String component1();
+ method public int component2();
+ method public androidx.compose.ui.text.input.CommitTextEditOp copy(String text, int newCursorPosition);
+ method public int getNewCursorPosition();
+ method public String getText();
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public final class DeleteAllEditOp implements androidx.compose.ui.text.input.EditOperation {
+ ctor public DeleteAllEditOp();
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public final class DeleteSurroundingTextEditOp implements androidx.compose.ui.text.input.EditOperation {
+ ctor public DeleteSurroundingTextEditOp(int beforeLength, int afterLength);
+ method public int component1();
+ method public int component2();
+ method public androidx.compose.ui.text.input.DeleteSurroundingTextEditOp copy(int beforeLength, int afterLength);
+ method public int getAfterLength();
+ method public int getBeforeLength();
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public final class DeleteSurroundingTextInCodePointsEditOp implements androidx.compose.ui.text.input.EditOperation {
+ ctor public DeleteSurroundingTextInCodePointsEditOp(int beforeLength, int afterLength);
+ method public int component1();
+ method public int component2();
+ method public androidx.compose.ui.text.input.DeleteSurroundingTextInCodePointsEditOp copy(int beforeLength, int afterLength);
+ method public int getAfterLength();
+ method public int getBeforeLength();
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public interface EditOperation {
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public final class EditingBuffer {
+ ctor public EditingBuffer(String initialText, androidx.compose.ui.text.TextRange initialSelection);
+ field public static final int NOWHERE = -1; // 0xffffffff
+ }
+
+ @Deprecated @androidx.compose.Immutable public final class EditorValue {
+ ctor @Deprecated public EditorValue(String text, androidx.compose.ui.text.TextRange selection, androidx.compose.ui.text.TextRange? composition);
+ ctor @Deprecated public EditorValue();
+ method @Deprecated public String component1();
+ method @Deprecated public androidx.compose.ui.text.TextRange component2();
+ method @Deprecated public androidx.compose.ui.text.TextRange? component3();
+ method @Deprecated @androidx.compose.Immutable public androidx.compose.ui.text.input.EditorValue copy(String text, androidx.compose.ui.text.TextRange selection, androidx.compose.ui.text.TextRange? composition);
+ method @Deprecated public androidx.compose.ui.text.TextRange? getComposition();
+ method @Deprecated public String getSelectedText();
+ method @Deprecated public androidx.compose.ui.text.TextRange getSelection();
+ method @Deprecated public String getText();
+ method @Deprecated public String getTextAfterSelection(int maxChars);
+ method @Deprecated public String getTextBeforeSelection(int maxChars);
+ }
+
+ public final class FinishComposingTextEditOp implements androidx.compose.ui.text.input.EditOperation {
+ ctor public FinishComposingTextEditOp();
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public final class GapBufferKt {
+ }
+
+ public enum ImeAction {
+ method public static androidx.compose.ui.text.input.ImeAction valueOf(String name) throws java.lang.IllegalArgumentException;
+ method public static androidx.compose.ui.text.input.ImeAction[] values();
+ enum_constant public static final androidx.compose.ui.text.input.ImeAction Done;
+ enum_constant public static final androidx.compose.ui.text.input.ImeAction Go;
+ enum_constant public static final androidx.compose.ui.text.input.ImeAction Next;
+ enum_constant public static final androidx.compose.ui.text.input.ImeAction NoAction;
+ enum_constant public static final androidx.compose.ui.text.input.ImeAction Previous;
+ enum_constant public static final androidx.compose.ui.text.input.ImeAction Search;
+ enum_constant public static final androidx.compose.ui.text.input.ImeAction Send;
+ enum_constant public static final androidx.compose.ui.text.input.ImeAction Unspecified;
+ }
+
+ public interface InputEventListener {
+ method public void onEditOperations(java.util.List<? extends androidx.compose.ui.text.input.EditOperation> editOps);
+ method public void onImeAction(androidx.compose.ui.text.input.ImeAction imeAction);
+ }
+
+ public enum KeyboardType {
+ method public static androidx.compose.ui.text.input.KeyboardType valueOf(String name) throws java.lang.IllegalArgumentException;
+ method public static androidx.compose.ui.text.input.KeyboardType[] values();
+ enum_constant public static final androidx.compose.ui.text.input.KeyboardType Ascii;
+ enum_constant public static final androidx.compose.ui.text.input.KeyboardType Email;
+ enum_constant public static final androidx.compose.ui.text.input.KeyboardType Number;
+ enum_constant public static final androidx.compose.ui.text.input.KeyboardType NumberPassword;
+ enum_constant public static final androidx.compose.ui.text.input.KeyboardType Password;
+ enum_constant public static final androidx.compose.ui.text.input.KeyboardType Phone;
+ enum_constant public static final androidx.compose.ui.text.input.KeyboardType Text;
+ enum_constant public static final androidx.compose.ui.text.input.KeyboardType Uri;
+ }
+
+ public final class MoveCursorEditOp implements androidx.compose.ui.text.input.EditOperation {
+ ctor public MoveCursorEditOp(int amount);
+ method public int component1();
+ method public androidx.compose.ui.text.input.MoveCursorEditOp copy(int amount);
+ method public int getAmount();
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public interface OffsetMap {
+ method public int originalToTransformed(int offset);
+ method public int transformedToOriginal(int offset);
+ field public static final androidx.compose.ui.text.input.OffsetMap.Companion Companion;
+ }
+
+ public static final class OffsetMap.Companion {
+ method public androidx.compose.ui.text.input.OffsetMap getIdentityOffsetMap();
+ property public final androidx.compose.ui.text.input.OffsetMap identityOffsetMap;
+ }
+
+ public final class PasswordVisualTransformation implements androidx.compose.ui.text.input.VisualTransformation {
+ ctor public PasswordVisualTransformation(char mask);
+ ctor public PasswordVisualTransformation();
+ method public char component1();
+ method public androidx.compose.ui.text.input.PasswordVisualTransformation copy(char mask);
+ method public androidx.compose.ui.text.input.TransformedText filter(androidx.compose.ui.text.AnnotatedString text);
+ method public char getMask();
+ }
+
+ public interface PlatformTextInputService {
+ method public void hideSoftwareKeyboard();
+ method public void notifyFocusedRect(androidx.ui.geometry.Rect rect);
+ method public void onStateUpdated(androidx.compose.ui.text.input.TextFieldValue value);
+ method public void showSoftwareKeyboard();
+ method public void startInput(androidx.compose.ui.text.input.TextFieldValue value, androidx.compose.ui.text.input.KeyboardType keyboardType, androidx.compose.ui.text.input.ImeAction imeAction, kotlin.jvm.functions.Function1<? super java.util.List<? extends androidx.compose.ui.text.input.EditOperation>,kotlin.Unit> onEditCommand, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.ImeAction,kotlin.Unit> onImeActionPerformed);
+ method public void stopInput();
+ }
+
+ public final class SetComposingRegionEditOp implements androidx.compose.ui.text.input.EditOperation {
+ ctor public SetComposingRegionEditOp(int start, int end);
+ method public int component1();
+ method public int component2();
+ method public androidx.compose.ui.text.input.SetComposingRegionEditOp copy(int start, int end);
+ method public int getEnd();
+ method public int getStart();
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public final class SetComposingTextEditOp implements androidx.compose.ui.text.input.EditOperation {
+ ctor public SetComposingTextEditOp(String text, int newCursorPosition);
+ method public String component1();
+ method public int component2();
+ method public androidx.compose.ui.text.input.SetComposingTextEditOp copy(String text, int newCursorPosition);
+ method public int getNewCursorPosition();
+ method public String getText();
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public final class SetSelectionEditOp implements androidx.compose.ui.text.input.EditOperation {
+ ctor public SetSelectionEditOp(int start, int end);
+ method public int component1();
+ method public int component2();
+ method public androidx.compose.ui.text.input.SetSelectionEditOp copy(int start, int end);
+ method public int getEnd();
+ method public int getStart();
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ @androidx.compose.Immutable public final class TextFieldValue {
+ ctor public TextFieldValue(String text, androidx.compose.ui.text.TextRange selection, androidx.compose.ui.text.TextRange? composition);
+ ctor public TextFieldValue();
+ method public String component1();
+ method public androidx.compose.ui.text.TextRange component2();
+ method public androidx.compose.ui.text.TextRange? component3();
+ method @androidx.compose.Immutable public androidx.compose.ui.text.input.TextFieldValue copy(String text, androidx.compose.ui.text.TextRange selection, androidx.compose.ui.text.TextRange? composition);
+ method public androidx.compose.ui.text.TextRange? getComposition();
+ method public androidx.compose.ui.text.TextRange getSelection();
+ method public String getText();
+ field public static final androidx.compose.ui.text.input.TextFieldValue.Companion Companion;
+ }
+
+ public static final class TextFieldValue.Companion {
+ method public androidx.compose.runtime.savedinstancestate.Saver<androidx.compose.ui.text.input.TextFieldValue,java.lang.Object> getSaver();
+ property public final androidx.compose.runtime.savedinstancestate.Saver<androidx.compose.ui.text.input.TextFieldValue,java.lang.Object> Saver;
+ }
+
+ public final class TextFieldValueKt {
+ method public static String getSelectedText(androidx.compose.ui.text.input.TextFieldValue);
+ method public static String getTextAfterSelection(androidx.compose.ui.text.input.TextFieldValue, int maxChars);
+ method public static String getTextBeforeSelection(androidx.compose.ui.text.input.TextFieldValue, int maxChars);
+ }
+
+ public class TextInputService {
+ ctor public TextInputService(androidx.compose.ui.text.input.PlatformTextInputService platformTextInputService);
+ method public void hideSoftwareKeyboard(int token);
+ method public void notifyFocusedRect(int token, androidx.ui.geometry.Rect rect);
+ method public void onStateUpdated(int token, androidx.compose.ui.text.input.TextFieldValue value);
+ method public void showSoftwareKeyboard(int token);
+ method public int startInput(androidx.compose.ui.text.input.TextFieldValue value, androidx.compose.ui.text.input.KeyboardType keyboardType, androidx.compose.ui.text.input.ImeAction imeAction, kotlin.jvm.functions.Function1<? super java.util.List<? extends androidx.compose.ui.text.input.EditOperation>,kotlin.Unit> onEditCommand, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.ImeAction,kotlin.Unit> onImeActionPerformed);
+ method public void stopInput(int token);
+ }
+
+ public final class TextInputServiceKt {
+ method @Deprecated public static kotlin.jvm.functions.Function1<androidx.compose.ui.text.input.PlatformTextInputService,androidx.compose.ui.text.input.TextInputService> getTextInputServiceFactory();
+ method @Deprecated public static void setTextInputServiceFactory(kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.PlatformTextInputService,? extends androidx.compose.ui.text.input.TextInputService> p);
+ field public static final int INVALID_SESSION = -1; // 0xffffffff
+ field public static final int NO_SESSION = 0; // 0x0
+ }
+
+ public final class TransformedText {
+ ctor public TransformedText(androidx.compose.ui.text.AnnotatedString transformedText, androidx.compose.ui.text.input.OffsetMap offsetMap);
+ method public androidx.compose.ui.text.AnnotatedString component1();
+ method public androidx.compose.ui.text.input.OffsetMap component2();
+ method public androidx.compose.ui.text.input.TransformedText copy(androidx.compose.ui.text.AnnotatedString transformedText, androidx.compose.ui.text.input.OffsetMap offsetMap);
+ method public androidx.compose.ui.text.input.OffsetMap getOffsetMap();
+ method public androidx.compose.ui.text.AnnotatedString getTransformedText();
+ }
+
+ @androidx.compose.Immutable public interface VisualTransformation {
+ method public androidx.compose.ui.text.input.TransformedText filter(androidx.compose.ui.text.AnnotatedString text);
+ field public static final androidx.compose.ui.text.input.VisualTransformation.Companion Companion;
+ }
+
+ public static final class VisualTransformation.Companion {
+ method public androidx.compose.ui.text.input.VisualTransformation getNone();
+ property public final androidx.compose.ui.text.input.VisualTransformation None;
+ }
+
+}
+
+package androidx.compose.ui.text.intl {
+
+ public final class AndroidPlatformLocaleKt {
+ }
+
+ @androidx.compose.Immutable public final class Locale {
+ ctor public Locale(String languageTag);
+ method public String getLanguage();
+ method public String getRegion();
+ method public String getScript();
+ method public String toLanguageTag();
+ property public final String language;
+ property public final String region;
+ property public final String script;
+ field public static final androidx.compose.ui.text.intl.Locale.Companion Companion;
+ }
+
+ public static final class Locale.Companion {
+ method public androidx.compose.ui.text.intl.Locale getCurrent();
+ property public final androidx.compose.ui.text.intl.Locale current;
+ }
+
+ @androidx.compose.Immutable public final class LocaleList implements java.util.Collection<androidx.compose.ui.text.intl.Locale> kotlin.jvm.internal.markers.KMappedMarker {
+ ctor public LocaleList(java.util.List<androidx.compose.ui.text.intl.Locale> localeList);
+ ctor public LocaleList(String languageTags);
+ ctor public LocaleList(androidx.compose.ui.text.intl.Locale... locales);
+ method public java.util.List<androidx.compose.ui.text.intl.Locale> component1();
+ method public operator boolean contains(androidx.compose.ui.text.intl.Locale element);
+ method public boolean containsAll(java.util.Collection<?> elements);
+ method @androidx.compose.Immutable public androidx.compose.ui.text.intl.LocaleList copy(java.util.List<androidx.compose.ui.text.intl.Locale> localeList);
+ method public operator androidx.compose.ui.text.intl.Locale get(int i);
+ method public java.util.List<androidx.compose.ui.text.intl.Locale> getLocaleList();
+ method public int getSize();
+ method public boolean isEmpty();
+ method public java.util.Iterator<androidx.compose.ui.text.intl.Locale> iterator();
+ property public int size;
+ field public static final androidx.compose.ui.text.intl.LocaleList.Companion Companion;
+ }
+
+ public static final class LocaleList.Companion {
+ method public androidx.compose.ui.text.intl.LocaleList getCurrent();
+ property public final androidx.compose.ui.text.intl.LocaleList current;
+ }
+
+ public final class PlatformLocaleKt {
+ }
+
+}
+
+package androidx.compose.ui.text.platform {
public final class AndroidParagraphHelperKt {
}
public final class AndroidParagraphIntrinsicsKt {
- method @Deprecated public static kotlin.jvm.functions.Function6<java.lang.String,androidx.ui.text.TextStyle,java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.SpanStyle>>,java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>>,androidx.ui.unit.Density,androidx.ui.text.font.Font.ResourceLoader,androidx.ui.text.ParagraphIntrinsics> getParagraphIntrinsicsActualFactory();
- method @Deprecated public static void setParagraphIntrinsicsActualFactory(kotlin.jvm.functions.Function6<? super java.lang.String,? super androidx.ui.text.TextStyle,? super java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.SpanStyle>>,? super java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>>,? super androidx.ui.unit.Density,? super androidx.ui.text.font.Font.ResourceLoader,? extends androidx.ui.text.ParagraphIntrinsics> p);
+ method @Deprecated public static kotlin.jvm.functions.Function6<java.lang.String,androidx.compose.ui.text.TextStyle,java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>>,java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>>,androidx.ui.unit.Density,androidx.compose.ui.text.font.Font.ResourceLoader,androidx.compose.ui.text.ParagraphIntrinsics> getParagraphIntrinsicsActualFactory();
+ method @Deprecated public static void setParagraphIntrinsicsActualFactory(kotlin.jvm.functions.Function6<? super java.lang.String,? super androidx.compose.ui.text.TextStyle,? super java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>>,? super java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>>,? super androidx.ui.unit.Density,? super androidx.compose.ui.text.font.Font.ResourceLoader,? extends androidx.compose.ui.text.ParagraphIntrinsics> p);
}
public final class AndroidParagraphKt {
- method @Deprecated public static kotlin.jvm.functions.Function4<androidx.ui.text.ParagraphIntrinsics,java.lang.Integer,java.lang.Boolean,androidx.ui.text.ParagraphConstraints,androidx.ui.text.Paragraph> getParagraphActualFactory();
- method @Deprecated public static void setParagraphActualFactory(kotlin.jvm.functions.Function4<? super androidx.ui.text.ParagraphIntrinsics,? super java.lang.Integer,? super java.lang.Boolean,? super androidx.ui.text.ParagraphConstraints,? extends androidx.ui.text.Paragraph> p);
+ method @Deprecated public static kotlin.jvm.functions.Function4<androidx.compose.ui.text.ParagraphIntrinsics,java.lang.Integer,java.lang.Boolean,androidx.compose.ui.text.ParagraphConstraints,androidx.compose.ui.text.Paragraph> getParagraphActualFactory();
+ method @Deprecated public static void setParagraphActualFactory(kotlin.jvm.functions.Function4<? super androidx.compose.ui.text.ParagraphIntrinsics,? super java.lang.Integer,? super java.lang.Boolean,? super androidx.compose.ui.text.ParagraphConstraints,? extends androidx.compose.ui.text.Paragraph> p);
}
public final class AndroidStringDelegateKt {
}
public final class TypefaceAdapterKt {
- method public static androidx.ui.text.Typeface typefaceFromFontFamily(android.content.Context context, androidx.ui.text.font.FontFamily fontFamily, java.util.List<? extends kotlin.Pair<androidx.ui.text.font.FontWeight,? extends androidx.ui.text.font.FontStyle>>? necessaryStyles = null);
+ method public static androidx.compose.ui.text.Typeface typefaceFromFontFamily(android.content.Context context, androidx.compose.ui.text.font.FontFamily fontFamily, java.util.List<? extends kotlin.Pair<androidx.compose.ui.text.font.FontWeight,? extends androidx.compose.ui.text.font.FontStyle>>? necessaryStyles = null);
}
}
-package androidx.ui.text.platform.extensions {
+package androidx.compose.ui.text.platform.extensions {
public final class LocaleExtensionsKt {
}
@@ -942,7 +942,7 @@
}
-package androidx.ui.text.style {
+package androidx.compose.ui.text.style {
@androidx.compose.Immutable public final inline class BaselineShift {
ctor public BaselineShift();
@@ -952,7 +952,7 @@
method public float getMultiplier();
method @androidx.compose.Immutable public static inline int hashCode-impl(float p);
method @androidx.compose.Immutable public static inline String! toString-impl(float p);
- field public static final androidx.ui.text.style.BaselineShift.Companion Companion;
+ field public static final androidx.compose.ui.text.style.BaselineShift.Companion Companion;
}
public static final class BaselineShift.Companion {
@@ -965,54 +965,54 @@
}
public final class BaselineShiftKt {
- method @androidx.compose.Stable public static float lerp-7csQwvo(float start, float stop, float fraction);
+ method @androidx.compose.Stable public static float lerp-ylBt8J4(float start, float stop, float fraction);
}
public enum ResolvedTextDirection {
- method public static androidx.ui.text.style.ResolvedTextDirection valueOf(String name) throws java.lang.IllegalArgumentException;
- method public static androidx.ui.text.style.ResolvedTextDirection[] values();
- enum_constant public static final androidx.ui.text.style.ResolvedTextDirection Ltr;
- enum_constant public static final androidx.ui.text.style.ResolvedTextDirection Rtl;
+ method public static androidx.compose.ui.text.style.ResolvedTextDirection valueOf(String name) throws java.lang.IllegalArgumentException;
+ method public static androidx.compose.ui.text.style.ResolvedTextDirection[] values();
+ enum_constant public static final androidx.compose.ui.text.style.ResolvedTextDirection Ltr;
+ enum_constant public static final androidx.compose.ui.text.style.ResolvedTextDirection Rtl;
}
public enum TextAlign {
- method public static androidx.ui.text.style.TextAlign valueOf(String name) throws java.lang.IllegalArgumentException;
- method public static androidx.ui.text.style.TextAlign[] values();
- enum_constant public static final androidx.ui.text.style.TextAlign Center;
- enum_constant public static final androidx.ui.text.style.TextAlign End;
- enum_constant public static final androidx.ui.text.style.TextAlign Justify;
- enum_constant public static final androidx.ui.text.style.TextAlign Left;
- enum_constant public static final androidx.ui.text.style.TextAlign Right;
- enum_constant public static final androidx.ui.text.style.TextAlign Start;
+ method public static androidx.compose.ui.text.style.TextAlign valueOf(String name) throws java.lang.IllegalArgumentException;
+ method public static androidx.compose.ui.text.style.TextAlign[] values();
+ enum_constant public static final androidx.compose.ui.text.style.TextAlign Center;
+ enum_constant public static final androidx.compose.ui.text.style.TextAlign End;
+ enum_constant public static final androidx.compose.ui.text.style.TextAlign Justify;
+ enum_constant public static final androidx.compose.ui.text.style.TextAlign Left;
+ enum_constant public static final androidx.compose.ui.text.style.TextAlign Right;
+ enum_constant public static final androidx.compose.ui.text.style.TextAlign Start;
}
@androidx.compose.Immutable public final class TextDecoration {
method public int component1();
- method public operator boolean contains(androidx.ui.text.style.TextDecoration other);
- method @androidx.compose.Immutable public androidx.ui.text.style.TextDecoration copy(int mask);
+ method public operator boolean contains(androidx.compose.ui.text.style.TextDecoration other);
+ method @androidx.compose.Immutable public androidx.compose.ui.text.style.TextDecoration copy(int mask);
method public int getMask();
- method public operator androidx.ui.text.style.TextDecoration plus(androidx.ui.text.style.TextDecoration decoration);
- field public static final androidx.ui.text.style.TextDecoration.Companion Companion;
+ method public operator androidx.compose.ui.text.style.TextDecoration plus(androidx.compose.ui.text.style.TextDecoration decoration);
+ field public static final androidx.compose.ui.text.style.TextDecoration.Companion Companion;
}
public static final class TextDecoration.Companion {
- method public androidx.ui.text.style.TextDecoration combine(java.util.List<androidx.ui.text.style.TextDecoration> decorations);
- method public androidx.ui.text.style.TextDecoration getLineThrough();
- method public androidx.ui.text.style.TextDecoration getNone();
- method public androidx.ui.text.style.TextDecoration getUnderline();
- property public final androidx.ui.text.style.TextDecoration LineThrough;
- property public final androidx.ui.text.style.TextDecoration None;
- property public final androidx.ui.text.style.TextDecoration Underline;
+ method public androidx.compose.ui.text.style.TextDecoration combine(java.util.List<androidx.compose.ui.text.style.TextDecoration> decorations);
+ method public androidx.compose.ui.text.style.TextDecoration getLineThrough();
+ method public androidx.compose.ui.text.style.TextDecoration getNone();
+ method public androidx.compose.ui.text.style.TextDecoration getUnderline();
+ property public final androidx.compose.ui.text.style.TextDecoration LineThrough;
+ property public final androidx.compose.ui.text.style.TextDecoration None;
+ property public final androidx.compose.ui.text.style.TextDecoration Underline;
}
public enum TextDirection {
- method public static androidx.ui.text.style.TextDirection valueOf(String name) throws java.lang.IllegalArgumentException;
- method public static androidx.ui.text.style.TextDirection[] values();
- enum_constant public static final androidx.ui.text.style.TextDirection Content;
- enum_constant public static final androidx.ui.text.style.TextDirection ContentOrLtr;
- enum_constant public static final androidx.ui.text.style.TextDirection ContentOrRtl;
- enum_constant public static final androidx.ui.text.style.TextDirection Ltr;
- enum_constant public static final androidx.ui.text.style.TextDirection Rtl;
+ method public static androidx.compose.ui.text.style.TextDirection valueOf(String name) throws java.lang.IllegalArgumentException;
+ method public static androidx.compose.ui.text.style.TextDirection[] values();
+ enum_constant public static final androidx.compose.ui.text.style.TextDirection Content;
+ enum_constant public static final androidx.compose.ui.text.style.TextDirection ContentOrLtr;
+ enum_constant public static final androidx.compose.ui.text.style.TextDirection ContentOrRtl;
+ enum_constant public static final androidx.compose.ui.text.style.TextDirection Ltr;
+ enum_constant public static final androidx.compose.ui.text.style.TextDirection Rtl;
}
@androidx.compose.Immutable public final class TextGeometricTransform {
@@ -1020,42 +1020,42 @@
ctor public TextGeometricTransform();
method public float component1();
method public float component2();
- method @androidx.compose.Immutable public androidx.ui.text.style.TextGeometricTransform copy(float scaleX, float skewX);
+ method @androidx.compose.Immutable public androidx.compose.ui.text.style.TextGeometricTransform copy(float scaleX, float skewX);
method public float getScaleX();
method public float getSkewX();
- field public static final androidx.ui.text.style.TextGeometricTransform.Companion Companion;
+ field public static final androidx.compose.ui.text.style.TextGeometricTransform.Companion Companion;
}
public static final class TextGeometricTransform.Companion {
}
public final class TextGeometricTransformKt {
- method public static androidx.ui.text.style.TextGeometricTransform lerp(androidx.ui.text.style.TextGeometricTransform start, androidx.ui.text.style.TextGeometricTransform stop, float fraction);
+ method public static androidx.compose.ui.text.style.TextGeometricTransform lerp(androidx.compose.ui.text.style.TextGeometricTransform start, androidx.compose.ui.text.style.TextGeometricTransform stop, float fraction);
}
@androidx.compose.Immutable public final class TextIndent {
method public long component1();
method public long component2();
- method @androidx.compose.Immutable public androidx.ui.text.style.TextIndent copy-gL_aCS0(long firstLine, long restLine);
+ method @androidx.compose.Immutable public androidx.compose.ui.text.style.TextIndent copy-gL_aCS0(long firstLine, long restLine);
method public long getFirstLine();
method public long getRestLine();
- field public static final androidx.ui.text.style.TextIndent.Companion Companion;
+ field public static final androidx.compose.ui.text.style.TextIndent.Companion Companion;
}
public static final class TextIndent.Companion {
- method public androidx.ui.text.style.TextIndent getNone();
- property public final androidx.ui.text.style.TextIndent None;
+ method public androidx.compose.ui.text.style.TextIndent getNone();
+ property public final androidx.compose.ui.text.style.TextIndent None;
}
public final class TextIndentKt {
- method public static androidx.ui.text.style.TextIndent lerp(androidx.ui.text.style.TextIndent start, androidx.ui.text.style.TextIndent stop, float fraction);
+ 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);
}
public enum TextOverflow {
- method public static androidx.ui.text.style.TextOverflow valueOf(String name) throws java.lang.IllegalArgumentException;
- method public static androidx.ui.text.style.TextOverflow[] values();
- enum_constant public static final androidx.ui.text.style.TextOverflow Clip;
- enum_constant public static final androidx.ui.text.style.TextOverflow Ellipsis;
+ method public static androidx.compose.ui.text.style.TextOverflow valueOf(String name) throws java.lang.IllegalArgumentException;
+ method public static androidx.compose.ui.text.style.TextOverflow[] values();
+ enum_constant public static final androidx.compose.ui.text.style.TextOverflow Clip;
+ enum_constant public static final androidx.compose.ui.text.style.TextOverflow Ellipsis;
}
}
diff --git a/ui/ui-text-core/api/public_plus_experimental_current.txt b/ui/ui-text-core/api/public_plus_experimental_current.txt
index b5c1f07..f75dd52 100644
--- a/ui/ui-text-core/api/public_plus_experimental_current.txt
+++ b/ui/ui-text-core/api/public_plus_experimental_current.txt
@@ -1,321 +1,38 @@
// Signature format: 3.0
-package androidx.ui.input {
-
- public final class BackspaceKeyEditOp implements androidx.ui.input.EditOperation {
- ctor public BackspaceKeyEditOp();
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- public final class CommitTextEditOp implements androidx.ui.input.EditOperation {
- ctor public CommitTextEditOp(String text, int newCursorPosition);
- method public String component1();
- method public int component2();
- method public androidx.ui.input.CommitTextEditOp copy(String text, int newCursorPosition);
- method public int getNewCursorPosition();
- method public String getText();
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- public final class DeleteAllEditOp implements androidx.ui.input.EditOperation {
- ctor public DeleteAllEditOp();
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- public final class DeleteSurroundingTextEditOp implements androidx.ui.input.EditOperation {
- ctor public DeleteSurroundingTextEditOp(int beforeLength, int afterLength);
- method public int component1();
- method public int component2();
- method public androidx.ui.input.DeleteSurroundingTextEditOp copy(int beforeLength, int afterLength);
- method public int getAfterLength();
- method public int getBeforeLength();
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- public final class DeleteSurroundingTextInCodePointsEditOp implements androidx.ui.input.EditOperation {
- ctor public DeleteSurroundingTextInCodePointsEditOp(int beforeLength, int afterLength);
- method public int component1();
- method public int component2();
- method public androidx.ui.input.DeleteSurroundingTextInCodePointsEditOp copy(int beforeLength, int afterLength);
- method public int getAfterLength();
- method public int getBeforeLength();
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- public interface EditOperation {
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- public final class EditingBuffer {
- ctor public EditingBuffer(String initialText, androidx.ui.text.TextRange initialSelection);
- field public static final int NOWHERE = -1; // 0xffffffff
- }
-
- @Deprecated @androidx.compose.Immutable public final class EditorValue {
- ctor @Deprecated public EditorValue(String text, androidx.ui.text.TextRange selection, androidx.ui.text.TextRange? composition);
- ctor @Deprecated public EditorValue();
- method @Deprecated public String component1();
- method @Deprecated public androidx.ui.text.TextRange component2();
- method @Deprecated public androidx.ui.text.TextRange? component3();
- method @Deprecated @androidx.compose.Immutable public androidx.ui.input.EditorValue copy(String text, androidx.ui.text.TextRange selection, androidx.ui.text.TextRange? composition);
- method @Deprecated public androidx.ui.text.TextRange? getComposition();
- method @Deprecated public String getSelectedText();
- method @Deprecated public androidx.ui.text.TextRange getSelection();
- method @Deprecated public String getText();
- method @Deprecated public String getTextAfterSelection(int maxChars);
- method @Deprecated public String getTextBeforeSelection(int maxChars);
- }
-
- public final class FinishComposingTextEditOp implements androidx.ui.input.EditOperation {
- ctor public FinishComposingTextEditOp();
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- public final class GapBufferKt {
- }
-
- public enum ImeAction {
- method public static androidx.ui.input.ImeAction valueOf(String name) throws java.lang.IllegalArgumentException;
- method public static androidx.ui.input.ImeAction[] values();
- enum_constant public static final androidx.ui.input.ImeAction Done;
- enum_constant public static final androidx.ui.input.ImeAction Go;
- enum_constant public static final androidx.ui.input.ImeAction Next;
- enum_constant public static final androidx.ui.input.ImeAction NoAction;
- enum_constant public static final androidx.ui.input.ImeAction Previous;
- enum_constant public static final androidx.ui.input.ImeAction Search;
- enum_constant public static final androidx.ui.input.ImeAction Send;
- enum_constant public static final androidx.ui.input.ImeAction Unspecified;
- }
-
- public interface InputEventListener {
- method public void onEditOperations(java.util.List<? extends androidx.ui.input.EditOperation> editOps);
- method public void onImeAction(androidx.ui.input.ImeAction imeAction);
- }
-
- public enum KeyboardType {
- method public static androidx.ui.input.KeyboardType valueOf(String name) throws java.lang.IllegalArgumentException;
- method public static androidx.ui.input.KeyboardType[] values();
- enum_constant public static final androidx.ui.input.KeyboardType Ascii;
- enum_constant public static final androidx.ui.input.KeyboardType Email;
- enum_constant public static final androidx.ui.input.KeyboardType Number;
- enum_constant public static final androidx.ui.input.KeyboardType NumberPassword;
- enum_constant public static final androidx.ui.input.KeyboardType Password;
- enum_constant public static final androidx.ui.input.KeyboardType Phone;
- enum_constant public static final androidx.ui.input.KeyboardType Text;
- enum_constant public static final androidx.ui.input.KeyboardType Uri;
- }
-
- public final class MoveCursorEditOp implements androidx.ui.input.EditOperation {
- ctor public MoveCursorEditOp(int amount);
- method public int component1();
- method public androidx.ui.input.MoveCursorEditOp copy(int amount);
- method public int getAmount();
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- public interface OffsetMap {
- method public int originalToTransformed(int offset);
- method public int transformedToOriginal(int offset);
- field public static final androidx.ui.input.OffsetMap.Companion Companion;
- }
-
- public static final class OffsetMap.Companion {
- method public androidx.ui.input.OffsetMap getIdentityOffsetMap();
- property public final androidx.ui.input.OffsetMap identityOffsetMap;
- }
-
- public final class PasswordVisualTransformation implements androidx.ui.input.VisualTransformation {
- ctor public PasswordVisualTransformation(char mask);
- ctor public PasswordVisualTransformation();
- method public char component1();
- method public androidx.ui.input.PasswordVisualTransformation copy(char mask);
- method public androidx.ui.input.TransformedText filter(androidx.ui.text.AnnotatedString text);
- method public char getMask();
- }
-
- public interface PlatformTextInputService {
- method public void hideSoftwareKeyboard();
- method public void notifyFocusedRect(androidx.ui.geometry.Rect rect);
- method public void onStateUpdated(androidx.ui.input.TextFieldValue value);
- method public void showSoftwareKeyboard();
- method public void startInput(androidx.ui.input.TextFieldValue value, androidx.ui.input.KeyboardType keyboardType, androidx.ui.input.ImeAction imeAction, kotlin.jvm.functions.Function1<? super java.util.List<? extends androidx.ui.input.EditOperation>,kotlin.Unit> onEditCommand, kotlin.jvm.functions.Function1<? super androidx.ui.input.ImeAction,kotlin.Unit> onImeActionPerformed);
- method public void stopInput();
- }
-
- public final class SetComposingRegionEditOp implements androidx.ui.input.EditOperation {
- ctor public SetComposingRegionEditOp(int start, int end);
- method public int component1();
- method public int component2();
- method public androidx.ui.input.SetComposingRegionEditOp copy(int start, int end);
- method public int getEnd();
- method public int getStart();
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- public final class SetComposingTextEditOp implements androidx.ui.input.EditOperation {
- ctor public SetComposingTextEditOp(String text, int newCursorPosition);
- method public String component1();
- method public int component2();
- method public androidx.ui.input.SetComposingTextEditOp copy(String text, int newCursorPosition);
- method public int getNewCursorPosition();
- method public String getText();
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- public final class SetSelectionEditOp implements androidx.ui.input.EditOperation {
- ctor public SetSelectionEditOp(int start, int end);
- method public int component1();
- method public int component2();
- method public androidx.ui.input.SetSelectionEditOp copy(int start, int end);
- method public int getEnd();
- method public int getStart();
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- @androidx.compose.Immutable public final class TextFieldValue {
- ctor public TextFieldValue(String text, androidx.ui.text.TextRange selection, androidx.ui.text.TextRange? composition);
- ctor public TextFieldValue();
- method public String component1();
- method public androidx.ui.text.TextRange component2();
- method public androidx.ui.text.TextRange? component3();
- method @androidx.compose.Immutable public androidx.ui.input.TextFieldValue copy(String text, androidx.ui.text.TextRange selection, androidx.ui.text.TextRange? composition);
- method public androidx.ui.text.TextRange? getComposition();
- method public androidx.ui.text.TextRange getSelection();
- method public String getText();
- field public static final androidx.ui.input.TextFieldValue.Companion Companion;
- }
-
- public static final class TextFieldValue.Companion {
- method public androidx.compose.runtime.savedinstancestate.Saver<androidx.ui.input.TextFieldValue,java.lang.Object> getSaver();
- property public final androidx.compose.runtime.savedinstancestate.Saver<androidx.ui.input.TextFieldValue,java.lang.Object> Saver;
- }
-
- public final class TextFieldValueKt {
- method public static String getSelectedText(androidx.ui.input.TextFieldValue);
- method public static String getTextAfterSelection(androidx.ui.input.TextFieldValue, int maxChars);
- method public static String getTextBeforeSelection(androidx.ui.input.TextFieldValue, int maxChars);
- }
-
- public class TextInputService {
- ctor public TextInputService(androidx.ui.input.PlatformTextInputService platformTextInputService);
- method public void hideSoftwareKeyboard(int token);
- method public void notifyFocusedRect(int token, androidx.ui.geometry.Rect rect);
- method public void onStateUpdated(int token, androidx.ui.input.TextFieldValue value);
- method public void showSoftwareKeyboard(int token);
- method public int startInput(androidx.ui.input.TextFieldValue value, androidx.ui.input.KeyboardType keyboardType, androidx.ui.input.ImeAction imeAction, kotlin.jvm.functions.Function1<? super java.util.List<? extends androidx.ui.input.EditOperation>,kotlin.Unit> onEditCommand, kotlin.jvm.functions.Function1<? super androidx.ui.input.ImeAction,kotlin.Unit> onImeActionPerformed);
- method public void stopInput(int token);
- }
-
- public final class TextInputServiceKt {
- method @Deprecated public static kotlin.jvm.functions.Function1<androidx.ui.input.PlatformTextInputService,androidx.ui.input.TextInputService> getTextInputServiceFactory();
- method @Deprecated public static void setTextInputServiceFactory(kotlin.jvm.functions.Function1<? super androidx.ui.input.PlatformTextInputService,? extends androidx.ui.input.TextInputService> p);
- field public static final int INVALID_SESSION = -1; // 0xffffffff
- field public static final int NO_SESSION = 0; // 0x0
- }
-
- public final class TransformedText {
- ctor public TransformedText(androidx.ui.text.AnnotatedString transformedText, androidx.ui.input.OffsetMap offsetMap);
- method public androidx.ui.text.AnnotatedString component1();
- method public androidx.ui.input.OffsetMap component2();
- method public androidx.ui.input.TransformedText copy(androidx.ui.text.AnnotatedString transformedText, androidx.ui.input.OffsetMap offsetMap);
- method public androidx.ui.input.OffsetMap getOffsetMap();
- method public androidx.ui.text.AnnotatedString getTransformedText();
- }
-
- @androidx.compose.Immutable public interface VisualTransformation {
- method public androidx.ui.input.TransformedText filter(androidx.ui.text.AnnotatedString text);
- field public static final androidx.ui.input.VisualTransformation.Companion Companion;
- }
-
- public static final class VisualTransformation.Companion {
- method public androidx.ui.input.VisualTransformation getNone();
- property public final androidx.ui.input.VisualTransformation None;
- }
-
-}
-
-package androidx.ui.intl {
-
- public final class AndroidPlatformLocaleKt {
- }
-
- @androidx.compose.Immutable public final class Locale {
- ctor public Locale(String languageTag);
- method public String getLanguage();
- method public String getRegion();
- method public String getScript();
- method public String toLanguageTag();
- property public final String language;
- property public final String region;
- property public final String script;
- field public static final androidx.ui.intl.Locale.Companion Companion;
- }
-
- public static final class Locale.Companion {
- method public androidx.ui.intl.Locale getCurrent();
- property public final androidx.ui.intl.Locale current;
- }
-
- @androidx.compose.Immutable public final class LocaleList implements java.util.Collection<androidx.ui.intl.Locale> kotlin.jvm.internal.markers.KMappedMarker {
- ctor public LocaleList(java.util.List<androidx.ui.intl.Locale> localeList);
- ctor public LocaleList(String languageTags);
- ctor public LocaleList(androidx.ui.intl.Locale... locales);
- method public java.util.List<androidx.ui.intl.Locale> component1();
- method public operator boolean contains(androidx.ui.intl.Locale element);
- method public boolean containsAll(java.util.Collection<?> elements);
- method @androidx.compose.Immutable public androidx.ui.intl.LocaleList copy(java.util.List<androidx.ui.intl.Locale> localeList);
- method public operator androidx.ui.intl.Locale get(int i);
- method public java.util.List<androidx.ui.intl.Locale> getLocaleList();
- method public int getSize();
- method public boolean isEmpty();
- method public java.util.Iterator<androidx.ui.intl.Locale> iterator();
- property public int size;
- field public static final androidx.ui.intl.LocaleList.Companion Companion;
- }
-
- public static final class LocaleList.Companion {
- method public androidx.ui.intl.LocaleList getCurrent();
- property public final androidx.ui.intl.LocaleList current;
- }
-
- public final class PlatformLocaleKt {
- }
-
-}
-
-package androidx.ui.text {
+package androidx.compose.ui.text {
@androidx.compose.Immutable public final class AnnotatedString {
- ctor public AnnotatedString(String text, java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.SpanStyle>> spanStyles, java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.ParagraphStyle>> paragraphStyles);
+ ctor public AnnotatedString(String text, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> spanStyles, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.ParagraphStyle>> paragraphStyles);
method public String component1();
- method public java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.SpanStyle>> component2();
- method public java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.ParagraphStyle>> component3();
- method @androidx.compose.Immutable public androidx.ui.text.AnnotatedString copy(String text, java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.SpanStyle>> spanStyles, java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.ParagraphStyle>> paragraphStyles, java.util.List<androidx.ui.text.AnnotatedString.Range<java.lang.String>> annotations);
- method public java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.ParagraphStyle>> getParagraphStyles();
- method public java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.SpanStyle>> getSpanStyles();
- method public java.util.List<androidx.ui.text.AnnotatedString.Range<java.lang.String>> getStringAnnotations(String tag, int start, int end);
- method public java.util.List<androidx.ui.text.AnnotatedString.Range<java.lang.String>> getStringAnnotations(int start, int end);
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> component2();
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.ParagraphStyle>> component3();
+ method @androidx.compose.Immutable public androidx.compose.ui.text.AnnotatedString copy(String text, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> spanStyles, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.ParagraphStyle>> paragraphStyles, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<java.lang.String>> annotations);
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.ParagraphStyle>> getParagraphStyles();
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> getSpanStyles();
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<java.lang.String>> getStringAnnotations(String tag, int start, int end);
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<java.lang.String>> getStringAnnotations(int start, int end);
method public String getText();
- method @androidx.compose.Stable public operator androidx.ui.text.AnnotatedString plus(androidx.ui.text.AnnotatedString other);
+ method @androidx.compose.Stable public operator androidx.compose.ui.text.AnnotatedString plus(androidx.compose.ui.text.AnnotatedString other);
}
public static final class AnnotatedString.Builder {
ctor public AnnotatedString.Builder(int capacity);
ctor public AnnotatedString.Builder();
ctor public AnnotatedString.Builder(String text);
- ctor public AnnotatedString.Builder(androidx.ui.text.AnnotatedString text);
+ ctor public AnnotatedString.Builder(androidx.compose.ui.text.AnnotatedString text);
method public void addStringAnnotation(String scope, String annotation, int start, int end);
- method public void addStyle(androidx.ui.text.SpanStyle style, int start, int end);
- method public void addStyle(androidx.ui.text.ParagraphStyle style, int start, int end);
+ method public void addStyle(androidx.compose.ui.text.SpanStyle style, int start, int end);
+ method public void addStyle(androidx.compose.ui.text.ParagraphStyle style, int start, int end);
method public void append(String text);
method public void append(char p);
- method public void append(androidx.ui.text.AnnotatedString text);
+ method public void append(androidx.compose.ui.text.AnnotatedString text);
method public int getLength();
method public void pop();
method public void pop(int index);
method public int pushStringAnnotation(String tag, String annotation);
- method public int pushStyle(androidx.ui.text.SpanStyle style);
- method public int pushStyle(androidx.ui.text.ParagraphStyle style);
- method public androidx.ui.text.AnnotatedString toAnnotatedString();
+ method public int pushStyle(androidx.compose.ui.text.SpanStyle style);
+ method public int pushStyle(androidx.compose.ui.text.ParagraphStyle style);
+ method public androidx.compose.ui.text.AnnotatedString toAnnotatedString();
property public final int length;
}
@@ -326,7 +43,7 @@
method public int component2();
method public int component3();
method public String component4();
- method public androidx.ui.text.AnnotatedString.Range<T> copy(T! item, int start, int end, String tag);
+ method public androidx.compose.ui.text.AnnotatedString.Range<T> copy(T! item, int start, int end, String tag);
method public int getEnd();
method public T! getItem();
method public int getStart();
@@ -334,18 +51,18 @@
}
public final class AnnotatedStringKt {
- method public static androidx.ui.text.AnnotatedString AnnotatedString(String text, androidx.ui.text.SpanStyle spanStyle, androidx.ui.text.ParagraphStyle? paragraphStyle = null);
- method public static androidx.ui.text.AnnotatedString AnnotatedString(String text, androidx.ui.text.ParagraphStyle paragraphStyle);
- method @Deprecated public static inline androidx.ui.text.AnnotatedString AnnotatedString(kotlin.jvm.functions.Function1<? super androidx.ui.text.AnnotatedString.Builder,kotlin.Unit> builder);
- method public static inline androidx.ui.text.AnnotatedString annotatedString(kotlin.jvm.functions.Function1<? super androidx.ui.text.AnnotatedString.Builder,kotlin.Unit> builder);
- method public static androidx.ui.text.AnnotatedString capitalize(androidx.ui.text.AnnotatedString, androidx.ui.intl.LocaleList localeList = LocaleList.current);
- method public static androidx.ui.text.AnnotatedString decapitalize(androidx.ui.text.AnnotatedString, androidx.ui.intl.LocaleList localeList = LocaleList.current);
- method public static int getLength(androidx.ui.text.AnnotatedString);
- method public static androidx.ui.text.AnnotatedString subSequence(androidx.ui.text.AnnotatedString, int start, int end);
- method public static androidx.ui.text.AnnotatedString toLowerCase(androidx.ui.text.AnnotatedString, androidx.ui.intl.LocaleList localeList = LocaleList.current);
- method public static androidx.ui.text.AnnotatedString toUpperCase(androidx.ui.text.AnnotatedString, androidx.ui.intl.LocaleList localeList = LocaleList.current);
- method public static inline <R> R withStyle(androidx.ui.text.AnnotatedString.Builder, androidx.ui.text.SpanStyle style, kotlin.jvm.functions.Function1<? super androidx.ui.text.AnnotatedString.Builder,? extends R> block);
- method public static inline <R> R withStyle(androidx.ui.text.AnnotatedString.Builder, androidx.ui.text.ParagraphStyle style, kotlin.jvm.functions.Function1<? super androidx.ui.text.AnnotatedString.Builder,? extends R> block);
+ method public static androidx.compose.ui.text.AnnotatedString AnnotatedString(String text, androidx.compose.ui.text.SpanStyle spanStyle, androidx.compose.ui.text.ParagraphStyle? paragraphStyle = null);
+ method public static androidx.compose.ui.text.AnnotatedString AnnotatedString(String text, androidx.compose.ui.text.ParagraphStyle paragraphStyle);
+ method @Deprecated public static inline androidx.compose.ui.text.AnnotatedString AnnotatedString(kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.AnnotatedString.Builder,kotlin.Unit> builder);
+ method public static inline androidx.compose.ui.text.AnnotatedString annotatedString(kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.AnnotatedString.Builder,kotlin.Unit> builder);
+ method public static androidx.compose.ui.text.AnnotatedString capitalize(androidx.compose.ui.text.AnnotatedString, androidx.compose.ui.text.intl.LocaleList localeList = LocaleList.current);
+ method public static androidx.compose.ui.text.AnnotatedString decapitalize(androidx.compose.ui.text.AnnotatedString, androidx.compose.ui.text.intl.LocaleList localeList = LocaleList.current);
+ method public static int getLength(androidx.compose.ui.text.AnnotatedString);
+ method public static androidx.compose.ui.text.AnnotatedString subSequence(androidx.compose.ui.text.AnnotatedString, int start, int end);
+ method public static androidx.compose.ui.text.AnnotatedString toLowerCase(androidx.compose.ui.text.AnnotatedString, androidx.compose.ui.text.intl.LocaleList localeList = LocaleList.current);
+ method public static androidx.compose.ui.text.AnnotatedString toUpperCase(androidx.compose.ui.text.AnnotatedString, androidx.compose.ui.text.intl.LocaleList localeList = LocaleList.current);
+ method public static inline <R> R withStyle(androidx.compose.ui.text.AnnotatedString.Builder, androidx.compose.ui.text.SpanStyle style, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.AnnotatedString.Builder,? extends R> block);
+ method public static inline <R> R withStyle(androidx.compose.ui.text.AnnotatedString.Builder, androidx.compose.ui.text.ParagraphStyle style, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.AnnotatedString.Builder,? extends R> block);
}
@kotlin.RequiresOptIn(level=RequiresOptIn.Level.ERROR, message="This is internal API that may change frequently and without warning.") @kotlin.annotation.Target(allowedTargets={AnnotationTarget.CLASS, AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY}) public @interface InternalTextApi {
@@ -355,16 +72,16 @@
}
public final class MultiParagraph {
- ctor public MultiParagraph(androidx.ui.text.MultiParagraphIntrinsics intrinsics, int maxLines, boolean ellipsis, androidx.ui.text.ParagraphConstraints constraints);
- ctor public MultiParagraph(androidx.ui.text.AnnotatedString annotatedString, androidx.ui.text.TextStyle style, java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>> placeholders, int maxLines, boolean ellipsis, androidx.ui.text.ParagraphConstraints constraints, androidx.ui.unit.Density density, androidx.ui.text.font.Font.ResourceLoader resourceLoader);
- method public androidx.ui.text.style.ResolvedTextDirection getBidiRunDirection(int offset);
+ ctor public MultiParagraph(androidx.compose.ui.text.MultiParagraphIntrinsics intrinsics, int maxLines, boolean ellipsis, androidx.compose.ui.text.ParagraphConstraints constraints);
+ ctor public MultiParagraph(androidx.compose.ui.text.AnnotatedString annotatedString, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, int maxLines, boolean ellipsis, androidx.compose.ui.text.ParagraphConstraints constraints, androidx.ui.unit.Density density, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getBidiRunDirection(int offset);
method public androidx.ui.geometry.Rect getBoundingBox(int offset);
method public androidx.ui.geometry.Rect getCursorRect(int offset);
method public boolean getDidExceedMaxLines();
method public float getFirstBaseline();
method public float getHeight();
method public float getHorizontalPosition(int offset, boolean usePrimaryDirection);
- method public androidx.ui.text.MultiParagraphIntrinsics getIntrinsics();
+ method public androidx.compose.ui.text.MultiParagraphIntrinsics getIntrinsics();
method public float getLastBaseline();
method public float getLineBottom(int lineIndex);
method public int getLineCount();
@@ -382,11 +99,11 @@
method public int getMaxLines();
method public float getMinIntrinsicWidth();
method public int getOffsetForPosition(androidx.ui.geometry.Offset position);
- method public androidx.ui.text.style.ResolvedTextDirection getParagraphDirection(int offset);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getParagraphDirection(int offset);
method public androidx.ui.graphics.Path getPathForRange(int start, int end);
method public java.util.List<androidx.ui.geometry.Rect> getPlaceholderRects();
method public float getWidth();
- method public androidx.ui.text.TextRange getWordBoundary(int offset);
+ method public androidx.compose.ui.text.TextRange getWordBoundary(int offset);
method public void paint(androidx.ui.graphics.Canvas canvas);
property public final boolean didExceedMaxLines;
property public final float firstBaseline;
@@ -399,12 +116,12 @@
property public final float width;
}
- public final class MultiParagraphIntrinsics implements androidx.ui.text.ParagraphIntrinsics {
- ctor public MultiParagraphIntrinsics(androidx.ui.text.AnnotatedString annotatedString, androidx.ui.text.TextStyle style, java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>> placeholders, androidx.ui.unit.Density density, androidx.ui.text.font.Font.ResourceLoader resourceLoader);
- method public androidx.ui.text.AnnotatedString getAnnotatedString();
+ public final class MultiParagraphIntrinsics implements androidx.compose.ui.text.ParagraphIntrinsics {
+ ctor public MultiParagraphIntrinsics(androidx.compose.ui.text.AnnotatedString annotatedString, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, androidx.ui.unit.Density density, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader);
+ method public androidx.compose.ui.text.AnnotatedString getAnnotatedString();
method public float getMaxIntrinsicWidth();
method public float getMinIntrinsicWidth();
- method public java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>> getPlaceholders();
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> getPlaceholders();
property public float maxIntrinsicWidth;
property public float minIntrinsicWidth;
}
@@ -416,7 +133,7 @@
}
public interface Paragraph {
- method public androidx.ui.text.style.ResolvedTextDirection getBidiRunDirection(int offset);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getBidiRunDirection(int offset);
method public androidx.ui.geometry.Rect getBoundingBox(int offset);
method public androidx.ui.geometry.Rect getCursorRect(int offset);
method public boolean getDidExceedMaxLines();
@@ -439,11 +156,11 @@
method public float getMaxIntrinsicWidth();
method public float getMinIntrinsicWidth();
method public int getOffsetForPosition(androidx.ui.geometry.Offset position);
- method public androidx.ui.text.style.ResolvedTextDirection getParagraphDirection(int offset);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getParagraphDirection(int offset);
method public androidx.ui.graphics.Path getPathForRange(int start, int end);
method public java.util.List<androidx.ui.geometry.Rect> getPlaceholderRects();
method public float getWidth();
- method public androidx.ui.text.TextRange getWordBoundary(int offset);
+ method public androidx.compose.ui.text.TextRange getWordBoundary(int offset);
method public void paint(androidx.ui.graphics.Canvas canvas);
property public abstract boolean didExceedMaxLines;
property public abstract float firstBaseline;
@@ -459,7 +176,7 @@
public final class ParagraphConstraints {
ctor public ParagraphConstraints(float width);
method public float component1();
- method public androidx.ui.text.ParagraphConstraints copy(float width);
+ method public androidx.compose.ui.text.ParagraphConstraints copy(float width);
method public float getWidth();
}
@@ -471,56 +188,56 @@
}
public final class ParagraphIntrinsicsKt {
- method public static androidx.ui.text.ParagraphIntrinsics ParagraphIntrinsics(String text, androidx.ui.text.TextStyle style, java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.SpanStyle>> spanStyles = listOf(), java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>> placeholders = listOf(), androidx.ui.unit.Density density, androidx.ui.text.font.Font.ResourceLoader resourceLoader);
+ method public static androidx.compose.ui.text.ParagraphIntrinsics ParagraphIntrinsics(String text, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> spanStyles = listOf(), java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders = listOf(), androidx.ui.unit.Density density, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader);
}
public final class ParagraphKt {
- method public static androidx.ui.text.Paragraph Paragraph(String text, androidx.ui.text.TextStyle style, java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.SpanStyle>> spanStyles = listOf(), java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>> placeholders = listOf(), int maxLines = 2147483647, boolean ellipsis = false, androidx.ui.text.ParagraphConstraints constraints, androidx.ui.unit.Density density, androidx.ui.text.font.Font.ResourceLoader resourceLoader);
- method public static androidx.ui.text.Paragraph Paragraph(androidx.ui.text.ParagraphIntrinsics paragraphIntrinsics, int maxLines = 2147483647, boolean ellipsis = false, androidx.ui.text.ParagraphConstraints constraints);
+ method public static androidx.compose.ui.text.Paragraph Paragraph(String text, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> spanStyles = listOf(), java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders = listOf(), int maxLines = 2147483647, boolean ellipsis = false, androidx.compose.ui.text.ParagraphConstraints constraints, androidx.ui.unit.Density density, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader);
+ method public static androidx.compose.ui.text.Paragraph Paragraph(androidx.compose.ui.text.ParagraphIntrinsics paragraphIntrinsics, int maxLines = 2147483647, boolean ellipsis = false, androidx.compose.ui.text.ParagraphConstraints constraints);
}
@androidx.compose.Immutable public final class ParagraphStyle {
- method public androidx.ui.text.style.TextAlign? component1();
- method public androidx.ui.text.style.TextDirection? component2();
+ method public androidx.compose.ui.text.style.TextAlign? component1();
+ method public androidx.compose.ui.text.style.TextDirection? component2();
method public long component3();
- method public androidx.ui.text.style.TextIndent? component4();
- method @androidx.compose.Immutable public androidx.ui.text.ParagraphStyle copy-JVmhFNw(androidx.ui.text.style.TextAlign? textAlign, androidx.ui.text.style.TextDirection? textDirection, long lineHeight, androidx.ui.text.style.TextIndent? textIndent);
+ method public androidx.compose.ui.text.style.TextIndent? component4();
+ method @androidx.compose.Immutable public androidx.compose.ui.text.ParagraphStyle copy-yfYFPjM(androidx.compose.ui.text.style.TextAlign? textAlign, androidx.compose.ui.text.style.TextDirection? textDirection, long lineHeight, androidx.compose.ui.text.style.TextIndent? textIndent);
method public long getLineHeight();
- method public androidx.ui.text.style.TextAlign? getTextAlign();
- method public androidx.ui.text.style.TextDirection? getTextDirection();
- method public androidx.ui.text.style.TextIndent? getTextIndent();
- method @androidx.compose.Stable public androidx.ui.text.ParagraphStyle merge(androidx.ui.text.ParagraphStyle? other = null);
- method @androidx.compose.Stable public operator androidx.ui.text.ParagraphStyle plus(androidx.ui.text.ParagraphStyle other);
+ 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.Stable public androidx.compose.ui.text.ParagraphStyle merge(androidx.compose.ui.text.ParagraphStyle? other = null);
+ method @androidx.compose.Stable public operator androidx.compose.ui.text.ParagraphStyle plus(androidx.compose.ui.text.ParagraphStyle other);
}
public final class ParagraphStyleKt {
- method @androidx.compose.Stable public static androidx.ui.text.ParagraphStyle lerp(androidx.ui.text.ParagraphStyle start, androidx.ui.text.ParagraphStyle stop, float fraction);
+ method @androidx.compose.Stable public static androidx.compose.ui.text.ParagraphStyle lerp(androidx.compose.ui.text.ParagraphStyle start, androidx.compose.ui.text.ParagraphStyle stop, float fraction);
}
@androidx.compose.Immutable public final class Placeholder {
method public long component1();
method public long component2();
- method public androidx.ui.text.PlaceholderVerticalAlign component3();
- method @androidx.compose.Immutable public androidx.ui.text.Placeholder copy-eLqjHCw(long width, long height, androidx.ui.text.PlaceholderVerticalAlign placeholderVerticalAlign);
+ method public androidx.compose.ui.text.PlaceholderVerticalAlign component3();
+ method @androidx.compose.Immutable public androidx.compose.ui.text.Placeholder copy-LxtbTAo(long width, long height, androidx.compose.ui.text.PlaceholderVerticalAlign placeholderVerticalAlign);
method public long getHeight();
- method public androidx.ui.text.PlaceholderVerticalAlign getPlaceholderVerticalAlign();
+ method public androidx.compose.ui.text.PlaceholderVerticalAlign getPlaceholderVerticalAlign();
method public long getWidth();
}
public enum PlaceholderVerticalAlign {
- method public static androidx.ui.text.PlaceholderVerticalAlign valueOf(String name) throws java.lang.IllegalArgumentException;
- method public static androidx.ui.text.PlaceholderVerticalAlign[] values();
- enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign AboveBaseline;
- enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign Bottom;
- enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign Center;
- enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign TextBottom;
- enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign TextCenter;
- enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign TextTop;
- enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign Top;
+ method public static androidx.compose.ui.text.PlaceholderVerticalAlign valueOf(String name) throws java.lang.IllegalArgumentException;
+ method public static androidx.compose.ui.text.PlaceholderVerticalAlign[] values();
+ enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign AboveBaseline;
+ enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign Bottom;
+ enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign Center;
+ enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign TextBottom;
+ enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign TextCenter;
+ enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign TextTop;
+ enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign Top;
}
public final class SoftwareKeyboardController {
- ctor public SoftwareKeyboardController(androidx.ui.input.TextInputService textInputService, int token);
+ ctor public SoftwareKeyboardController(androidx.compose.ui.text.input.TextInputService textInputService, int token);
method public void hideSoftwareKeyboard();
method public void notifyFocusedRect(androidx.ui.geometry.Rect rect);
method public void showSoftwareKeyboard();
@@ -528,86 +245,86 @@
@androidx.compose.Immutable public final class SpanStyle {
method public long component1();
- method public androidx.ui.text.style.TextGeometricTransform? component10();
- method public androidx.ui.intl.LocaleList? component11();
+ method public androidx.compose.ui.text.style.TextGeometricTransform? component10();
+ method public androidx.compose.ui.text.intl.LocaleList? component11();
method public long component12();
- method public androidx.ui.text.style.TextDecoration? component13();
+ method public androidx.compose.ui.text.style.TextDecoration? component13();
method public androidx.ui.graphics.Shadow? component14();
method public long component2();
- method public androidx.ui.text.font.FontWeight? component3();
- method public androidx.ui.text.font.FontStyle? component4();
- method public androidx.ui.text.font.FontSynthesis? component5();
- method public androidx.ui.text.font.FontFamily? component6();
+ method public androidx.compose.ui.text.font.FontWeight? component3();
+ method public androidx.compose.ui.text.font.FontStyle? component4();
+ method public androidx.compose.ui.text.font.FontSynthesis? component5();
+ method public androidx.compose.ui.text.font.FontFamily? component6();
method public String? component7();
method public long component8();
- method public androidx.ui.text.style.BaselineShift? component9();
- method @androidx.compose.Immutable public androidx.ui.text.SpanStyle copy-HjQ0eR4(long color, long fontSize, androidx.ui.text.font.FontWeight? fontWeight, androidx.ui.text.font.FontStyle? fontStyle, androidx.ui.text.font.FontSynthesis? fontSynthesis, androidx.ui.text.font.FontFamily? fontFamily, String? fontFeatureSettings, long letterSpacing, androidx.ui.text.style.BaselineShift? baselineShift, androidx.ui.text.style.TextGeometricTransform? textGeometricTransform, androidx.ui.intl.LocaleList? localeList, long background, androidx.ui.text.style.TextDecoration? textDecoration, androidx.ui.graphics.Shadow? shadow);
+ method public androidx.compose.ui.text.style.BaselineShift? component9();
+ method @androidx.compose.Immutable public androidx.compose.ui.text.SpanStyle copy-3JaCuMk(long color, long fontSize, androidx.compose.ui.text.font.FontWeight? fontWeight, androidx.compose.ui.text.font.FontStyle? fontStyle, androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, androidx.compose.ui.text.font.FontFamily? fontFamily, String? fontFeatureSettings, long letterSpacing, androidx.compose.ui.text.style.BaselineShift? baselineShift, androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, androidx.compose.ui.text.intl.LocaleList? localeList, long background, androidx.compose.ui.text.style.TextDecoration? textDecoration, androidx.ui.graphics.Shadow? shadow);
method public long getBackground();
- method public androidx.ui.text.style.BaselineShift? getBaselineShift();
+ method public androidx.compose.ui.text.style.BaselineShift? getBaselineShift();
method public long getColor();
- method public androidx.ui.text.font.FontFamily? getFontFamily();
+ method public androidx.compose.ui.text.font.FontFamily? getFontFamily();
method public String? getFontFeatureSettings();
method public long getFontSize();
- method public androidx.ui.text.font.FontStyle? getFontStyle();
- method public androidx.ui.text.font.FontSynthesis? getFontSynthesis();
- method public androidx.ui.text.font.FontWeight? getFontWeight();
+ method public androidx.compose.ui.text.font.FontStyle? getFontStyle();
+ method public androidx.compose.ui.text.font.FontSynthesis? getFontSynthesis();
+ method public androidx.compose.ui.text.font.FontWeight? getFontWeight();
method public long getLetterSpacing();
- method public androidx.ui.intl.LocaleList? getLocaleList();
+ method public androidx.compose.ui.text.intl.LocaleList? getLocaleList();
method public androidx.ui.graphics.Shadow? getShadow();
- method public androidx.ui.text.style.TextDecoration? getTextDecoration();
- method public androidx.ui.text.style.TextGeometricTransform? getTextGeometricTransform();
- method @androidx.compose.Stable public androidx.ui.text.SpanStyle merge(androidx.ui.text.SpanStyle? other = null);
- method @androidx.compose.Stable public operator androidx.ui.text.SpanStyle plus(androidx.ui.text.SpanStyle other);
+ method public androidx.compose.ui.text.style.TextDecoration? getTextDecoration();
+ method public androidx.compose.ui.text.style.TextGeometricTransform? getTextGeometricTransform();
+ method @androidx.compose.Stable public androidx.compose.ui.text.SpanStyle merge(androidx.compose.ui.text.SpanStyle? other = null);
+ method @androidx.compose.Stable public operator androidx.compose.ui.text.SpanStyle plus(androidx.compose.ui.text.SpanStyle other);
}
public final class SpanStyleKt {
- method public static androidx.ui.text.SpanStyle lerp(androidx.ui.text.SpanStyle start, androidx.ui.text.SpanStyle stop, float fraction);
+ method public static androidx.compose.ui.text.SpanStyle lerp(androidx.compose.ui.text.SpanStyle start, androidx.compose.ui.text.SpanStyle stop, float fraction);
}
public final class StringKt {
- method public static String capitalize(String, androidx.ui.intl.Locale locale);
- method public static String capitalize(String, androidx.ui.intl.LocaleList localeList);
- method public static String decapitalize(String, androidx.ui.intl.Locale locale);
- method public static String decapitalize(String, androidx.ui.intl.LocaleList localeList);
- method public static String toLowerCase(String, androidx.ui.intl.Locale locale);
- method public static String toLowerCase(String, androidx.ui.intl.LocaleList localeList);
- method public static String toUpperCase(String, androidx.ui.intl.Locale locale);
- method public static String toUpperCase(String, androidx.ui.intl.LocaleList localeList);
+ method public static String capitalize(String, androidx.compose.ui.text.intl.Locale locale);
+ method public static String capitalize(String, androidx.compose.ui.text.intl.LocaleList localeList);
+ method public static String decapitalize(String, androidx.compose.ui.text.intl.Locale locale);
+ method public static String decapitalize(String, androidx.compose.ui.text.intl.LocaleList localeList);
+ method public static String toLowerCase(String, androidx.compose.ui.text.intl.Locale locale);
+ method public static String toLowerCase(String, androidx.compose.ui.text.intl.LocaleList localeList);
+ method public static String toUpperCase(String, androidx.compose.ui.text.intl.Locale locale);
+ method public static String toUpperCase(String, androidx.compose.ui.text.intl.LocaleList localeList);
}
public final class TextLayoutHelperKt {
}
public final class TextLayoutInput {
- ctor public TextLayoutInput(androidx.ui.text.AnnotatedString text, androidx.ui.text.TextStyle style, java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>> placeholders, int maxLines, boolean softWrap, androidx.ui.text.style.TextOverflow overflow, androidx.ui.unit.Density density, androidx.ui.core.LayoutDirection layoutDirection, androidx.ui.text.font.Font.ResourceLoader resourceLoader, androidx.ui.core.Constraints constraints);
- method public androidx.ui.text.AnnotatedString component1();
+ ctor public TextLayoutInput(androidx.compose.ui.text.AnnotatedString text, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, int maxLines, boolean softWrap, androidx.compose.ui.text.style.TextOverflow overflow, androidx.ui.unit.Density density, androidx.ui.core.LayoutDirection layoutDirection, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader, androidx.ui.core.Constraints constraints);
+ method public androidx.compose.ui.text.AnnotatedString component1();
method public androidx.ui.core.Constraints component10();
- method public androidx.ui.text.TextStyle component2();
- method public java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>> component3();
+ method public androidx.compose.ui.text.TextStyle component2();
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> component3();
method public int component4();
method public boolean component5();
- method public androidx.ui.text.style.TextOverflow component6();
+ method public androidx.compose.ui.text.style.TextOverflow component6();
method public androidx.ui.unit.Density component7();
method public androidx.ui.core.LayoutDirection component8();
- method public androidx.ui.text.font.Font.ResourceLoader component9();
- method public androidx.ui.text.TextLayoutInput copy(androidx.ui.text.AnnotatedString text, androidx.ui.text.TextStyle style, java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>> placeholders, int maxLines, boolean softWrap, androidx.ui.text.style.TextOverflow overflow, androidx.ui.unit.Density density, androidx.ui.core.LayoutDirection layoutDirection, androidx.ui.text.font.Font.ResourceLoader resourceLoader, androidx.ui.core.Constraints constraints);
+ method public androidx.compose.ui.text.font.Font.ResourceLoader component9();
+ method public androidx.compose.ui.text.TextLayoutInput copy(androidx.compose.ui.text.AnnotatedString text, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, int maxLines, boolean softWrap, androidx.compose.ui.text.style.TextOverflow overflow, androidx.ui.unit.Density density, androidx.ui.core.LayoutDirection layoutDirection, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader, androidx.ui.core.Constraints constraints);
method public androidx.ui.core.Constraints getConstraints();
method public androidx.ui.unit.Density getDensity();
method public androidx.ui.core.LayoutDirection getLayoutDirection();
method public int getMaxLines();
- method public androidx.ui.text.style.TextOverflow getOverflow();
- method public java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>> getPlaceholders();
- method public androidx.ui.text.font.Font.ResourceLoader getResourceLoader();
+ method public androidx.compose.ui.text.style.TextOverflow getOverflow();
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> getPlaceholders();
+ method public androidx.compose.ui.text.font.Font.ResourceLoader getResourceLoader();
method public boolean getSoftWrap();
- method public androidx.ui.text.TextStyle getStyle();
- method public androidx.ui.text.AnnotatedString getText();
+ method public androidx.compose.ui.text.TextStyle getStyle();
+ method public androidx.compose.ui.text.AnnotatedString getText();
}
public final class TextLayoutResult {
- method public androidx.ui.text.TextLayoutInput component1();
+ method public androidx.compose.ui.text.TextLayoutInput component1();
method public androidx.ui.unit.IntSize component3();
- method public androidx.ui.text.TextLayoutResult copy(androidx.ui.text.TextLayoutInput layoutInput, androidx.ui.text.MultiParagraph multiParagraph, androidx.ui.unit.IntSize size);
- method public androidx.ui.text.style.ResolvedTextDirection getBidiRunDirection(int offset);
+ method public androidx.compose.ui.text.TextLayoutResult copy(androidx.compose.ui.text.TextLayoutInput layoutInput, androidx.compose.ui.text.MultiParagraph multiParagraph, androidx.ui.unit.IntSize size);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getBidiRunDirection(int offset);
method public androidx.ui.geometry.Rect getBoundingBox(int offset);
method public androidx.ui.geometry.Rect getCursorRect(int offset);
method public boolean getDidOverflowHeight();
@@ -616,7 +333,7 @@
method public boolean getHasVisualOverflow();
method public float getHorizontalPosition(int offset, boolean usePrimaryDirection);
method public float getLastBaseline();
- method public androidx.ui.text.TextLayoutInput getLayoutInput();
+ method public androidx.compose.ui.text.TextLayoutInput getLayoutInput();
method public float getLineBottom(int lineIndex);
method public int getLineCount();
method public int getLineEnd(int lineIndex);
@@ -626,11 +343,11 @@
method public int getLineStart(int lineIndex);
method public float getLineTop(int lineIndex);
method public int getOffsetForPosition(androidx.ui.geometry.Offset position);
- method public androidx.ui.text.style.ResolvedTextDirection getParagraphDirection(int offset);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getParagraphDirection(int offset);
method public androidx.ui.graphics.Path getPathForRange(int start, int end);
method public java.util.List<androidx.ui.geometry.Rect> getPlaceholderRects();
method public androidx.ui.unit.IntSize getSize();
- method public androidx.ui.text.TextRange getWordBoundary(int offset);
+ method public androidx.compose.ui.text.TextRange getWordBoundary(int offset);
property public final boolean didOverflowHeight;
property public final boolean didOverflowWidth;
property public final float firstBaseline;
@@ -641,17 +358,17 @@
}
public final class TextPainter {
- method public void paint(androidx.ui.graphics.Canvas canvas, androidx.ui.text.TextLayoutResult textLayoutResult);
- field public static final androidx.ui.text.TextPainter INSTANCE;
+ method public void paint(androidx.ui.graphics.Canvas canvas, androidx.compose.ui.text.TextLayoutResult textLayoutResult);
+ field public static final androidx.compose.ui.text.TextPainter INSTANCE;
}
@androidx.compose.Immutable public final class TextRange {
ctor public TextRange(@IntRange(from=null) int start, @IntRange(from=null) int end);
method public int component1();
method public int component2();
- method public operator boolean contains(androidx.ui.text.TextRange other);
+ method public operator boolean contains(androidx.compose.ui.text.TextRange other);
method public operator boolean contains(int offset);
- method @androidx.compose.Immutable public androidx.ui.text.TextRange copy(int start, int end);
+ method @androidx.compose.Immutable public androidx.compose.ui.text.TextRange copy(int start, int end);
method public boolean getCollapsed();
method public int getEnd();
method public int getLength();
@@ -659,274 +376,557 @@
method public int getMin();
method public boolean getReversed();
method public int getStart();
- method public boolean intersects(androidx.ui.text.TextRange other);
+ method public boolean intersects(androidx.compose.ui.text.TextRange other);
property public final boolean collapsed;
property public final int length;
property public final int max;
property public final int min;
property public final boolean reversed;
- field public static final androidx.ui.text.TextRange.Companion Companion;
+ field public static final androidx.compose.ui.text.TextRange.Companion Companion;
}
public static final class TextRange.Companion {
- method public androidx.ui.text.TextRange getZero();
- property public final androidx.ui.text.TextRange Zero;
+ method public androidx.compose.ui.text.TextRange getZero();
+ property public final androidx.compose.ui.text.TextRange Zero;
}
public final class TextRangeKt {
- method public static androidx.ui.text.TextRange TextRange(int index);
- method public static String substring(CharSequence, androidx.ui.text.TextRange range);
+ method public static androidx.compose.ui.text.TextRange TextRange(int index);
+ method public static String substring(CharSequence, androidx.compose.ui.text.TextRange range);
}
@androidx.compose.Immutable public final class TextStyle {
method public long component1();
- method public androidx.ui.text.style.TextGeometricTransform? component10();
- method public androidx.ui.intl.LocaleList? component11();
+ method public androidx.compose.ui.text.style.TextGeometricTransform? component10();
+ method public androidx.compose.ui.text.intl.LocaleList? component11();
method public long component12();
- method public androidx.ui.text.style.TextDecoration? component13();
+ method public androidx.compose.ui.text.style.TextDecoration? component13();
method public androidx.ui.graphics.Shadow? component14();
- method public androidx.ui.text.style.TextAlign? component15();
- method public androidx.ui.text.style.TextDirection? component16();
+ method public androidx.compose.ui.text.style.TextAlign? component15();
+ method public androidx.compose.ui.text.style.TextDirection? component16();
method public long component17();
- method public androidx.ui.text.style.TextIndent? component18();
+ method public androidx.compose.ui.text.style.TextIndent? component18();
method public long component2();
- method public androidx.ui.text.font.FontWeight? component3();
- method public androidx.ui.text.font.FontStyle? component4();
- method public androidx.ui.text.font.FontSynthesis? component5();
- method public androidx.ui.text.font.FontFamily? component6();
+ method public androidx.compose.ui.text.font.FontWeight? component3();
+ method public androidx.compose.ui.text.font.FontStyle? component4();
+ method public androidx.compose.ui.text.font.FontSynthesis? component5();
+ method public androidx.compose.ui.text.font.FontFamily? component6();
method public String? component7();
method public long component8();
- method public androidx.ui.text.style.BaselineShift? component9();
- method @androidx.compose.Immutable public androidx.ui.text.TextStyle copy-7aJ7aFo(long color, long fontSize, androidx.ui.text.font.FontWeight? fontWeight, androidx.ui.text.font.FontStyle? fontStyle, androidx.ui.text.font.FontSynthesis? fontSynthesis, androidx.ui.text.font.FontFamily? fontFamily, String? fontFeatureSettings, long letterSpacing, androidx.ui.text.style.BaselineShift? baselineShift, androidx.ui.text.style.TextGeometricTransform? textGeometricTransform, androidx.ui.intl.LocaleList? localeList, long background, androidx.ui.text.style.TextDecoration? textDecoration, androidx.ui.graphics.Shadow? shadow, androidx.ui.text.style.TextAlign? textAlign, androidx.ui.text.style.TextDirection? textDirection, long lineHeight, androidx.ui.text.style.TextIndent? textIndent);
+ method public androidx.compose.ui.text.style.BaselineShift? component9();
+ method @androidx.compose.Immutable public androidx.compose.ui.text.TextStyle copy-7Y_OIKU(long color, long fontSize, androidx.compose.ui.text.font.FontWeight? fontWeight, androidx.compose.ui.text.font.FontStyle? fontStyle, androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, androidx.compose.ui.text.font.FontFamily? fontFamily, String? fontFeatureSettings, long letterSpacing, androidx.compose.ui.text.style.BaselineShift? baselineShift, androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, androidx.compose.ui.text.intl.LocaleList? localeList, long background, androidx.compose.ui.text.style.TextDecoration? textDecoration, androidx.ui.graphics.Shadow? shadow, androidx.compose.ui.text.style.TextAlign? textAlign, androidx.compose.ui.text.style.TextDirection? textDirection, long lineHeight, androidx.compose.ui.text.style.TextIndent? textIndent);
method public long getBackground();
- method public androidx.ui.text.style.BaselineShift? getBaselineShift();
+ method public androidx.compose.ui.text.style.BaselineShift? getBaselineShift();
method public long getColor();
- method public androidx.ui.text.font.FontFamily? getFontFamily();
+ method public androidx.compose.ui.text.font.FontFamily? getFontFamily();
method public String? getFontFeatureSettings();
method public long getFontSize();
- method public androidx.ui.text.font.FontStyle? getFontStyle();
- method public androidx.ui.text.font.FontSynthesis? getFontSynthesis();
- method public androidx.ui.text.font.FontWeight? getFontWeight();
+ method public androidx.compose.ui.text.font.FontStyle? getFontStyle();
+ method public androidx.compose.ui.text.font.FontSynthesis? getFontSynthesis();
+ method public androidx.compose.ui.text.font.FontWeight? getFontWeight();
method public long getLetterSpacing();
method public long getLineHeight();
- method public androidx.ui.intl.LocaleList? getLocaleList();
+ method public androidx.compose.ui.text.intl.LocaleList? getLocaleList();
method public androidx.ui.graphics.Shadow? getShadow();
- method public androidx.ui.text.style.TextAlign? getTextAlign();
- method public androidx.ui.text.style.TextDecoration? getTextDecoration();
- method public androidx.ui.text.style.TextDirection? getTextDirection();
- method public androidx.ui.text.style.TextGeometricTransform? getTextGeometricTransform();
- method public androidx.ui.text.style.TextIndent? getTextIndent();
- method @androidx.compose.Stable public androidx.ui.text.TextStyle merge(androidx.ui.text.TextStyle? other = null);
- method @androidx.compose.Stable public androidx.ui.text.TextStyle merge(androidx.ui.text.SpanStyle other);
- method @androidx.compose.Stable public androidx.ui.text.TextStyle merge(androidx.ui.text.ParagraphStyle other);
- method @androidx.compose.Stable public operator androidx.ui.text.TextStyle plus(androidx.ui.text.TextStyle other);
- method @androidx.compose.Stable public operator androidx.ui.text.TextStyle plus(androidx.ui.text.ParagraphStyle other);
- method @androidx.compose.Stable public operator androidx.ui.text.TextStyle plus(androidx.ui.text.SpanStyle other);
- method @androidx.compose.Stable public androidx.ui.text.ParagraphStyle toParagraphStyle();
- method @androidx.compose.Stable public androidx.ui.text.SpanStyle toSpanStyle();
- field public static final androidx.ui.text.TextStyle.Companion Companion;
+ method public androidx.compose.ui.text.style.TextAlign? getTextAlign();
+ method public androidx.compose.ui.text.style.TextDecoration? getTextDecoration();
+ 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.Stable public androidx.compose.ui.text.TextStyle merge(androidx.compose.ui.text.TextStyle? other = null);
+ method @androidx.compose.Stable public androidx.compose.ui.text.TextStyle merge(androidx.compose.ui.text.SpanStyle other);
+ method @androidx.compose.Stable public androidx.compose.ui.text.TextStyle merge(androidx.compose.ui.text.ParagraphStyle other);
+ method @androidx.compose.Stable public operator androidx.compose.ui.text.TextStyle plus(androidx.compose.ui.text.TextStyle other);
+ method @androidx.compose.Stable public operator androidx.compose.ui.text.TextStyle plus(androidx.compose.ui.text.ParagraphStyle other);
+ method @androidx.compose.Stable public operator androidx.compose.ui.text.TextStyle plus(androidx.compose.ui.text.SpanStyle other);
+ method @androidx.compose.Stable public androidx.compose.ui.text.ParagraphStyle toParagraphStyle();
+ method @androidx.compose.Stable public androidx.compose.ui.text.SpanStyle toSpanStyle();
+ field public static final androidx.compose.ui.text.TextStyle.Companion Companion;
}
public static final class TextStyle.Companion {
- method public androidx.ui.text.TextStyle getDefault();
- property public final androidx.ui.text.TextStyle Default;
+ method public androidx.compose.ui.text.TextStyle getDefault();
+ property public final androidx.compose.ui.text.TextStyle Default;
}
public final class TextStyleKt {
- method public static androidx.ui.text.TextStyle lerp(androidx.ui.text.TextStyle start, androidx.ui.text.TextStyle stop, float fraction);
- method public static androidx.ui.text.TextStyle resolveDefaults(androidx.ui.text.TextStyle style, androidx.ui.core.LayoutDirection direction);
+ method public static androidx.compose.ui.text.TextStyle lerp(androidx.compose.ui.text.TextStyle start, androidx.compose.ui.text.TextStyle stop, float fraction);
+ method public static androidx.compose.ui.text.TextStyle resolveDefaults(androidx.compose.ui.text.TextStyle style, androidx.ui.core.LayoutDirection direction);
}
public interface Typeface {
- method public androidx.ui.text.font.FontFamily getFontFamily();
- property public abstract androidx.ui.text.font.FontFamily fontFamily;
+ method public androidx.compose.ui.text.font.FontFamily getFontFamily();
+ property public abstract androidx.compose.ui.text.font.FontFamily fontFamily;
}
}
-package androidx.ui.text.font {
+package androidx.compose.ui.text.font {
- public abstract sealed class FileBasedFontFamily extends androidx.ui.text.font.FontFamily {
+ public abstract sealed class FileBasedFontFamily extends androidx.compose.ui.text.font.FontFamily {
}
@androidx.compose.Immutable public interface Font {
- method public androidx.ui.text.font.FontStyle getStyle();
- method public androidx.ui.text.font.FontWeight getWeight();
- property public abstract androidx.ui.text.font.FontStyle style;
- property public abstract androidx.ui.text.font.FontWeight weight;
+ method public androidx.compose.ui.text.font.FontStyle getStyle();
+ method public androidx.compose.ui.text.font.FontWeight getWeight();
+ property public abstract androidx.compose.ui.text.font.FontStyle style;
+ property public abstract androidx.compose.ui.text.font.FontWeight weight;
}
public static interface Font.ResourceLoader {
- method public Object load(androidx.ui.text.font.Font font);
+ method public Object load(androidx.compose.ui.text.font.Font font);
}
@androidx.compose.Immutable public abstract sealed class FontFamily {
method public final boolean getCanLoadSynchronously();
- field public static final androidx.ui.text.font.FontFamily.Companion Companion;
+ field public static final androidx.compose.ui.text.font.FontFamily.Companion Companion;
}
public static final class FontFamily.Companion {
- method public androidx.ui.text.font.GenericFontFamily getCursive();
- method public androidx.ui.text.font.SystemFontFamily getDefault();
- method public androidx.ui.text.font.GenericFontFamily getMonospace();
- method public androidx.ui.text.font.GenericFontFamily getSansSerif();
- method public androidx.ui.text.font.GenericFontFamily getSerif();
- property public final androidx.ui.text.font.GenericFontFamily Cursive;
- property public final androidx.ui.text.font.SystemFontFamily Default;
- property public final androidx.ui.text.font.GenericFontFamily Monospace;
- property public final androidx.ui.text.font.GenericFontFamily SansSerif;
- property public final androidx.ui.text.font.GenericFontFamily Serif;
+ method public androidx.compose.ui.text.font.GenericFontFamily getCursive();
+ method public androidx.compose.ui.text.font.SystemFontFamily getDefault();
+ method public androidx.compose.ui.text.font.GenericFontFamily getMonospace();
+ method public androidx.compose.ui.text.font.GenericFontFamily getSansSerif();
+ method public androidx.compose.ui.text.font.GenericFontFamily getSerif();
+ property public final androidx.compose.ui.text.font.GenericFontFamily Cursive;
+ property public final androidx.compose.ui.text.font.SystemFontFamily Default;
+ property public final androidx.compose.ui.text.font.GenericFontFamily Monospace;
+ property public final androidx.compose.ui.text.font.GenericFontFamily SansSerif;
+ property public final androidx.compose.ui.text.font.GenericFontFamily Serif;
}
public final class FontFamilyKt {
- method @androidx.compose.Stable public static androidx.ui.text.font.FontListFontFamily fontFamily(java.util.List<? extends androidx.ui.text.font.Font> fonts);
- method @androidx.compose.Stable public static androidx.ui.text.font.FontListFontFamily fontFamily(androidx.ui.text.font.Font... fonts);
- method public static androidx.ui.text.font.LoadedFontFamily fontFamily(androidx.ui.text.Typeface typeface);
+ method @androidx.compose.Stable public static androidx.compose.ui.text.font.FontListFontFamily fontFamily(java.util.List<? extends androidx.compose.ui.text.font.Font> fonts);
+ method @androidx.compose.Stable public static androidx.compose.ui.text.font.FontListFontFamily fontFamily(androidx.compose.ui.text.font.Font... fonts);
+ method public static androidx.compose.ui.text.font.LoadedFontFamily fontFamily(androidx.compose.ui.text.Typeface typeface);
}
public final class FontKt {
- method @androidx.compose.Stable public static androidx.ui.text.font.FontListFontFamily asFontFamily(androidx.ui.text.font.Font);
- method @androidx.compose.Stable public static androidx.ui.text.font.Font font(int resId, androidx.ui.text.font.FontWeight weight = FontWeight.Normal, androidx.ui.text.font.FontStyle style = androidx.ui.text.font.FontStyle.Normal);
+ method @androidx.compose.Stable public static androidx.compose.ui.text.font.FontListFontFamily asFontFamily(androidx.compose.ui.text.font.Font);
+ method @androidx.compose.Stable public static androidx.compose.ui.text.font.Font font(int resId, androidx.compose.ui.text.font.FontWeight weight = FontWeight.Normal, androidx.compose.ui.text.font.FontStyle style = androidx.compose.ui.text.font.FontStyle.Normal);
}
- @androidx.compose.Immutable public final class FontListFontFamily extends androidx.ui.text.font.FileBasedFontFamily implements kotlin.jvm.internal.markers.KMappedMarker java.util.List<androidx.ui.text.font.Font> {
- ctor public FontListFontFamily(java.util.List<? extends androidx.ui.text.font.Font> fonts);
- method public java.util.List<androidx.ui.text.font.Font> component1();
- method public boolean contains(androidx.ui.text.font.Font element);
+ @androidx.compose.Immutable public final class FontListFontFamily extends androidx.compose.ui.text.font.FileBasedFontFamily implements kotlin.jvm.internal.markers.KMappedMarker java.util.List<androidx.compose.ui.text.font.Font> {
+ ctor public FontListFontFamily(java.util.List<? extends androidx.compose.ui.text.font.Font> fonts);
+ method public java.util.List<androidx.compose.ui.text.font.Font> component1();
+ method public boolean contains(androidx.compose.ui.text.font.Font element);
method public boolean containsAll(java.util.Collection<?> elements);
- method @androidx.compose.Immutable public androidx.ui.text.font.FontListFontFamily copy(java.util.List<? extends androidx.ui.text.font.Font> fonts);
- method public androidx.ui.text.font.Font get(int index);
- method public java.util.List<androidx.ui.text.font.Font> getFonts();
+ method @androidx.compose.Immutable public androidx.compose.ui.text.font.FontListFontFamily copy(java.util.List<? extends androidx.compose.ui.text.font.Font> fonts);
+ method public androidx.compose.ui.text.font.Font get(int index);
+ method public java.util.List<androidx.compose.ui.text.font.Font> getFonts();
method public int getSize();
- method public int indexOf(androidx.ui.text.font.Font element);
+ method public int indexOf(androidx.compose.ui.text.font.Font element);
method public boolean isEmpty();
- method public java.util.Iterator<androidx.ui.text.font.Font> iterator();
- method public int lastIndexOf(androidx.ui.text.font.Font element);
- method public java.util.ListIterator<androidx.ui.text.font.Font> listIterator();
- method public java.util.ListIterator<androidx.ui.text.font.Font> listIterator(int index);
- method public java.util.List<androidx.ui.text.font.Font> subList(int fromIndex, int toIndex);
+ method public java.util.Iterator<androidx.compose.ui.text.font.Font> iterator();
+ method public int lastIndexOf(androidx.compose.ui.text.font.Font element);
+ method public java.util.ListIterator<androidx.compose.ui.text.font.Font> listIterator();
+ method public java.util.ListIterator<androidx.compose.ui.text.font.Font> listIterator(int index);
+ method public java.util.List<androidx.compose.ui.text.font.Font> subList(int fromIndex, int toIndex);
}
public enum FontStyle {
- method public static androidx.ui.text.font.FontStyle valueOf(String name) throws java.lang.IllegalArgumentException;
- method public static androidx.ui.text.font.FontStyle[] values();
- enum_constant public static final androidx.ui.text.font.FontStyle Italic;
- enum_constant public static final androidx.ui.text.font.FontStyle Normal;
+ method public static androidx.compose.ui.text.font.FontStyle valueOf(String name) throws java.lang.IllegalArgumentException;
+ method public static androidx.compose.ui.text.font.FontStyle[] values();
+ enum_constant public static final androidx.compose.ui.text.font.FontStyle Italic;
+ enum_constant public static final androidx.compose.ui.text.font.FontStyle Normal;
}
public enum FontSynthesis {
- method public static androidx.ui.text.font.FontSynthesis valueOf(String name) throws java.lang.IllegalArgumentException;
- method public static androidx.ui.text.font.FontSynthesis[] values();
- enum_constant public static final androidx.ui.text.font.FontSynthesis All;
- enum_constant public static final androidx.ui.text.font.FontSynthesis None;
- enum_constant public static final androidx.ui.text.font.FontSynthesis Style;
- enum_constant public static final androidx.ui.text.font.FontSynthesis Weight;
+ method public static androidx.compose.ui.text.font.FontSynthesis valueOf(String name) throws java.lang.IllegalArgumentException;
+ method public static androidx.compose.ui.text.font.FontSynthesis[] values();
+ enum_constant public static final androidx.compose.ui.text.font.FontSynthesis All;
+ enum_constant public static final androidx.compose.ui.text.font.FontSynthesis None;
+ enum_constant public static final androidx.compose.ui.text.font.FontSynthesis Style;
+ enum_constant public static final androidx.compose.ui.text.font.FontSynthesis Weight;
}
- @androidx.compose.Immutable public final class FontWeight implements java.lang.Comparable<androidx.ui.text.font.FontWeight> {
+ @androidx.compose.Immutable public final class FontWeight implements java.lang.Comparable<androidx.compose.ui.text.font.FontWeight> {
ctor public FontWeight(int weight);
- method public int compareTo(androidx.ui.text.font.FontWeight other);
+ method public int compareTo(androidx.compose.ui.text.font.FontWeight other);
method public int component1();
- method @androidx.compose.Immutable public androidx.ui.text.font.FontWeight copy(int weight);
+ method @androidx.compose.Immutable public androidx.compose.ui.text.font.FontWeight copy(int weight);
method public int getWeight();
- field public static final androidx.ui.text.font.FontWeight.Companion Companion;
+ field public static final androidx.compose.ui.text.font.FontWeight.Companion Companion;
}
public static final class FontWeight.Companion {
- method public androidx.ui.text.font.FontWeight getBlack();
- method public androidx.ui.text.font.FontWeight getBold();
- method public androidx.ui.text.font.FontWeight getExtraBold();
- method public androidx.ui.text.font.FontWeight getExtraLight();
- method public androidx.ui.text.font.FontWeight getLight();
- method public androidx.ui.text.font.FontWeight getMedium();
- method public androidx.ui.text.font.FontWeight getNormal();
- method public androidx.ui.text.font.FontWeight getSemiBold();
- method public androidx.ui.text.font.FontWeight getThin();
- method public androidx.ui.text.font.FontWeight getW100();
- method public androidx.ui.text.font.FontWeight getW200();
- method public androidx.ui.text.font.FontWeight getW300();
- method public androidx.ui.text.font.FontWeight getW400();
- method public androidx.ui.text.font.FontWeight getW500();
- method public androidx.ui.text.font.FontWeight getW600();
- method public androidx.ui.text.font.FontWeight getW700();
- method public androidx.ui.text.font.FontWeight getW800();
- method public androidx.ui.text.font.FontWeight getW900();
- property public final androidx.ui.text.font.FontWeight Black;
- property public final androidx.ui.text.font.FontWeight Bold;
- property public final androidx.ui.text.font.FontWeight ExtraBold;
- property public final androidx.ui.text.font.FontWeight ExtraLight;
- property public final androidx.ui.text.font.FontWeight Light;
- property public final androidx.ui.text.font.FontWeight Medium;
- property public final androidx.ui.text.font.FontWeight Normal;
- property public final androidx.ui.text.font.FontWeight SemiBold;
- property public final androidx.ui.text.font.FontWeight Thin;
- property public final androidx.ui.text.font.FontWeight W100;
- property public final androidx.ui.text.font.FontWeight W200;
- property public final androidx.ui.text.font.FontWeight W300;
- property public final androidx.ui.text.font.FontWeight W400;
- property public final androidx.ui.text.font.FontWeight W500;
- property public final androidx.ui.text.font.FontWeight W600;
- property public final androidx.ui.text.font.FontWeight W700;
- property public final androidx.ui.text.font.FontWeight W800;
- property public final androidx.ui.text.font.FontWeight W900;
+ method public androidx.compose.ui.text.font.FontWeight getBlack();
+ method public androidx.compose.ui.text.font.FontWeight getBold();
+ method public androidx.compose.ui.text.font.FontWeight getExtraBold();
+ method public androidx.compose.ui.text.font.FontWeight getExtraLight();
+ method public androidx.compose.ui.text.font.FontWeight getLight();
+ method public androidx.compose.ui.text.font.FontWeight getMedium();
+ method public androidx.compose.ui.text.font.FontWeight getNormal();
+ method public androidx.compose.ui.text.font.FontWeight getSemiBold();
+ method public androidx.compose.ui.text.font.FontWeight getThin();
+ method public androidx.compose.ui.text.font.FontWeight getW100();
+ method public androidx.compose.ui.text.font.FontWeight getW200();
+ method public androidx.compose.ui.text.font.FontWeight getW300();
+ method public androidx.compose.ui.text.font.FontWeight getW400();
+ method public androidx.compose.ui.text.font.FontWeight getW500();
+ method public androidx.compose.ui.text.font.FontWeight getW600();
+ method public androidx.compose.ui.text.font.FontWeight getW700();
+ method public androidx.compose.ui.text.font.FontWeight getW800();
+ method public androidx.compose.ui.text.font.FontWeight getW900();
+ property public final androidx.compose.ui.text.font.FontWeight Black;
+ property public final androidx.compose.ui.text.font.FontWeight Bold;
+ property public final androidx.compose.ui.text.font.FontWeight ExtraBold;
+ property public final androidx.compose.ui.text.font.FontWeight ExtraLight;
+ property public final androidx.compose.ui.text.font.FontWeight Light;
+ property public final androidx.compose.ui.text.font.FontWeight Medium;
+ property public final androidx.compose.ui.text.font.FontWeight Normal;
+ property public final androidx.compose.ui.text.font.FontWeight SemiBold;
+ property public final androidx.compose.ui.text.font.FontWeight Thin;
+ property public final androidx.compose.ui.text.font.FontWeight W100;
+ property public final androidx.compose.ui.text.font.FontWeight W200;
+ property public final androidx.compose.ui.text.font.FontWeight W300;
+ property public final androidx.compose.ui.text.font.FontWeight W400;
+ property public final androidx.compose.ui.text.font.FontWeight W500;
+ property public final androidx.compose.ui.text.font.FontWeight W600;
+ property public final androidx.compose.ui.text.font.FontWeight W700;
+ property public final androidx.compose.ui.text.font.FontWeight W800;
+ property public final androidx.compose.ui.text.font.FontWeight W900;
}
public final class FontWeightKt {
- method public static androidx.ui.text.font.FontWeight lerp(androidx.ui.text.font.FontWeight start, androidx.ui.text.font.FontWeight stop, float fraction);
+ method public static androidx.compose.ui.text.font.FontWeight lerp(androidx.compose.ui.text.font.FontWeight start, androidx.compose.ui.text.font.FontWeight stop, float fraction);
}
- @androidx.compose.Immutable public final class GenericFontFamily extends androidx.ui.text.font.SystemFontFamily {
+ @androidx.compose.Immutable public final class GenericFontFamily extends androidx.compose.ui.text.font.SystemFontFamily {
method public String getName();
}
- public final class LoadedFontFamily extends androidx.ui.text.font.FontFamily {
- ctor public LoadedFontFamily(androidx.ui.text.Typeface typeface);
- method public androidx.ui.text.Typeface component1();
- method public androidx.ui.text.font.LoadedFontFamily copy(androidx.ui.text.Typeface typeface);
- method public androidx.ui.text.Typeface getTypeface();
+ public final class LoadedFontFamily extends androidx.compose.ui.text.font.FontFamily {
+ ctor public LoadedFontFamily(androidx.compose.ui.text.Typeface typeface);
+ method public androidx.compose.ui.text.Typeface component1();
+ method public androidx.compose.ui.text.font.LoadedFontFamily copy(androidx.compose.ui.text.Typeface typeface);
+ method public androidx.compose.ui.text.Typeface getTypeface();
}
- public final class ResourceFont implements androidx.ui.text.font.Font {
- ctor public ResourceFont(int resId, androidx.ui.text.font.FontWeight weight, androidx.ui.text.font.FontStyle style);
+ public final class ResourceFont implements androidx.compose.ui.text.font.Font {
+ ctor public ResourceFont(int resId, androidx.compose.ui.text.font.FontWeight weight, androidx.compose.ui.text.font.FontStyle style);
method public int component1();
- method public androidx.ui.text.font.FontWeight component2();
- method public androidx.ui.text.font.FontStyle component3();
- method public androidx.ui.text.font.ResourceFont copy(int resId, androidx.ui.text.font.FontWeight weight, androidx.ui.text.font.FontStyle style);
+ method public androidx.compose.ui.text.font.FontWeight component2();
+ method public androidx.compose.ui.text.font.FontStyle component3();
+ method public androidx.compose.ui.text.font.ResourceFont copy(int resId, androidx.compose.ui.text.font.FontWeight weight, androidx.compose.ui.text.font.FontStyle style);
method public int getResId();
- method public androidx.ui.text.font.FontStyle getStyle();
- method public androidx.ui.text.font.FontWeight getWeight();
+ method public androidx.compose.ui.text.font.FontStyle getStyle();
+ method public androidx.compose.ui.text.font.FontWeight getWeight();
}
- public abstract sealed class SystemFontFamily extends androidx.ui.text.font.FontFamily {
+ public abstract sealed class SystemFontFamily extends androidx.compose.ui.text.font.FontFamily {
}
}
-package androidx.ui.text.platform {
+package androidx.compose.ui.text.input {
+
+ public final class BackspaceKeyEditOp implements androidx.compose.ui.text.input.EditOperation {
+ ctor public BackspaceKeyEditOp();
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public final class CommitTextEditOp implements androidx.compose.ui.text.input.EditOperation {
+ ctor public CommitTextEditOp(String text, int newCursorPosition);
+ method public String component1();
+ method public int component2();
+ method public androidx.compose.ui.text.input.CommitTextEditOp copy(String text, int newCursorPosition);
+ method public int getNewCursorPosition();
+ method public String getText();
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public final class DeleteAllEditOp implements androidx.compose.ui.text.input.EditOperation {
+ ctor public DeleteAllEditOp();
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public final class DeleteSurroundingTextEditOp implements androidx.compose.ui.text.input.EditOperation {
+ ctor public DeleteSurroundingTextEditOp(int beforeLength, int afterLength);
+ method public int component1();
+ method public int component2();
+ method public androidx.compose.ui.text.input.DeleteSurroundingTextEditOp copy(int beforeLength, int afterLength);
+ method public int getAfterLength();
+ method public int getBeforeLength();
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public final class DeleteSurroundingTextInCodePointsEditOp implements androidx.compose.ui.text.input.EditOperation {
+ ctor public DeleteSurroundingTextInCodePointsEditOp(int beforeLength, int afterLength);
+ method public int component1();
+ method public int component2();
+ method public androidx.compose.ui.text.input.DeleteSurroundingTextInCodePointsEditOp copy(int beforeLength, int afterLength);
+ method public int getAfterLength();
+ method public int getBeforeLength();
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public interface EditOperation {
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public final class EditingBuffer {
+ ctor public EditingBuffer(String initialText, androidx.compose.ui.text.TextRange initialSelection);
+ field public static final int NOWHERE = -1; // 0xffffffff
+ }
+
+ @Deprecated @androidx.compose.Immutable public final class EditorValue {
+ ctor @Deprecated public EditorValue(String text, androidx.compose.ui.text.TextRange selection, androidx.compose.ui.text.TextRange? composition);
+ ctor @Deprecated public EditorValue();
+ method @Deprecated public String component1();
+ method @Deprecated public androidx.compose.ui.text.TextRange component2();
+ method @Deprecated public androidx.compose.ui.text.TextRange? component3();
+ method @Deprecated @androidx.compose.Immutable public androidx.compose.ui.text.input.EditorValue copy(String text, androidx.compose.ui.text.TextRange selection, androidx.compose.ui.text.TextRange? composition);
+ method @Deprecated public androidx.compose.ui.text.TextRange? getComposition();
+ method @Deprecated public String getSelectedText();
+ method @Deprecated public androidx.compose.ui.text.TextRange getSelection();
+ method @Deprecated public String getText();
+ method @Deprecated public String getTextAfterSelection(int maxChars);
+ method @Deprecated public String getTextBeforeSelection(int maxChars);
+ }
+
+ public final class FinishComposingTextEditOp implements androidx.compose.ui.text.input.EditOperation {
+ ctor public FinishComposingTextEditOp();
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public final class GapBufferKt {
+ }
+
+ public enum ImeAction {
+ method public static androidx.compose.ui.text.input.ImeAction valueOf(String name) throws java.lang.IllegalArgumentException;
+ method public static androidx.compose.ui.text.input.ImeAction[] values();
+ enum_constant public static final androidx.compose.ui.text.input.ImeAction Done;
+ enum_constant public static final androidx.compose.ui.text.input.ImeAction Go;
+ enum_constant public static final androidx.compose.ui.text.input.ImeAction Next;
+ enum_constant public static final androidx.compose.ui.text.input.ImeAction NoAction;
+ enum_constant public static final androidx.compose.ui.text.input.ImeAction Previous;
+ enum_constant public static final androidx.compose.ui.text.input.ImeAction Search;
+ enum_constant public static final androidx.compose.ui.text.input.ImeAction Send;
+ enum_constant public static final androidx.compose.ui.text.input.ImeAction Unspecified;
+ }
+
+ public interface InputEventListener {
+ method public void onEditOperations(java.util.List<? extends androidx.compose.ui.text.input.EditOperation> editOps);
+ method public void onImeAction(androidx.compose.ui.text.input.ImeAction imeAction);
+ }
+
+ public enum KeyboardType {
+ method public static androidx.compose.ui.text.input.KeyboardType valueOf(String name) throws java.lang.IllegalArgumentException;
+ method public static androidx.compose.ui.text.input.KeyboardType[] values();
+ enum_constant public static final androidx.compose.ui.text.input.KeyboardType Ascii;
+ enum_constant public static final androidx.compose.ui.text.input.KeyboardType Email;
+ enum_constant public static final androidx.compose.ui.text.input.KeyboardType Number;
+ enum_constant public static final androidx.compose.ui.text.input.KeyboardType NumberPassword;
+ enum_constant public static final androidx.compose.ui.text.input.KeyboardType Password;
+ enum_constant public static final androidx.compose.ui.text.input.KeyboardType Phone;
+ enum_constant public static final androidx.compose.ui.text.input.KeyboardType Text;
+ enum_constant public static final androidx.compose.ui.text.input.KeyboardType Uri;
+ }
+
+ public final class MoveCursorEditOp implements androidx.compose.ui.text.input.EditOperation {
+ ctor public MoveCursorEditOp(int amount);
+ method public int component1();
+ method public androidx.compose.ui.text.input.MoveCursorEditOp copy(int amount);
+ method public int getAmount();
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public interface OffsetMap {
+ method public int originalToTransformed(int offset);
+ method public int transformedToOriginal(int offset);
+ field public static final androidx.compose.ui.text.input.OffsetMap.Companion Companion;
+ }
+
+ public static final class OffsetMap.Companion {
+ method public androidx.compose.ui.text.input.OffsetMap getIdentityOffsetMap();
+ property public final androidx.compose.ui.text.input.OffsetMap identityOffsetMap;
+ }
+
+ public final class PasswordVisualTransformation implements androidx.compose.ui.text.input.VisualTransformation {
+ ctor public PasswordVisualTransformation(char mask);
+ ctor public PasswordVisualTransformation();
+ method public char component1();
+ method public androidx.compose.ui.text.input.PasswordVisualTransformation copy(char mask);
+ method public androidx.compose.ui.text.input.TransformedText filter(androidx.compose.ui.text.AnnotatedString text);
+ method public char getMask();
+ }
+
+ public interface PlatformTextInputService {
+ method public void hideSoftwareKeyboard();
+ method public void notifyFocusedRect(androidx.ui.geometry.Rect rect);
+ method public void onStateUpdated(androidx.compose.ui.text.input.TextFieldValue value);
+ method public void showSoftwareKeyboard();
+ method public void startInput(androidx.compose.ui.text.input.TextFieldValue value, androidx.compose.ui.text.input.KeyboardType keyboardType, androidx.compose.ui.text.input.ImeAction imeAction, kotlin.jvm.functions.Function1<? super java.util.List<? extends androidx.compose.ui.text.input.EditOperation>,kotlin.Unit> onEditCommand, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.ImeAction,kotlin.Unit> onImeActionPerformed);
+ method public void stopInput();
+ }
+
+ public final class SetComposingRegionEditOp implements androidx.compose.ui.text.input.EditOperation {
+ ctor public SetComposingRegionEditOp(int start, int end);
+ method public int component1();
+ method public int component2();
+ method public androidx.compose.ui.text.input.SetComposingRegionEditOp copy(int start, int end);
+ method public int getEnd();
+ method public int getStart();
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public final class SetComposingTextEditOp implements androidx.compose.ui.text.input.EditOperation {
+ ctor public SetComposingTextEditOp(String text, int newCursorPosition);
+ method public String component1();
+ method public int component2();
+ method public androidx.compose.ui.text.input.SetComposingTextEditOp copy(String text, int newCursorPosition);
+ method public int getNewCursorPosition();
+ method public String getText();
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public final class SetSelectionEditOp implements androidx.compose.ui.text.input.EditOperation {
+ ctor public SetSelectionEditOp(int start, int end);
+ method public int component1();
+ method public int component2();
+ method public androidx.compose.ui.text.input.SetSelectionEditOp copy(int start, int end);
+ method public int getEnd();
+ method public int getStart();
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ @androidx.compose.Immutable public final class TextFieldValue {
+ ctor public TextFieldValue(String text, androidx.compose.ui.text.TextRange selection, androidx.compose.ui.text.TextRange? composition);
+ ctor public TextFieldValue();
+ method public String component1();
+ method public androidx.compose.ui.text.TextRange component2();
+ method public androidx.compose.ui.text.TextRange? component3();
+ method @androidx.compose.Immutable public androidx.compose.ui.text.input.TextFieldValue copy(String text, androidx.compose.ui.text.TextRange selection, androidx.compose.ui.text.TextRange? composition);
+ method public androidx.compose.ui.text.TextRange? getComposition();
+ method public androidx.compose.ui.text.TextRange getSelection();
+ method public String getText();
+ field public static final androidx.compose.ui.text.input.TextFieldValue.Companion Companion;
+ }
+
+ public static final class TextFieldValue.Companion {
+ method public androidx.compose.runtime.savedinstancestate.Saver<androidx.compose.ui.text.input.TextFieldValue,java.lang.Object> getSaver();
+ property public final androidx.compose.runtime.savedinstancestate.Saver<androidx.compose.ui.text.input.TextFieldValue,java.lang.Object> Saver;
+ }
+
+ public final class TextFieldValueKt {
+ method public static String getSelectedText(androidx.compose.ui.text.input.TextFieldValue);
+ method public static String getTextAfterSelection(androidx.compose.ui.text.input.TextFieldValue, int maxChars);
+ method public static String getTextBeforeSelection(androidx.compose.ui.text.input.TextFieldValue, int maxChars);
+ }
+
+ public class TextInputService {
+ ctor public TextInputService(androidx.compose.ui.text.input.PlatformTextInputService platformTextInputService);
+ method public void hideSoftwareKeyboard(int token);
+ method public void notifyFocusedRect(int token, androidx.ui.geometry.Rect rect);
+ method public void onStateUpdated(int token, androidx.compose.ui.text.input.TextFieldValue value);
+ method public void showSoftwareKeyboard(int token);
+ method public int startInput(androidx.compose.ui.text.input.TextFieldValue value, androidx.compose.ui.text.input.KeyboardType keyboardType, androidx.compose.ui.text.input.ImeAction imeAction, kotlin.jvm.functions.Function1<? super java.util.List<? extends androidx.compose.ui.text.input.EditOperation>,kotlin.Unit> onEditCommand, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.ImeAction,kotlin.Unit> onImeActionPerformed);
+ method public void stopInput(int token);
+ }
+
+ public final class TextInputServiceKt {
+ method @Deprecated public static kotlin.jvm.functions.Function1<androidx.compose.ui.text.input.PlatformTextInputService,androidx.compose.ui.text.input.TextInputService> getTextInputServiceFactory();
+ method @Deprecated public static void setTextInputServiceFactory(kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.PlatformTextInputService,? extends androidx.compose.ui.text.input.TextInputService> p);
+ field public static final int INVALID_SESSION = -1; // 0xffffffff
+ field public static final int NO_SESSION = 0; // 0x0
+ }
+
+ public final class TransformedText {
+ ctor public TransformedText(androidx.compose.ui.text.AnnotatedString transformedText, androidx.compose.ui.text.input.OffsetMap offsetMap);
+ method public androidx.compose.ui.text.AnnotatedString component1();
+ method public androidx.compose.ui.text.input.OffsetMap component2();
+ method public androidx.compose.ui.text.input.TransformedText copy(androidx.compose.ui.text.AnnotatedString transformedText, androidx.compose.ui.text.input.OffsetMap offsetMap);
+ method public androidx.compose.ui.text.input.OffsetMap getOffsetMap();
+ method public androidx.compose.ui.text.AnnotatedString getTransformedText();
+ }
+
+ @androidx.compose.Immutable public interface VisualTransformation {
+ method public androidx.compose.ui.text.input.TransformedText filter(androidx.compose.ui.text.AnnotatedString text);
+ field public static final androidx.compose.ui.text.input.VisualTransformation.Companion Companion;
+ }
+
+ public static final class VisualTransformation.Companion {
+ method public androidx.compose.ui.text.input.VisualTransformation getNone();
+ property public final androidx.compose.ui.text.input.VisualTransformation None;
+ }
+
+}
+
+package androidx.compose.ui.text.intl {
+
+ public final class AndroidPlatformLocaleKt {
+ }
+
+ @androidx.compose.Immutable public final class Locale {
+ ctor public Locale(String languageTag);
+ method public String getLanguage();
+ method public String getRegion();
+ method public String getScript();
+ method public String toLanguageTag();
+ property public final String language;
+ property public final String region;
+ property public final String script;
+ field public static final androidx.compose.ui.text.intl.Locale.Companion Companion;
+ }
+
+ public static final class Locale.Companion {
+ method public androidx.compose.ui.text.intl.Locale getCurrent();
+ property public final androidx.compose.ui.text.intl.Locale current;
+ }
+
+ @androidx.compose.Immutable public final class LocaleList implements java.util.Collection<androidx.compose.ui.text.intl.Locale> kotlin.jvm.internal.markers.KMappedMarker {
+ ctor public LocaleList(java.util.List<androidx.compose.ui.text.intl.Locale> localeList);
+ ctor public LocaleList(String languageTags);
+ ctor public LocaleList(androidx.compose.ui.text.intl.Locale... locales);
+ method public java.util.List<androidx.compose.ui.text.intl.Locale> component1();
+ method public operator boolean contains(androidx.compose.ui.text.intl.Locale element);
+ method public boolean containsAll(java.util.Collection<?> elements);
+ method @androidx.compose.Immutable public androidx.compose.ui.text.intl.LocaleList copy(java.util.List<androidx.compose.ui.text.intl.Locale> localeList);
+ method public operator androidx.compose.ui.text.intl.Locale get(int i);
+ method public java.util.List<androidx.compose.ui.text.intl.Locale> getLocaleList();
+ method public int getSize();
+ method public boolean isEmpty();
+ method public java.util.Iterator<androidx.compose.ui.text.intl.Locale> iterator();
+ property public int size;
+ field public static final androidx.compose.ui.text.intl.LocaleList.Companion Companion;
+ }
+
+ public static final class LocaleList.Companion {
+ method public androidx.compose.ui.text.intl.LocaleList getCurrent();
+ property public final androidx.compose.ui.text.intl.LocaleList current;
+ }
+
+ public final class PlatformLocaleKt {
+ }
+
+}
+
+package androidx.compose.ui.text.platform {
public final class AndroidParagraphHelperKt {
}
public final class AndroidParagraphIntrinsicsKt {
- method @Deprecated public static kotlin.jvm.functions.Function6<java.lang.String,androidx.ui.text.TextStyle,java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.SpanStyle>>,java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>>,androidx.ui.unit.Density,androidx.ui.text.font.Font.ResourceLoader,androidx.ui.text.ParagraphIntrinsics> getParagraphIntrinsicsActualFactory();
- method @Deprecated public static void setParagraphIntrinsicsActualFactory(kotlin.jvm.functions.Function6<? super java.lang.String,? super androidx.ui.text.TextStyle,? super java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.SpanStyle>>,? super java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>>,? super androidx.ui.unit.Density,? super androidx.ui.text.font.Font.ResourceLoader,? extends androidx.ui.text.ParagraphIntrinsics> p);
+ method @Deprecated public static kotlin.jvm.functions.Function6<java.lang.String,androidx.compose.ui.text.TextStyle,java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>>,java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>>,androidx.ui.unit.Density,androidx.compose.ui.text.font.Font.ResourceLoader,androidx.compose.ui.text.ParagraphIntrinsics> getParagraphIntrinsicsActualFactory();
+ method @Deprecated public static void setParagraphIntrinsicsActualFactory(kotlin.jvm.functions.Function6<? super java.lang.String,? super androidx.compose.ui.text.TextStyle,? super java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>>,? super java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>>,? super androidx.ui.unit.Density,? super androidx.compose.ui.text.font.Font.ResourceLoader,? extends androidx.compose.ui.text.ParagraphIntrinsics> p);
}
public final class AndroidParagraphKt {
- method @Deprecated public static kotlin.jvm.functions.Function4<androidx.ui.text.ParagraphIntrinsics,java.lang.Integer,java.lang.Boolean,androidx.ui.text.ParagraphConstraints,androidx.ui.text.Paragraph> getParagraphActualFactory();
- method @Deprecated public static void setParagraphActualFactory(kotlin.jvm.functions.Function4<? super androidx.ui.text.ParagraphIntrinsics,? super java.lang.Integer,? super java.lang.Boolean,? super androidx.ui.text.ParagraphConstraints,? extends androidx.ui.text.Paragraph> p);
+ method @Deprecated public static kotlin.jvm.functions.Function4<androidx.compose.ui.text.ParagraphIntrinsics,java.lang.Integer,java.lang.Boolean,androidx.compose.ui.text.ParagraphConstraints,androidx.compose.ui.text.Paragraph> getParagraphActualFactory();
+ method @Deprecated public static void setParagraphActualFactory(kotlin.jvm.functions.Function4<? super androidx.compose.ui.text.ParagraphIntrinsics,? super java.lang.Integer,? super java.lang.Boolean,? super androidx.compose.ui.text.ParagraphConstraints,? extends androidx.compose.ui.text.Paragraph> p);
}
public final class AndroidStringDelegateKt {
}
public final class TypefaceAdapterKt {
- method public static androidx.ui.text.Typeface typefaceFromFontFamily(android.content.Context context, androidx.ui.text.font.FontFamily fontFamily, java.util.List<? extends kotlin.Pair<androidx.ui.text.font.FontWeight,? extends androidx.ui.text.font.FontStyle>>? necessaryStyles = null);
+ method public static androidx.compose.ui.text.Typeface typefaceFromFontFamily(android.content.Context context, androidx.compose.ui.text.font.FontFamily fontFamily, java.util.List<? extends kotlin.Pair<androidx.compose.ui.text.font.FontWeight,? extends androidx.compose.ui.text.font.FontStyle>>? necessaryStyles = null);
}
}
-package androidx.ui.text.platform.extensions {
+package androidx.compose.ui.text.platform.extensions {
public final class LocaleExtensionsKt {
}
@@ -942,7 +942,7 @@
}
-package androidx.ui.text.style {
+package androidx.compose.ui.text.style {
@androidx.compose.Immutable public final inline class BaselineShift {
ctor public BaselineShift();
@@ -952,7 +952,7 @@
method public float getMultiplier();
method @androidx.compose.Immutable public static inline int hashCode-impl(float p);
method @androidx.compose.Immutable public static inline String! toString-impl(float p);
- field public static final androidx.ui.text.style.BaselineShift.Companion Companion;
+ field public static final androidx.compose.ui.text.style.BaselineShift.Companion Companion;
}
public static final class BaselineShift.Companion {
@@ -965,54 +965,54 @@
}
public final class BaselineShiftKt {
- method @androidx.compose.Stable public static float lerp-7csQwvo(float start, float stop, float fraction);
+ method @androidx.compose.Stable public static float lerp-ylBt8J4(float start, float stop, float fraction);
}
public enum ResolvedTextDirection {
- method public static androidx.ui.text.style.ResolvedTextDirection valueOf(String name) throws java.lang.IllegalArgumentException;
- method public static androidx.ui.text.style.ResolvedTextDirection[] values();
- enum_constant public static final androidx.ui.text.style.ResolvedTextDirection Ltr;
- enum_constant public static final androidx.ui.text.style.ResolvedTextDirection Rtl;
+ method public static androidx.compose.ui.text.style.ResolvedTextDirection valueOf(String name) throws java.lang.IllegalArgumentException;
+ method public static androidx.compose.ui.text.style.ResolvedTextDirection[] values();
+ enum_constant public static final androidx.compose.ui.text.style.ResolvedTextDirection Ltr;
+ enum_constant public static final androidx.compose.ui.text.style.ResolvedTextDirection Rtl;
}
public enum TextAlign {
- method public static androidx.ui.text.style.TextAlign valueOf(String name) throws java.lang.IllegalArgumentException;
- method public static androidx.ui.text.style.TextAlign[] values();
- enum_constant public static final androidx.ui.text.style.TextAlign Center;
- enum_constant public static final androidx.ui.text.style.TextAlign End;
- enum_constant public static final androidx.ui.text.style.TextAlign Justify;
- enum_constant public static final androidx.ui.text.style.TextAlign Left;
- enum_constant public static final androidx.ui.text.style.TextAlign Right;
- enum_constant public static final androidx.ui.text.style.TextAlign Start;
+ method public static androidx.compose.ui.text.style.TextAlign valueOf(String name) throws java.lang.IllegalArgumentException;
+ method public static androidx.compose.ui.text.style.TextAlign[] values();
+ enum_constant public static final androidx.compose.ui.text.style.TextAlign Center;
+ enum_constant public static final androidx.compose.ui.text.style.TextAlign End;
+ enum_constant public static final androidx.compose.ui.text.style.TextAlign Justify;
+ enum_constant public static final androidx.compose.ui.text.style.TextAlign Left;
+ enum_constant public static final androidx.compose.ui.text.style.TextAlign Right;
+ enum_constant public static final androidx.compose.ui.text.style.TextAlign Start;
}
@androidx.compose.Immutable public final class TextDecoration {
method public int component1();
- method public operator boolean contains(androidx.ui.text.style.TextDecoration other);
- method @androidx.compose.Immutable public androidx.ui.text.style.TextDecoration copy(int mask);
+ method public operator boolean contains(androidx.compose.ui.text.style.TextDecoration other);
+ method @androidx.compose.Immutable public androidx.compose.ui.text.style.TextDecoration copy(int mask);
method public int getMask();
- method public operator androidx.ui.text.style.TextDecoration plus(androidx.ui.text.style.TextDecoration decoration);
- field public static final androidx.ui.text.style.TextDecoration.Companion Companion;
+ method public operator androidx.compose.ui.text.style.TextDecoration plus(androidx.compose.ui.text.style.TextDecoration decoration);
+ field public static final androidx.compose.ui.text.style.TextDecoration.Companion Companion;
}
public static final class TextDecoration.Companion {
- method public androidx.ui.text.style.TextDecoration combine(java.util.List<androidx.ui.text.style.TextDecoration> decorations);
- method public androidx.ui.text.style.TextDecoration getLineThrough();
- method public androidx.ui.text.style.TextDecoration getNone();
- method public androidx.ui.text.style.TextDecoration getUnderline();
- property public final androidx.ui.text.style.TextDecoration LineThrough;
- property public final androidx.ui.text.style.TextDecoration None;
- property public final androidx.ui.text.style.TextDecoration Underline;
+ method public androidx.compose.ui.text.style.TextDecoration combine(java.util.List<androidx.compose.ui.text.style.TextDecoration> decorations);
+ method public androidx.compose.ui.text.style.TextDecoration getLineThrough();
+ method public androidx.compose.ui.text.style.TextDecoration getNone();
+ method public androidx.compose.ui.text.style.TextDecoration getUnderline();
+ property public final androidx.compose.ui.text.style.TextDecoration LineThrough;
+ property public final androidx.compose.ui.text.style.TextDecoration None;
+ property public final androidx.compose.ui.text.style.TextDecoration Underline;
}
public enum TextDirection {
- method public static androidx.ui.text.style.TextDirection valueOf(String name) throws java.lang.IllegalArgumentException;
- method public static androidx.ui.text.style.TextDirection[] values();
- enum_constant public static final androidx.ui.text.style.TextDirection Content;
- enum_constant public static final androidx.ui.text.style.TextDirection ContentOrLtr;
- enum_constant public static final androidx.ui.text.style.TextDirection ContentOrRtl;
- enum_constant public static final androidx.ui.text.style.TextDirection Ltr;
- enum_constant public static final androidx.ui.text.style.TextDirection Rtl;
+ method public static androidx.compose.ui.text.style.TextDirection valueOf(String name) throws java.lang.IllegalArgumentException;
+ method public static androidx.compose.ui.text.style.TextDirection[] values();
+ enum_constant public static final androidx.compose.ui.text.style.TextDirection Content;
+ enum_constant public static final androidx.compose.ui.text.style.TextDirection ContentOrLtr;
+ enum_constant public static final androidx.compose.ui.text.style.TextDirection ContentOrRtl;
+ enum_constant public static final androidx.compose.ui.text.style.TextDirection Ltr;
+ enum_constant public static final androidx.compose.ui.text.style.TextDirection Rtl;
}
@androidx.compose.Immutable public final class TextGeometricTransform {
@@ -1020,42 +1020,42 @@
ctor public TextGeometricTransform();
method public float component1();
method public float component2();
- method @androidx.compose.Immutable public androidx.ui.text.style.TextGeometricTransform copy(float scaleX, float skewX);
+ method @androidx.compose.Immutable public androidx.compose.ui.text.style.TextGeometricTransform copy(float scaleX, float skewX);
method public float getScaleX();
method public float getSkewX();
- field public static final androidx.ui.text.style.TextGeometricTransform.Companion Companion;
+ field public static final androidx.compose.ui.text.style.TextGeometricTransform.Companion Companion;
}
public static final class TextGeometricTransform.Companion {
}
public final class TextGeometricTransformKt {
- method public static androidx.ui.text.style.TextGeometricTransform lerp(androidx.ui.text.style.TextGeometricTransform start, androidx.ui.text.style.TextGeometricTransform stop, float fraction);
+ method public static androidx.compose.ui.text.style.TextGeometricTransform lerp(androidx.compose.ui.text.style.TextGeometricTransform start, androidx.compose.ui.text.style.TextGeometricTransform stop, float fraction);
}
@androidx.compose.Immutable public final class TextIndent {
method public long component1();
method public long component2();
- method @androidx.compose.Immutable public androidx.ui.text.style.TextIndent copy-gL_aCS0(long firstLine, long restLine);
+ method @androidx.compose.Immutable public androidx.compose.ui.text.style.TextIndent copy-gL_aCS0(long firstLine, long restLine);
method public long getFirstLine();
method public long getRestLine();
- field public static final androidx.ui.text.style.TextIndent.Companion Companion;
+ field public static final androidx.compose.ui.text.style.TextIndent.Companion Companion;
}
public static final class TextIndent.Companion {
- method public androidx.ui.text.style.TextIndent getNone();
- property public final androidx.ui.text.style.TextIndent None;
+ method public androidx.compose.ui.text.style.TextIndent getNone();
+ property public final androidx.compose.ui.text.style.TextIndent None;
}
public final class TextIndentKt {
- method public static androidx.ui.text.style.TextIndent lerp(androidx.ui.text.style.TextIndent start, androidx.ui.text.style.TextIndent stop, float fraction);
+ 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);
}
public enum TextOverflow {
- method public static androidx.ui.text.style.TextOverflow valueOf(String name) throws java.lang.IllegalArgumentException;
- method public static androidx.ui.text.style.TextOverflow[] values();
- enum_constant public static final androidx.ui.text.style.TextOverflow Clip;
- enum_constant public static final androidx.ui.text.style.TextOverflow Ellipsis;
+ method public static androidx.compose.ui.text.style.TextOverflow valueOf(String name) throws java.lang.IllegalArgumentException;
+ method public static androidx.compose.ui.text.style.TextOverflow[] values();
+ enum_constant public static final androidx.compose.ui.text.style.TextOverflow Clip;
+ enum_constant public static final androidx.compose.ui.text.style.TextOverflow Ellipsis;
}
}
diff --git a/ui/ui-text-core/api/restricted_0.1.0-dev16.txt b/ui/ui-text-core/api/restricted_0.1.0-dev16.txt
index b5c1f07..f75dd52 100644
--- a/ui/ui-text-core/api/restricted_0.1.0-dev16.txt
+++ b/ui/ui-text-core/api/restricted_0.1.0-dev16.txt
@@ -1,321 +1,38 @@
// Signature format: 3.0
-package androidx.ui.input {
-
- public final class BackspaceKeyEditOp implements androidx.ui.input.EditOperation {
- ctor public BackspaceKeyEditOp();
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- public final class CommitTextEditOp implements androidx.ui.input.EditOperation {
- ctor public CommitTextEditOp(String text, int newCursorPosition);
- method public String component1();
- method public int component2();
- method public androidx.ui.input.CommitTextEditOp copy(String text, int newCursorPosition);
- method public int getNewCursorPosition();
- method public String getText();
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- public final class DeleteAllEditOp implements androidx.ui.input.EditOperation {
- ctor public DeleteAllEditOp();
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- public final class DeleteSurroundingTextEditOp implements androidx.ui.input.EditOperation {
- ctor public DeleteSurroundingTextEditOp(int beforeLength, int afterLength);
- method public int component1();
- method public int component2();
- method public androidx.ui.input.DeleteSurroundingTextEditOp copy(int beforeLength, int afterLength);
- method public int getAfterLength();
- method public int getBeforeLength();
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- public final class DeleteSurroundingTextInCodePointsEditOp implements androidx.ui.input.EditOperation {
- ctor public DeleteSurroundingTextInCodePointsEditOp(int beforeLength, int afterLength);
- method public int component1();
- method public int component2();
- method public androidx.ui.input.DeleteSurroundingTextInCodePointsEditOp copy(int beforeLength, int afterLength);
- method public int getAfterLength();
- method public int getBeforeLength();
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- public interface EditOperation {
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- public final class EditingBuffer {
- ctor public EditingBuffer(String initialText, androidx.ui.text.TextRange initialSelection);
- field public static final int NOWHERE = -1; // 0xffffffff
- }
-
- @Deprecated @androidx.compose.Immutable public final class EditorValue {
- ctor @Deprecated public EditorValue(String text, androidx.ui.text.TextRange selection, androidx.ui.text.TextRange? composition);
- ctor @Deprecated public EditorValue();
- method @Deprecated public String component1();
- method @Deprecated public androidx.ui.text.TextRange component2();
- method @Deprecated public androidx.ui.text.TextRange? component3();
- method @Deprecated @androidx.compose.Immutable public androidx.ui.input.EditorValue copy(String text, androidx.ui.text.TextRange selection, androidx.ui.text.TextRange? composition);
- method @Deprecated public androidx.ui.text.TextRange? getComposition();
- method @Deprecated public String getSelectedText();
- method @Deprecated public androidx.ui.text.TextRange getSelection();
- method @Deprecated public String getText();
- method @Deprecated public String getTextAfterSelection(int maxChars);
- method @Deprecated public String getTextBeforeSelection(int maxChars);
- }
-
- public final class FinishComposingTextEditOp implements androidx.ui.input.EditOperation {
- ctor public FinishComposingTextEditOp();
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- public final class GapBufferKt {
- }
-
- public enum ImeAction {
- method public static androidx.ui.input.ImeAction valueOf(String name) throws java.lang.IllegalArgumentException;
- method public static androidx.ui.input.ImeAction[] values();
- enum_constant public static final androidx.ui.input.ImeAction Done;
- enum_constant public static final androidx.ui.input.ImeAction Go;
- enum_constant public static final androidx.ui.input.ImeAction Next;
- enum_constant public static final androidx.ui.input.ImeAction NoAction;
- enum_constant public static final androidx.ui.input.ImeAction Previous;
- enum_constant public static final androidx.ui.input.ImeAction Search;
- enum_constant public static final androidx.ui.input.ImeAction Send;
- enum_constant public static final androidx.ui.input.ImeAction Unspecified;
- }
-
- public interface InputEventListener {
- method public void onEditOperations(java.util.List<? extends androidx.ui.input.EditOperation> editOps);
- method public void onImeAction(androidx.ui.input.ImeAction imeAction);
- }
-
- public enum KeyboardType {
- method public static androidx.ui.input.KeyboardType valueOf(String name) throws java.lang.IllegalArgumentException;
- method public static androidx.ui.input.KeyboardType[] values();
- enum_constant public static final androidx.ui.input.KeyboardType Ascii;
- enum_constant public static final androidx.ui.input.KeyboardType Email;
- enum_constant public static final androidx.ui.input.KeyboardType Number;
- enum_constant public static final androidx.ui.input.KeyboardType NumberPassword;
- enum_constant public static final androidx.ui.input.KeyboardType Password;
- enum_constant public static final androidx.ui.input.KeyboardType Phone;
- enum_constant public static final androidx.ui.input.KeyboardType Text;
- enum_constant public static final androidx.ui.input.KeyboardType Uri;
- }
-
- public final class MoveCursorEditOp implements androidx.ui.input.EditOperation {
- ctor public MoveCursorEditOp(int amount);
- method public int component1();
- method public androidx.ui.input.MoveCursorEditOp copy(int amount);
- method public int getAmount();
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- public interface OffsetMap {
- method public int originalToTransformed(int offset);
- method public int transformedToOriginal(int offset);
- field public static final androidx.ui.input.OffsetMap.Companion Companion;
- }
-
- public static final class OffsetMap.Companion {
- method public androidx.ui.input.OffsetMap getIdentityOffsetMap();
- property public final androidx.ui.input.OffsetMap identityOffsetMap;
- }
-
- public final class PasswordVisualTransformation implements androidx.ui.input.VisualTransformation {
- ctor public PasswordVisualTransformation(char mask);
- ctor public PasswordVisualTransformation();
- method public char component1();
- method public androidx.ui.input.PasswordVisualTransformation copy(char mask);
- method public androidx.ui.input.TransformedText filter(androidx.ui.text.AnnotatedString text);
- method public char getMask();
- }
-
- public interface PlatformTextInputService {
- method public void hideSoftwareKeyboard();
- method public void notifyFocusedRect(androidx.ui.geometry.Rect rect);
- method public void onStateUpdated(androidx.ui.input.TextFieldValue value);
- method public void showSoftwareKeyboard();
- method public void startInput(androidx.ui.input.TextFieldValue value, androidx.ui.input.KeyboardType keyboardType, androidx.ui.input.ImeAction imeAction, kotlin.jvm.functions.Function1<? super java.util.List<? extends androidx.ui.input.EditOperation>,kotlin.Unit> onEditCommand, kotlin.jvm.functions.Function1<? super androidx.ui.input.ImeAction,kotlin.Unit> onImeActionPerformed);
- method public void stopInput();
- }
-
- public final class SetComposingRegionEditOp implements androidx.ui.input.EditOperation {
- ctor public SetComposingRegionEditOp(int start, int end);
- method public int component1();
- method public int component2();
- method public androidx.ui.input.SetComposingRegionEditOp copy(int start, int end);
- method public int getEnd();
- method public int getStart();
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- public final class SetComposingTextEditOp implements androidx.ui.input.EditOperation {
- ctor public SetComposingTextEditOp(String text, int newCursorPosition);
- method public String component1();
- method public int component2();
- method public androidx.ui.input.SetComposingTextEditOp copy(String text, int newCursorPosition);
- method public int getNewCursorPosition();
- method public String getText();
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- public final class SetSelectionEditOp implements androidx.ui.input.EditOperation {
- ctor public SetSelectionEditOp(int start, int end);
- method public int component1();
- method public int component2();
- method public androidx.ui.input.SetSelectionEditOp copy(int start, int end);
- method public int getEnd();
- method public int getStart();
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- @androidx.compose.Immutable public final class TextFieldValue {
- ctor public TextFieldValue(String text, androidx.ui.text.TextRange selection, androidx.ui.text.TextRange? composition);
- ctor public TextFieldValue();
- method public String component1();
- method public androidx.ui.text.TextRange component2();
- method public androidx.ui.text.TextRange? component3();
- method @androidx.compose.Immutable public androidx.ui.input.TextFieldValue copy(String text, androidx.ui.text.TextRange selection, androidx.ui.text.TextRange? composition);
- method public androidx.ui.text.TextRange? getComposition();
- method public androidx.ui.text.TextRange getSelection();
- method public String getText();
- field public static final androidx.ui.input.TextFieldValue.Companion Companion;
- }
-
- public static final class TextFieldValue.Companion {
- method public androidx.compose.runtime.savedinstancestate.Saver<androidx.ui.input.TextFieldValue,java.lang.Object> getSaver();
- property public final androidx.compose.runtime.savedinstancestate.Saver<androidx.ui.input.TextFieldValue,java.lang.Object> Saver;
- }
-
- public final class TextFieldValueKt {
- method public static String getSelectedText(androidx.ui.input.TextFieldValue);
- method public static String getTextAfterSelection(androidx.ui.input.TextFieldValue, int maxChars);
- method public static String getTextBeforeSelection(androidx.ui.input.TextFieldValue, int maxChars);
- }
-
- public class TextInputService {
- ctor public TextInputService(androidx.ui.input.PlatformTextInputService platformTextInputService);
- method public void hideSoftwareKeyboard(int token);
- method public void notifyFocusedRect(int token, androidx.ui.geometry.Rect rect);
- method public void onStateUpdated(int token, androidx.ui.input.TextFieldValue value);
- method public void showSoftwareKeyboard(int token);
- method public int startInput(androidx.ui.input.TextFieldValue value, androidx.ui.input.KeyboardType keyboardType, androidx.ui.input.ImeAction imeAction, kotlin.jvm.functions.Function1<? super java.util.List<? extends androidx.ui.input.EditOperation>,kotlin.Unit> onEditCommand, kotlin.jvm.functions.Function1<? super androidx.ui.input.ImeAction,kotlin.Unit> onImeActionPerformed);
- method public void stopInput(int token);
- }
-
- public final class TextInputServiceKt {
- method @Deprecated public static kotlin.jvm.functions.Function1<androidx.ui.input.PlatformTextInputService,androidx.ui.input.TextInputService> getTextInputServiceFactory();
- method @Deprecated public static void setTextInputServiceFactory(kotlin.jvm.functions.Function1<? super androidx.ui.input.PlatformTextInputService,? extends androidx.ui.input.TextInputService> p);
- field public static final int INVALID_SESSION = -1; // 0xffffffff
- field public static final int NO_SESSION = 0; // 0x0
- }
-
- public final class TransformedText {
- ctor public TransformedText(androidx.ui.text.AnnotatedString transformedText, androidx.ui.input.OffsetMap offsetMap);
- method public androidx.ui.text.AnnotatedString component1();
- method public androidx.ui.input.OffsetMap component2();
- method public androidx.ui.input.TransformedText copy(androidx.ui.text.AnnotatedString transformedText, androidx.ui.input.OffsetMap offsetMap);
- method public androidx.ui.input.OffsetMap getOffsetMap();
- method public androidx.ui.text.AnnotatedString getTransformedText();
- }
-
- @androidx.compose.Immutable public interface VisualTransformation {
- method public androidx.ui.input.TransformedText filter(androidx.ui.text.AnnotatedString text);
- field public static final androidx.ui.input.VisualTransformation.Companion Companion;
- }
-
- public static final class VisualTransformation.Companion {
- method public androidx.ui.input.VisualTransformation getNone();
- property public final androidx.ui.input.VisualTransformation None;
- }
-
-}
-
-package androidx.ui.intl {
-
- public final class AndroidPlatformLocaleKt {
- }
-
- @androidx.compose.Immutable public final class Locale {
- ctor public Locale(String languageTag);
- method public String getLanguage();
- method public String getRegion();
- method public String getScript();
- method public String toLanguageTag();
- property public final String language;
- property public final String region;
- property public final String script;
- field public static final androidx.ui.intl.Locale.Companion Companion;
- }
-
- public static final class Locale.Companion {
- method public androidx.ui.intl.Locale getCurrent();
- property public final androidx.ui.intl.Locale current;
- }
-
- @androidx.compose.Immutable public final class LocaleList implements java.util.Collection<androidx.ui.intl.Locale> kotlin.jvm.internal.markers.KMappedMarker {
- ctor public LocaleList(java.util.List<androidx.ui.intl.Locale> localeList);
- ctor public LocaleList(String languageTags);
- ctor public LocaleList(androidx.ui.intl.Locale... locales);
- method public java.util.List<androidx.ui.intl.Locale> component1();
- method public operator boolean contains(androidx.ui.intl.Locale element);
- method public boolean containsAll(java.util.Collection<?> elements);
- method @androidx.compose.Immutable public androidx.ui.intl.LocaleList copy(java.util.List<androidx.ui.intl.Locale> localeList);
- method public operator androidx.ui.intl.Locale get(int i);
- method public java.util.List<androidx.ui.intl.Locale> getLocaleList();
- method public int getSize();
- method public boolean isEmpty();
- method public java.util.Iterator<androidx.ui.intl.Locale> iterator();
- property public int size;
- field public static final androidx.ui.intl.LocaleList.Companion Companion;
- }
-
- public static final class LocaleList.Companion {
- method public androidx.ui.intl.LocaleList getCurrent();
- property public final androidx.ui.intl.LocaleList current;
- }
-
- public final class PlatformLocaleKt {
- }
-
-}
-
-package androidx.ui.text {
+package androidx.compose.ui.text {
@androidx.compose.Immutable public final class AnnotatedString {
- ctor public AnnotatedString(String text, java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.SpanStyle>> spanStyles, java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.ParagraphStyle>> paragraphStyles);
+ ctor public AnnotatedString(String text, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> spanStyles, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.ParagraphStyle>> paragraphStyles);
method public String component1();
- method public java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.SpanStyle>> component2();
- method public java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.ParagraphStyle>> component3();
- method @androidx.compose.Immutable public androidx.ui.text.AnnotatedString copy(String text, java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.SpanStyle>> spanStyles, java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.ParagraphStyle>> paragraphStyles, java.util.List<androidx.ui.text.AnnotatedString.Range<java.lang.String>> annotations);
- method public java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.ParagraphStyle>> getParagraphStyles();
- method public java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.SpanStyle>> getSpanStyles();
- method public java.util.List<androidx.ui.text.AnnotatedString.Range<java.lang.String>> getStringAnnotations(String tag, int start, int end);
- method public java.util.List<androidx.ui.text.AnnotatedString.Range<java.lang.String>> getStringAnnotations(int start, int end);
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> component2();
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.ParagraphStyle>> component3();
+ method @androidx.compose.Immutable public androidx.compose.ui.text.AnnotatedString copy(String text, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> spanStyles, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.ParagraphStyle>> paragraphStyles, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<java.lang.String>> annotations);
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.ParagraphStyle>> getParagraphStyles();
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> getSpanStyles();
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<java.lang.String>> getStringAnnotations(String tag, int start, int end);
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<java.lang.String>> getStringAnnotations(int start, int end);
method public String getText();
- method @androidx.compose.Stable public operator androidx.ui.text.AnnotatedString plus(androidx.ui.text.AnnotatedString other);
+ method @androidx.compose.Stable public operator androidx.compose.ui.text.AnnotatedString plus(androidx.compose.ui.text.AnnotatedString other);
}
public static final class AnnotatedString.Builder {
ctor public AnnotatedString.Builder(int capacity);
ctor public AnnotatedString.Builder();
ctor public AnnotatedString.Builder(String text);
- ctor public AnnotatedString.Builder(androidx.ui.text.AnnotatedString text);
+ ctor public AnnotatedString.Builder(androidx.compose.ui.text.AnnotatedString text);
method public void addStringAnnotation(String scope, String annotation, int start, int end);
- method public void addStyle(androidx.ui.text.SpanStyle style, int start, int end);
- method public void addStyle(androidx.ui.text.ParagraphStyle style, int start, int end);
+ method public void addStyle(androidx.compose.ui.text.SpanStyle style, int start, int end);
+ method public void addStyle(androidx.compose.ui.text.ParagraphStyle style, int start, int end);
method public void append(String text);
method public void append(char p);
- method public void append(androidx.ui.text.AnnotatedString text);
+ method public void append(androidx.compose.ui.text.AnnotatedString text);
method public int getLength();
method public void pop();
method public void pop(int index);
method public int pushStringAnnotation(String tag, String annotation);
- method public int pushStyle(androidx.ui.text.SpanStyle style);
- method public int pushStyle(androidx.ui.text.ParagraphStyle style);
- method public androidx.ui.text.AnnotatedString toAnnotatedString();
+ method public int pushStyle(androidx.compose.ui.text.SpanStyle style);
+ method public int pushStyle(androidx.compose.ui.text.ParagraphStyle style);
+ method public androidx.compose.ui.text.AnnotatedString toAnnotatedString();
property public final int length;
}
@@ -326,7 +43,7 @@
method public int component2();
method public int component3();
method public String component4();
- method public androidx.ui.text.AnnotatedString.Range<T> copy(T! item, int start, int end, String tag);
+ method public androidx.compose.ui.text.AnnotatedString.Range<T> copy(T! item, int start, int end, String tag);
method public int getEnd();
method public T! getItem();
method public int getStart();
@@ -334,18 +51,18 @@
}
public final class AnnotatedStringKt {
- method public static androidx.ui.text.AnnotatedString AnnotatedString(String text, androidx.ui.text.SpanStyle spanStyle, androidx.ui.text.ParagraphStyle? paragraphStyle = null);
- method public static androidx.ui.text.AnnotatedString AnnotatedString(String text, androidx.ui.text.ParagraphStyle paragraphStyle);
- method @Deprecated public static inline androidx.ui.text.AnnotatedString AnnotatedString(kotlin.jvm.functions.Function1<? super androidx.ui.text.AnnotatedString.Builder,kotlin.Unit> builder);
- method public static inline androidx.ui.text.AnnotatedString annotatedString(kotlin.jvm.functions.Function1<? super androidx.ui.text.AnnotatedString.Builder,kotlin.Unit> builder);
- method public static androidx.ui.text.AnnotatedString capitalize(androidx.ui.text.AnnotatedString, androidx.ui.intl.LocaleList localeList = LocaleList.current);
- method public static androidx.ui.text.AnnotatedString decapitalize(androidx.ui.text.AnnotatedString, androidx.ui.intl.LocaleList localeList = LocaleList.current);
- method public static int getLength(androidx.ui.text.AnnotatedString);
- method public static androidx.ui.text.AnnotatedString subSequence(androidx.ui.text.AnnotatedString, int start, int end);
- method public static androidx.ui.text.AnnotatedString toLowerCase(androidx.ui.text.AnnotatedString, androidx.ui.intl.LocaleList localeList = LocaleList.current);
- method public static androidx.ui.text.AnnotatedString toUpperCase(androidx.ui.text.AnnotatedString, androidx.ui.intl.LocaleList localeList = LocaleList.current);
- method public static inline <R> R withStyle(androidx.ui.text.AnnotatedString.Builder, androidx.ui.text.SpanStyle style, kotlin.jvm.functions.Function1<? super androidx.ui.text.AnnotatedString.Builder,? extends R> block);
- method public static inline <R> R withStyle(androidx.ui.text.AnnotatedString.Builder, androidx.ui.text.ParagraphStyle style, kotlin.jvm.functions.Function1<? super androidx.ui.text.AnnotatedString.Builder,? extends R> block);
+ method public static androidx.compose.ui.text.AnnotatedString AnnotatedString(String text, androidx.compose.ui.text.SpanStyle spanStyle, androidx.compose.ui.text.ParagraphStyle? paragraphStyle = null);
+ method public static androidx.compose.ui.text.AnnotatedString AnnotatedString(String text, androidx.compose.ui.text.ParagraphStyle paragraphStyle);
+ method @Deprecated public static inline androidx.compose.ui.text.AnnotatedString AnnotatedString(kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.AnnotatedString.Builder,kotlin.Unit> builder);
+ method public static inline androidx.compose.ui.text.AnnotatedString annotatedString(kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.AnnotatedString.Builder,kotlin.Unit> builder);
+ method public static androidx.compose.ui.text.AnnotatedString capitalize(androidx.compose.ui.text.AnnotatedString, androidx.compose.ui.text.intl.LocaleList localeList = LocaleList.current);
+ method public static androidx.compose.ui.text.AnnotatedString decapitalize(androidx.compose.ui.text.AnnotatedString, androidx.compose.ui.text.intl.LocaleList localeList = LocaleList.current);
+ method public static int getLength(androidx.compose.ui.text.AnnotatedString);
+ method public static androidx.compose.ui.text.AnnotatedString subSequence(androidx.compose.ui.text.AnnotatedString, int start, int end);
+ method public static androidx.compose.ui.text.AnnotatedString toLowerCase(androidx.compose.ui.text.AnnotatedString, androidx.compose.ui.text.intl.LocaleList localeList = LocaleList.current);
+ method public static androidx.compose.ui.text.AnnotatedString toUpperCase(androidx.compose.ui.text.AnnotatedString, androidx.compose.ui.text.intl.LocaleList localeList = LocaleList.current);
+ method public static inline <R> R withStyle(androidx.compose.ui.text.AnnotatedString.Builder, androidx.compose.ui.text.SpanStyle style, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.AnnotatedString.Builder,? extends R> block);
+ method public static inline <R> R withStyle(androidx.compose.ui.text.AnnotatedString.Builder, androidx.compose.ui.text.ParagraphStyle style, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.AnnotatedString.Builder,? extends R> block);
}
@kotlin.RequiresOptIn(level=RequiresOptIn.Level.ERROR, message="This is internal API that may change frequently and without warning.") @kotlin.annotation.Target(allowedTargets={AnnotationTarget.CLASS, AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY}) public @interface InternalTextApi {
@@ -355,16 +72,16 @@
}
public final class MultiParagraph {
- ctor public MultiParagraph(androidx.ui.text.MultiParagraphIntrinsics intrinsics, int maxLines, boolean ellipsis, androidx.ui.text.ParagraphConstraints constraints);
- ctor public MultiParagraph(androidx.ui.text.AnnotatedString annotatedString, androidx.ui.text.TextStyle style, java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>> placeholders, int maxLines, boolean ellipsis, androidx.ui.text.ParagraphConstraints constraints, androidx.ui.unit.Density density, androidx.ui.text.font.Font.ResourceLoader resourceLoader);
- method public androidx.ui.text.style.ResolvedTextDirection getBidiRunDirection(int offset);
+ ctor public MultiParagraph(androidx.compose.ui.text.MultiParagraphIntrinsics intrinsics, int maxLines, boolean ellipsis, androidx.compose.ui.text.ParagraphConstraints constraints);
+ ctor public MultiParagraph(androidx.compose.ui.text.AnnotatedString annotatedString, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, int maxLines, boolean ellipsis, androidx.compose.ui.text.ParagraphConstraints constraints, androidx.ui.unit.Density density, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getBidiRunDirection(int offset);
method public androidx.ui.geometry.Rect getBoundingBox(int offset);
method public androidx.ui.geometry.Rect getCursorRect(int offset);
method public boolean getDidExceedMaxLines();
method public float getFirstBaseline();
method public float getHeight();
method public float getHorizontalPosition(int offset, boolean usePrimaryDirection);
- method public androidx.ui.text.MultiParagraphIntrinsics getIntrinsics();
+ method public androidx.compose.ui.text.MultiParagraphIntrinsics getIntrinsics();
method public float getLastBaseline();
method public float getLineBottom(int lineIndex);
method public int getLineCount();
@@ -382,11 +99,11 @@
method public int getMaxLines();
method public float getMinIntrinsicWidth();
method public int getOffsetForPosition(androidx.ui.geometry.Offset position);
- method public androidx.ui.text.style.ResolvedTextDirection getParagraphDirection(int offset);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getParagraphDirection(int offset);
method public androidx.ui.graphics.Path getPathForRange(int start, int end);
method public java.util.List<androidx.ui.geometry.Rect> getPlaceholderRects();
method public float getWidth();
- method public androidx.ui.text.TextRange getWordBoundary(int offset);
+ method public androidx.compose.ui.text.TextRange getWordBoundary(int offset);
method public void paint(androidx.ui.graphics.Canvas canvas);
property public final boolean didExceedMaxLines;
property public final float firstBaseline;
@@ -399,12 +116,12 @@
property public final float width;
}
- public final class MultiParagraphIntrinsics implements androidx.ui.text.ParagraphIntrinsics {
- ctor public MultiParagraphIntrinsics(androidx.ui.text.AnnotatedString annotatedString, androidx.ui.text.TextStyle style, java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>> placeholders, androidx.ui.unit.Density density, androidx.ui.text.font.Font.ResourceLoader resourceLoader);
- method public androidx.ui.text.AnnotatedString getAnnotatedString();
+ public final class MultiParagraphIntrinsics implements androidx.compose.ui.text.ParagraphIntrinsics {
+ ctor public MultiParagraphIntrinsics(androidx.compose.ui.text.AnnotatedString annotatedString, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, androidx.ui.unit.Density density, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader);
+ method public androidx.compose.ui.text.AnnotatedString getAnnotatedString();
method public float getMaxIntrinsicWidth();
method public float getMinIntrinsicWidth();
- method public java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>> getPlaceholders();
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> getPlaceholders();
property public float maxIntrinsicWidth;
property public float minIntrinsicWidth;
}
@@ -416,7 +133,7 @@
}
public interface Paragraph {
- method public androidx.ui.text.style.ResolvedTextDirection getBidiRunDirection(int offset);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getBidiRunDirection(int offset);
method public androidx.ui.geometry.Rect getBoundingBox(int offset);
method public androidx.ui.geometry.Rect getCursorRect(int offset);
method public boolean getDidExceedMaxLines();
@@ -439,11 +156,11 @@
method public float getMaxIntrinsicWidth();
method public float getMinIntrinsicWidth();
method public int getOffsetForPosition(androidx.ui.geometry.Offset position);
- method public androidx.ui.text.style.ResolvedTextDirection getParagraphDirection(int offset);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getParagraphDirection(int offset);
method public androidx.ui.graphics.Path getPathForRange(int start, int end);
method public java.util.List<androidx.ui.geometry.Rect> getPlaceholderRects();
method public float getWidth();
- method public androidx.ui.text.TextRange getWordBoundary(int offset);
+ method public androidx.compose.ui.text.TextRange getWordBoundary(int offset);
method public void paint(androidx.ui.graphics.Canvas canvas);
property public abstract boolean didExceedMaxLines;
property public abstract float firstBaseline;
@@ -459,7 +176,7 @@
public final class ParagraphConstraints {
ctor public ParagraphConstraints(float width);
method public float component1();
- method public androidx.ui.text.ParagraphConstraints copy(float width);
+ method public androidx.compose.ui.text.ParagraphConstraints copy(float width);
method public float getWidth();
}
@@ -471,56 +188,56 @@
}
public final class ParagraphIntrinsicsKt {
- method public static androidx.ui.text.ParagraphIntrinsics ParagraphIntrinsics(String text, androidx.ui.text.TextStyle style, java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.SpanStyle>> spanStyles = listOf(), java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>> placeholders = listOf(), androidx.ui.unit.Density density, androidx.ui.text.font.Font.ResourceLoader resourceLoader);
+ method public static androidx.compose.ui.text.ParagraphIntrinsics ParagraphIntrinsics(String text, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> spanStyles = listOf(), java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders = listOf(), androidx.ui.unit.Density density, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader);
}
public final class ParagraphKt {
- method public static androidx.ui.text.Paragraph Paragraph(String text, androidx.ui.text.TextStyle style, java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.SpanStyle>> spanStyles = listOf(), java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>> placeholders = listOf(), int maxLines = 2147483647, boolean ellipsis = false, androidx.ui.text.ParagraphConstraints constraints, androidx.ui.unit.Density density, androidx.ui.text.font.Font.ResourceLoader resourceLoader);
- method public static androidx.ui.text.Paragraph Paragraph(androidx.ui.text.ParagraphIntrinsics paragraphIntrinsics, int maxLines = 2147483647, boolean ellipsis = false, androidx.ui.text.ParagraphConstraints constraints);
+ method public static androidx.compose.ui.text.Paragraph Paragraph(String text, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> spanStyles = listOf(), java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders = listOf(), int maxLines = 2147483647, boolean ellipsis = false, androidx.compose.ui.text.ParagraphConstraints constraints, androidx.ui.unit.Density density, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader);
+ method public static androidx.compose.ui.text.Paragraph Paragraph(androidx.compose.ui.text.ParagraphIntrinsics paragraphIntrinsics, int maxLines = 2147483647, boolean ellipsis = false, androidx.compose.ui.text.ParagraphConstraints constraints);
}
@androidx.compose.Immutable public final class ParagraphStyle {
- method public androidx.ui.text.style.TextAlign? component1();
- method public androidx.ui.text.style.TextDirection? component2();
+ method public androidx.compose.ui.text.style.TextAlign? component1();
+ method public androidx.compose.ui.text.style.TextDirection? component2();
method public long component3();
- method public androidx.ui.text.style.TextIndent? component4();
- method @androidx.compose.Immutable public androidx.ui.text.ParagraphStyle copy-JVmhFNw(androidx.ui.text.style.TextAlign? textAlign, androidx.ui.text.style.TextDirection? textDirection, long lineHeight, androidx.ui.text.style.TextIndent? textIndent);
+ method public androidx.compose.ui.text.style.TextIndent? component4();
+ method @androidx.compose.Immutable public androidx.compose.ui.text.ParagraphStyle copy-yfYFPjM(androidx.compose.ui.text.style.TextAlign? textAlign, androidx.compose.ui.text.style.TextDirection? textDirection, long lineHeight, androidx.compose.ui.text.style.TextIndent? textIndent);
method public long getLineHeight();
- method public androidx.ui.text.style.TextAlign? getTextAlign();
- method public androidx.ui.text.style.TextDirection? getTextDirection();
- method public androidx.ui.text.style.TextIndent? getTextIndent();
- method @androidx.compose.Stable public androidx.ui.text.ParagraphStyle merge(androidx.ui.text.ParagraphStyle? other = null);
- method @androidx.compose.Stable public operator androidx.ui.text.ParagraphStyle plus(androidx.ui.text.ParagraphStyle other);
+ 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.Stable public androidx.compose.ui.text.ParagraphStyle merge(androidx.compose.ui.text.ParagraphStyle? other = null);
+ method @androidx.compose.Stable public operator androidx.compose.ui.text.ParagraphStyle plus(androidx.compose.ui.text.ParagraphStyle other);
}
public final class ParagraphStyleKt {
- method @androidx.compose.Stable public static androidx.ui.text.ParagraphStyle lerp(androidx.ui.text.ParagraphStyle start, androidx.ui.text.ParagraphStyle stop, float fraction);
+ method @androidx.compose.Stable public static androidx.compose.ui.text.ParagraphStyle lerp(androidx.compose.ui.text.ParagraphStyle start, androidx.compose.ui.text.ParagraphStyle stop, float fraction);
}
@androidx.compose.Immutable public final class Placeholder {
method public long component1();
method public long component2();
- method public androidx.ui.text.PlaceholderVerticalAlign component3();
- method @androidx.compose.Immutable public androidx.ui.text.Placeholder copy-eLqjHCw(long width, long height, androidx.ui.text.PlaceholderVerticalAlign placeholderVerticalAlign);
+ method public androidx.compose.ui.text.PlaceholderVerticalAlign component3();
+ method @androidx.compose.Immutable public androidx.compose.ui.text.Placeholder copy-LxtbTAo(long width, long height, androidx.compose.ui.text.PlaceholderVerticalAlign placeholderVerticalAlign);
method public long getHeight();
- method public androidx.ui.text.PlaceholderVerticalAlign getPlaceholderVerticalAlign();
+ method public androidx.compose.ui.text.PlaceholderVerticalAlign getPlaceholderVerticalAlign();
method public long getWidth();
}
public enum PlaceholderVerticalAlign {
- method public static androidx.ui.text.PlaceholderVerticalAlign valueOf(String name) throws java.lang.IllegalArgumentException;
- method public static androidx.ui.text.PlaceholderVerticalAlign[] values();
- enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign AboveBaseline;
- enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign Bottom;
- enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign Center;
- enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign TextBottom;
- enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign TextCenter;
- enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign TextTop;
- enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign Top;
+ method public static androidx.compose.ui.text.PlaceholderVerticalAlign valueOf(String name) throws java.lang.IllegalArgumentException;
+ method public static androidx.compose.ui.text.PlaceholderVerticalAlign[] values();
+ enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign AboveBaseline;
+ enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign Bottom;
+ enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign Center;
+ enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign TextBottom;
+ enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign TextCenter;
+ enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign TextTop;
+ enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign Top;
}
public final class SoftwareKeyboardController {
- ctor public SoftwareKeyboardController(androidx.ui.input.TextInputService textInputService, int token);
+ ctor public SoftwareKeyboardController(androidx.compose.ui.text.input.TextInputService textInputService, int token);
method public void hideSoftwareKeyboard();
method public void notifyFocusedRect(androidx.ui.geometry.Rect rect);
method public void showSoftwareKeyboard();
@@ -528,86 +245,86 @@
@androidx.compose.Immutable public final class SpanStyle {
method public long component1();
- method public androidx.ui.text.style.TextGeometricTransform? component10();
- method public androidx.ui.intl.LocaleList? component11();
+ method public androidx.compose.ui.text.style.TextGeometricTransform? component10();
+ method public androidx.compose.ui.text.intl.LocaleList? component11();
method public long component12();
- method public androidx.ui.text.style.TextDecoration? component13();
+ method public androidx.compose.ui.text.style.TextDecoration? component13();
method public androidx.ui.graphics.Shadow? component14();
method public long component2();
- method public androidx.ui.text.font.FontWeight? component3();
- method public androidx.ui.text.font.FontStyle? component4();
- method public androidx.ui.text.font.FontSynthesis? component5();
- method public androidx.ui.text.font.FontFamily? component6();
+ method public androidx.compose.ui.text.font.FontWeight? component3();
+ method public androidx.compose.ui.text.font.FontStyle? component4();
+ method public androidx.compose.ui.text.font.FontSynthesis? component5();
+ method public androidx.compose.ui.text.font.FontFamily? component6();
method public String? component7();
method public long component8();
- method public androidx.ui.text.style.BaselineShift? component9();
- method @androidx.compose.Immutable public androidx.ui.text.SpanStyle copy-HjQ0eR4(long color, long fontSize, androidx.ui.text.font.FontWeight? fontWeight, androidx.ui.text.font.FontStyle? fontStyle, androidx.ui.text.font.FontSynthesis? fontSynthesis, androidx.ui.text.font.FontFamily? fontFamily, String? fontFeatureSettings, long letterSpacing, androidx.ui.text.style.BaselineShift? baselineShift, androidx.ui.text.style.TextGeometricTransform? textGeometricTransform, androidx.ui.intl.LocaleList? localeList, long background, androidx.ui.text.style.TextDecoration? textDecoration, androidx.ui.graphics.Shadow? shadow);
+ method public androidx.compose.ui.text.style.BaselineShift? component9();
+ method @androidx.compose.Immutable public androidx.compose.ui.text.SpanStyle copy-3JaCuMk(long color, long fontSize, androidx.compose.ui.text.font.FontWeight? fontWeight, androidx.compose.ui.text.font.FontStyle? fontStyle, androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, androidx.compose.ui.text.font.FontFamily? fontFamily, String? fontFeatureSettings, long letterSpacing, androidx.compose.ui.text.style.BaselineShift? baselineShift, androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, androidx.compose.ui.text.intl.LocaleList? localeList, long background, androidx.compose.ui.text.style.TextDecoration? textDecoration, androidx.ui.graphics.Shadow? shadow);
method public long getBackground();
- method public androidx.ui.text.style.BaselineShift? getBaselineShift();
+ method public androidx.compose.ui.text.style.BaselineShift? getBaselineShift();
method public long getColor();
- method public androidx.ui.text.font.FontFamily? getFontFamily();
+ method public androidx.compose.ui.text.font.FontFamily? getFontFamily();
method public String? getFontFeatureSettings();
method public long getFontSize();
- method public androidx.ui.text.font.FontStyle? getFontStyle();
- method public androidx.ui.text.font.FontSynthesis? getFontSynthesis();
- method public androidx.ui.text.font.FontWeight? getFontWeight();
+ method public androidx.compose.ui.text.font.FontStyle? getFontStyle();
+ method public androidx.compose.ui.text.font.FontSynthesis? getFontSynthesis();
+ method public androidx.compose.ui.text.font.FontWeight? getFontWeight();
method public long getLetterSpacing();
- method public androidx.ui.intl.LocaleList? getLocaleList();
+ method public androidx.compose.ui.text.intl.LocaleList? getLocaleList();
method public androidx.ui.graphics.Shadow? getShadow();
- method public androidx.ui.text.style.TextDecoration? getTextDecoration();
- method public androidx.ui.text.style.TextGeometricTransform? getTextGeometricTransform();
- method @androidx.compose.Stable public androidx.ui.text.SpanStyle merge(androidx.ui.text.SpanStyle? other = null);
- method @androidx.compose.Stable public operator androidx.ui.text.SpanStyle plus(androidx.ui.text.SpanStyle other);
+ method public androidx.compose.ui.text.style.TextDecoration? getTextDecoration();
+ method public androidx.compose.ui.text.style.TextGeometricTransform? getTextGeometricTransform();
+ method @androidx.compose.Stable public androidx.compose.ui.text.SpanStyle merge(androidx.compose.ui.text.SpanStyle? other = null);
+ method @androidx.compose.Stable public operator androidx.compose.ui.text.SpanStyle plus(androidx.compose.ui.text.SpanStyle other);
}
public final class SpanStyleKt {
- method public static androidx.ui.text.SpanStyle lerp(androidx.ui.text.SpanStyle start, androidx.ui.text.SpanStyle stop, float fraction);
+ method public static androidx.compose.ui.text.SpanStyle lerp(androidx.compose.ui.text.SpanStyle start, androidx.compose.ui.text.SpanStyle stop, float fraction);
}
public final class StringKt {
- method public static String capitalize(String, androidx.ui.intl.Locale locale);
- method public static String capitalize(String, androidx.ui.intl.LocaleList localeList);
- method public static String decapitalize(String, androidx.ui.intl.Locale locale);
- method public static String decapitalize(String, androidx.ui.intl.LocaleList localeList);
- method public static String toLowerCase(String, androidx.ui.intl.Locale locale);
- method public static String toLowerCase(String, androidx.ui.intl.LocaleList localeList);
- method public static String toUpperCase(String, androidx.ui.intl.Locale locale);
- method public static String toUpperCase(String, androidx.ui.intl.LocaleList localeList);
+ method public static String capitalize(String, androidx.compose.ui.text.intl.Locale locale);
+ method public static String capitalize(String, androidx.compose.ui.text.intl.LocaleList localeList);
+ method public static String decapitalize(String, androidx.compose.ui.text.intl.Locale locale);
+ method public static String decapitalize(String, androidx.compose.ui.text.intl.LocaleList localeList);
+ method public static String toLowerCase(String, androidx.compose.ui.text.intl.Locale locale);
+ method public static String toLowerCase(String, androidx.compose.ui.text.intl.LocaleList localeList);
+ method public static String toUpperCase(String, androidx.compose.ui.text.intl.Locale locale);
+ method public static String toUpperCase(String, androidx.compose.ui.text.intl.LocaleList localeList);
}
public final class TextLayoutHelperKt {
}
public final class TextLayoutInput {
- ctor public TextLayoutInput(androidx.ui.text.AnnotatedString text, androidx.ui.text.TextStyle style, java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>> placeholders, int maxLines, boolean softWrap, androidx.ui.text.style.TextOverflow overflow, androidx.ui.unit.Density density, androidx.ui.core.LayoutDirection layoutDirection, androidx.ui.text.font.Font.ResourceLoader resourceLoader, androidx.ui.core.Constraints constraints);
- method public androidx.ui.text.AnnotatedString component1();
+ ctor public TextLayoutInput(androidx.compose.ui.text.AnnotatedString text, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, int maxLines, boolean softWrap, androidx.compose.ui.text.style.TextOverflow overflow, androidx.ui.unit.Density density, androidx.ui.core.LayoutDirection layoutDirection, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader, androidx.ui.core.Constraints constraints);
+ method public androidx.compose.ui.text.AnnotatedString component1();
method public androidx.ui.core.Constraints component10();
- method public androidx.ui.text.TextStyle component2();
- method public java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>> component3();
+ method public androidx.compose.ui.text.TextStyle component2();
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> component3();
method public int component4();
method public boolean component5();
- method public androidx.ui.text.style.TextOverflow component6();
+ method public androidx.compose.ui.text.style.TextOverflow component6();
method public androidx.ui.unit.Density component7();
method public androidx.ui.core.LayoutDirection component8();
- method public androidx.ui.text.font.Font.ResourceLoader component9();
- method public androidx.ui.text.TextLayoutInput copy(androidx.ui.text.AnnotatedString text, androidx.ui.text.TextStyle style, java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>> placeholders, int maxLines, boolean softWrap, androidx.ui.text.style.TextOverflow overflow, androidx.ui.unit.Density density, androidx.ui.core.LayoutDirection layoutDirection, androidx.ui.text.font.Font.ResourceLoader resourceLoader, androidx.ui.core.Constraints constraints);
+ method public androidx.compose.ui.text.font.Font.ResourceLoader component9();
+ method public androidx.compose.ui.text.TextLayoutInput copy(androidx.compose.ui.text.AnnotatedString text, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, int maxLines, boolean softWrap, androidx.compose.ui.text.style.TextOverflow overflow, androidx.ui.unit.Density density, androidx.ui.core.LayoutDirection layoutDirection, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader, androidx.ui.core.Constraints constraints);
method public androidx.ui.core.Constraints getConstraints();
method public androidx.ui.unit.Density getDensity();
method public androidx.ui.core.LayoutDirection getLayoutDirection();
method public int getMaxLines();
- method public androidx.ui.text.style.TextOverflow getOverflow();
- method public java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>> getPlaceholders();
- method public androidx.ui.text.font.Font.ResourceLoader getResourceLoader();
+ method public androidx.compose.ui.text.style.TextOverflow getOverflow();
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> getPlaceholders();
+ method public androidx.compose.ui.text.font.Font.ResourceLoader getResourceLoader();
method public boolean getSoftWrap();
- method public androidx.ui.text.TextStyle getStyle();
- method public androidx.ui.text.AnnotatedString getText();
+ method public androidx.compose.ui.text.TextStyle getStyle();
+ method public androidx.compose.ui.text.AnnotatedString getText();
}
public final class TextLayoutResult {
- method public androidx.ui.text.TextLayoutInput component1();
+ method public androidx.compose.ui.text.TextLayoutInput component1();
method public androidx.ui.unit.IntSize component3();
- method public androidx.ui.text.TextLayoutResult copy(androidx.ui.text.TextLayoutInput layoutInput, androidx.ui.text.MultiParagraph multiParagraph, androidx.ui.unit.IntSize size);
- method public androidx.ui.text.style.ResolvedTextDirection getBidiRunDirection(int offset);
+ method public androidx.compose.ui.text.TextLayoutResult copy(androidx.compose.ui.text.TextLayoutInput layoutInput, androidx.compose.ui.text.MultiParagraph multiParagraph, androidx.ui.unit.IntSize size);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getBidiRunDirection(int offset);
method public androidx.ui.geometry.Rect getBoundingBox(int offset);
method public androidx.ui.geometry.Rect getCursorRect(int offset);
method public boolean getDidOverflowHeight();
@@ -616,7 +333,7 @@
method public boolean getHasVisualOverflow();
method public float getHorizontalPosition(int offset, boolean usePrimaryDirection);
method public float getLastBaseline();
- method public androidx.ui.text.TextLayoutInput getLayoutInput();
+ method public androidx.compose.ui.text.TextLayoutInput getLayoutInput();
method public float getLineBottom(int lineIndex);
method public int getLineCount();
method public int getLineEnd(int lineIndex);
@@ -626,11 +343,11 @@
method public int getLineStart(int lineIndex);
method public float getLineTop(int lineIndex);
method public int getOffsetForPosition(androidx.ui.geometry.Offset position);
- method public androidx.ui.text.style.ResolvedTextDirection getParagraphDirection(int offset);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getParagraphDirection(int offset);
method public androidx.ui.graphics.Path getPathForRange(int start, int end);
method public java.util.List<androidx.ui.geometry.Rect> getPlaceholderRects();
method public androidx.ui.unit.IntSize getSize();
- method public androidx.ui.text.TextRange getWordBoundary(int offset);
+ method public androidx.compose.ui.text.TextRange getWordBoundary(int offset);
property public final boolean didOverflowHeight;
property public final boolean didOverflowWidth;
property public final float firstBaseline;
@@ -641,17 +358,17 @@
}
public final class TextPainter {
- method public void paint(androidx.ui.graphics.Canvas canvas, androidx.ui.text.TextLayoutResult textLayoutResult);
- field public static final androidx.ui.text.TextPainter INSTANCE;
+ method public void paint(androidx.ui.graphics.Canvas canvas, androidx.compose.ui.text.TextLayoutResult textLayoutResult);
+ field public static final androidx.compose.ui.text.TextPainter INSTANCE;
}
@androidx.compose.Immutable public final class TextRange {
ctor public TextRange(@IntRange(from=null) int start, @IntRange(from=null) int end);
method public int component1();
method public int component2();
- method public operator boolean contains(androidx.ui.text.TextRange other);
+ method public operator boolean contains(androidx.compose.ui.text.TextRange other);
method public operator boolean contains(int offset);
- method @androidx.compose.Immutable public androidx.ui.text.TextRange copy(int start, int end);
+ method @androidx.compose.Immutable public androidx.compose.ui.text.TextRange copy(int start, int end);
method public boolean getCollapsed();
method public int getEnd();
method public int getLength();
@@ -659,274 +376,557 @@
method public int getMin();
method public boolean getReversed();
method public int getStart();
- method public boolean intersects(androidx.ui.text.TextRange other);
+ method public boolean intersects(androidx.compose.ui.text.TextRange other);
property public final boolean collapsed;
property public final int length;
property public final int max;
property public final int min;
property public final boolean reversed;
- field public static final androidx.ui.text.TextRange.Companion Companion;
+ field public static final androidx.compose.ui.text.TextRange.Companion Companion;
}
public static final class TextRange.Companion {
- method public androidx.ui.text.TextRange getZero();
- property public final androidx.ui.text.TextRange Zero;
+ method public androidx.compose.ui.text.TextRange getZero();
+ property public final androidx.compose.ui.text.TextRange Zero;
}
public final class TextRangeKt {
- method public static androidx.ui.text.TextRange TextRange(int index);
- method public static String substring(CharSequence, androidx.ui.text.TextRange range);
+ method public static androidx.compose.ui.text.TextRange TextRange(int index);
+ method public static String substring(CharSequence, androidx.compose.ui.text.TextRange range);
}
@androidx.compose.Immutable public final class TextStyle {
method public long component1();
- method public androidx.ui.text.style.TextGeometricTransform? component10();
- method public androidx.ui.intl.LocaleList? component11();
+ method public androidx.compose.ui.text.style.TextGeometricTransform? component10();
+ method public androidx.compose.ui.text.intl.LocaleList? component11();
method public long component12();
- method public androidx.ui.text.style.TextDecoration? component13();
+ method public androidx.compose.ui.text.style.TextDecoration? component13();
method public androidx.ui.graphics.Shadow? component14();
- method public androidx.ui.text.style.TextAlign? component15();
- method public androidx.ui.text.style.TextDirection? component16();
+ method public androidx.compose.ui.text.style.TextAlign? component15();
+ method public androidx.compose.ui.text.style.TextDirection? component16();
method public long component17();
- method public androidx.ui.text.style.TextIndent? component18();
+ method public androidx.compose.ui.text.style.TextIndent? component18();
method public long component2();
- method public androidx.ui.text.font.FontWeight? component3();
- method public androidx.ui.text.font.FontStyle? component4();
- method public androidx.ui.text.font.FontSynthesis? component5();
- method public androidx.ui.text.font.FontFamily? component6();
+ method public androidx.compose.ui.text.font.FontWeight? component3();
+ method public androidx.compose.ui.text.font.FontStyle? component4();
+ method public androidx.compose.ui.text.font.FontSynthesis? component5();
+ method public androidx.compose.ui.text.font.FontFamily? component6();
method public String? component7();
method public long component8();
- method public androidx.ui.text.style.BaselineShift? component9();
- method @androidx.compose.Immutable public androidx.ui.text.TextStyle copy-7aJ7aFo(long color, long fontSize, androidx.ui.text.font.FontWeight? fontWeight, androidx.ui.text.font.FontStyle? fontStyle, androidx.ui.text.font.FontSynthesis? fontSynthesis, androidx.ui.text.font.FontFamily? fontFamily, String? fontFeatureSettings, long letterSpacing, androidx.ui.text.style.BaselineShift? baselineShift, androidx.ui.text.style.TextGeometricTransform? textGeometricTransform, androidx.ui.intl.LocaleList? localeList, long background, androidx.ui.text.style.TextDecoration? textDecoration, androidx.ui.graphics.Shadow? shadow, androidx.ui.text.style.TextAlign? textAlign, androidx.ui.text.style.TextDirection? textDirection, long lineHeight, androidx.ui.text.style.TextIndent? textIndent);
+ method public androidx.compose.ui.text.style.BaselineShift? component9();
+ method @androidx.compose.Immutable public androidx.compose.ui.text.TextStyle copy-7Y_OIKU(long color, long fontSize, androidx.compose.ui.text.font.FontWeight? fontWeight, androidx.compose.ui.text.font.FontStyle? fontStyle, androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, androidx.compose.ui.text.font.FontFamily? fontFamily, String? fontFeatureSettings, long letterSpacing, androidx.compose.ui.text.style.BaselineShift? baselineShift, androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, androidx.compose.ui.text.intl.LocaleList? localeList, long background, androidx.compose.ui.text.style.TextDecoration? textDecoration, androidx.ui.graphics.Shadow? shadow, androidx.compose.ui.text.style.TextAlign? textAlign, androidx.compose.ui.text.style.TextDirection? textDirection, long lineHeight, androidx.compose.ui.text.style.TextIndent? textIndent);
method public long getBackground();
- method public androidx.ui.text.style.BaselineShift? getBaselineShift();
+ method public androidx.compose.ui.text.style.BaselineShift? getBaselineShift();
method public long getColor();
- method public androidx.ui.text.font.FontFamily? getFontFamily();
+ method public androidx.compose.ui.text.font.FontFamily? getFontFamily();
method public String? getFontFeatureSettings();
method public long getFontSize();
- method public androidx.ui.text.font.FontStyle? getFontStyle();
- method public androidx.ui.text.font.FontSynthesis? getFontSynthesis();
- method public androidx.ui.text.font.FontWeight? getFontWeight();
+ method public androidx.compose.ui.text.font.FontStyle? getFontStyle();
+ method public androidx.compose.ui.text.font.FontSynthesis? getFontSynthesis();
+ method public androidx.compose.ui.text.font.FontWeight? getFontWeight();
method public long getLetterSpacing();
method public long getLineHeight();
- method public androidx.ui.intl.LocaleList? getLocaleList();
+ method public androidx.compose.ui.text.intl.LocaleList? getLocaleList();
method public androidx.ui.graphics.Shadow? getShadow();
- method public androidx.ui.text.style.TextAlign? getTextAlign();
- method public androidx.ui.text.style.TextDecoration? getTextDecoration();
- method public androidx.ui.text.style.TextDirection? getTextDirection();
- method public androidx.ui.text.style.TextGeometricTransform? getTextGeometricTransform();
- method public androidx.ui.text.style.TextIndent? getTextIndent();
- method @androidx.compose.Stable public androidx.ui.text.TextStyle merge(androidx.ui.text.TextStyle? other = null);
- method @androidx.compose.Stable public androidx.ui.text.TextStyle merge(androidx.ui.text.SpanStyle other);
- method @androidx.compose.Stable public androidx.ui.text.TextStyle merge(androidx.ui.text.ParagraphStyle other);
- method @androidx.compose.Stable public operator androidx.ui.text.TextStyle plus(androidx.ui.text.TextStyle other);
- method @androidx.compose.Stable public operator androidx.ui.text.TextStyle plus(androidx.ui.text.ParagraphStyle other);
- method @androidx.compose.Stable public operator androidx.ui.text.TextStyle plus(androidx.ui.text.SpanStyle other);
- method @androidx.compose.Stable public androidx.ui.text.ParagraphStyle toParagraphStyle();
- method @androidx.compose.Stable public androidx.ui.text.SpanStyle toSpanStyle();
- field public static final androidx.ui.text.TextStyle.Companion Companion;
+ method public androidx.compose.ui.text.style.TextAlign? getTextAlign();
+ method public androidx.compose.ui.text.style.TextDecoration? getTextDecoration();
+ 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.Stable public androidx.compose.ui.text.TextStyle merge(androidx.compose.ui.text.TextStyle? other = null);
+ method @androidx.compose.Stable public androidx.compose.ui.text.TextStyle merge(androidx.compose.ui.text.SpanStyle other);
+ method @androidx.compose.Stable public androidx.compose.ui.text.TextStyle merge(androidx.compose.ui.text.ParagraphStyle other);
+ method @androidx.compose.Stable public operator androidx.compose.ui.text.TextStyle plus(androidx.compose.ui.text.TextStyle other);
+ method @androidx.compose.Stable public operator androidx.compose.ui.text.TextStyle plus(androidx.compose.ui.text.ParagraphStyle other);
+ method @androidx.compose.Stable public operator androidx.compose.ui.text.TextStyle plus(androidx.compose.ui.text.SpanStyle other);
+ method @androidx.compose.Stable public androidx.compose.ui.text.ParagraphStyle toParagraphStyle();
+ method @androidx.compose.Stable public androidx.compose.ui.text.SpanStyle toSpanStyle();
+ field public static final androidx.compose.ui.text.TextStyle.Companion Companion;
}
public static final class TextStyle.Companion {
- method public androidx.ui.text.TextStyle getDefault();
- property public final androidx.ui.text.TextStyle Default;
+ method public androidx.compose.ui.text.TextStyle getDefault();
+ property public final androidx.compose.ui.text.TextStyle Default;
}
public final class TextStyleKt {
- method public static androidx.ui.text.TextStyle lerp(androidx.ui.text.TextStyle start, androidx.ui.text.TextStyle stop, float fraction);
- method public static androidx.ui.text.TextStyle resolveDefaults(androidx.ui.text.TextStyle style, androidx.ui.core.LayoutDirection direction);
+ method public static androidx.compose.ui.text.TextStyle lerp(androidx.compose.ui.text.TextStyle start, androidx.compose.ui.text.TextStyle stop, float fraction);
+ method public static androidx.compose.ui.text.TextStyle resolveDefaults(androidx.compose.ui.text.TextStyle style, androidx.ui.core.LayoutDirection direction);
}
public interface Typeface {
- method public androidx.ui.text.font.FontFamily getFontFamily();
- property public abstract androidx.ui.text.font.FontFamily fontFamily;
+ method public androidx.compose.ui.text.font.FontFamily getFontFamily();
+ property public abstract androidx.compose.ui.text.font.FontFamily fontFamily;
}
}
-package androidx.ui.text.font {
+package androidx.compose.ui.text.font {
- public abstract sealed class FileBasedFontFamily extends androidx.ui.text.font.FontFamily {
+ public abstract sealed class FileBasedFontFamily extends androidx.compose.ui.text.font.FontFamily {
}
@androidx.compose.Immutable public interface Font {
- method public androidx.ui.text.font.FontStyle getStyle();
- method public androidx.ui.text.font.FontWeight getWeight();
- property public abstract androidx.ui.text.font.FontStyle style;
- property public abstract androidx.ui.text.font.FontWeight weight;
+ method public androidx.compose.ui.text.font.FontStyle getStyle();
+ method public androidx.compose.ui.text.font.FontWeight getWeight();
+ property public abstract androidx.compose.ui.text.font.FontStyle style;
+ property public abstract androidx.compose.ui.text.font.FontWeight weight;
}
public static interface Font.ResourceLoader {
- method public Object load(androidx.ui.text.font.Font font);
+ method public Object load(androidx.compose.ui.text.font.Font font);
}
@androidx.compose.Immutable public abstract sealed class FontFamily {
method public final boolean getCanLoadSynchronously();
- field public static final androidx.ui.text.font.FontFamily.Companion Companion;
+ field public static final androidx.compose.ui.text.font.FontFamily.Companion Companion;
}
public static final class FontFamily.Companion {
- method public androidx.ui.text.font.GenericFontFamily getCursive();
- method public androidx.ui.text.font.SystemFontFamily getDefault();
- method public androidx.ui.text.font.GenericFontFamily getMonospace();
- method public androidx.ui.text.font.GenericFontFamily getSansSerif();
- method public androidx.ui.text.font.GenericFontFamily getSerif();
- property public final androidx.ui.text.font.GenericFontFamily Cursive;
- property public final androidx.ui.text.font.SystemFontFamily Default;
- property public final androidx.ui.text.font.GenericFontFamily Monospace;
- property public final androidx.ui.text.font.GenericFontFamily SansSerif;
- property public final androidx.ui.text.font.GenericFontFamily Serif;
+ method public androidx.compose.ui.text.font.GenericFontFamily getCursive();
+ method public androidx.compose.ui.text.font.SystemFontFamily getDefault();
+ method public androidx.compose.ui.text.font.GenericFontFamily getMonospace();
+ method public androidx.compose.ui.text.font.GenericFontFamily getSansSerif();
+ method public androidx.compose.ui.text.font.GenericFontFamily getSerif();
+ property public final androidx.compose.ui.text.font.GenericFontFamily Cursive;
+ property public final androidx.compose.ui.text.font.SystemFontFamily Default;
+ property public final androidx.compose.ui.text.font.GenericFontFamily Monospace;
+ property public final androidx.compose.ui.text.font.GenericFontFamily SansSerif;
+ property public final androidx.compose.ui.text.font.GenericFontFamily Serif;
}
public final class FontFamilyKt {
- method @androidx.compose.Stable public static androidx.ui.text.font.FontListFontFamily fontFamily(java.util.List<? extends androidx.ui.text.font.Font> fonts);
- method @androidx.compose.Stable public static androidx.ui.text.font.FontListFontFamily fontFamily(androidx.ui.text.font.Font... fonts);
- method public static androidx.ui.text.font.LoadedFontFamily fontFamily(androidx.ui.text.Typeface typeface);
+ method @androidx.compose.Stable public static androidx.compose.ui.text.font.FontListFontFamily fontFamily(java.util.List<? extends androidx.compose.ui.text.font.Font> fonts);
+ method @androidx.compose.Stable public static androidx.compose.ui.text.font.FontListFontFamily fontFamily(androidx.compose.ui.text.font.Font... fonts);
+ method public static androidx.compose.ui.text.font.LoadedFontFamily fontFamily(androidx.compose.ui.text.Typeface typeface);
}
public final class FontKt {
- method @androidx.compose.Stable public static androidx.ui.text.font.FontListFontFamily asFontFamily(androidx.ui.text.font.Font);
- method @androidx.compose.Stable public static androidx.ui.text.font.Font font(int resId, androidx.ui.text.font.FontWeight weight = FontWeight.Normal, androidx.ui.text.font.FontStyle style = androidx.ui.text.font.FontStyle.Normal);
+ method @androidx.compose.Stable public static androidx.compose.ui.text.font.FontListFontFamily asFontFamily(androidx.compose.ui.text.font.Font);
+ method @androidx.compose.Stable public static androidx.compose.ui.text.font.Font font(int resId, androidx.compose.ui.text.font.FontWeight weight = FontWeight.Normal, androidx.compose.ui.text.font.FontStyle style = androidx.compose.ui.text.font.FontStyle.Normal);
}
- @androidx.compose.Immutable public final class FontListFontFamily extends androidx.ui.text.font.FileBasedFontFamily implements kotlin.jvm.internal.markers.KMappedMarker java.util.List<androidx.ui.text.font.Font> {
- ctor public FontListFontFamily(java.util.List<? extends androidx.ui.text.font.Font> fonts);
- method public java.util.List<androidx.ui.text.font.Font> component1();
- method public boolean contains(androidx.ui.text.font.Font element);
+ @androidx.compose.Immutable public final class FontListFontFamily extends androidx.compose.ui.text.font.FileBasedFontFamily implements kotlin.jvm.internal.markers.KMappedMarker java.util.List<androidx.compose.ui.text.font.Font> {
+ ctor public FontListFontFamily(java.util.List<? extends androidx.compose.ui.text.font.Font> fonts);
+ method public java.util.List<androidx.compose.ui.text.font.Font> component1();
+ method public boolean contains(androidx.compose.ui.text.font.Font element);
method public boolean containsAll(java.util.Collection<?> elements);
- method @androidx.compose.Immutable public androidx.ui.text.font.FontListFontFamily copy(java.util.List<? extends androidx.ui.text.font.Font> fonts);
- method public androidx.ui.text.font.Font get(int index);
- method public java.util.List<androidx.ui.text.font.Font> getFonts();
+ method @androidx.compose.Immutable public androidx.compose.ui.text.font.FontListFontFamily copy(java.util.List<? extends androidx.compose.ui.text.font.Font> fonts);
+ method public androidx.compose.ui.text.font.Font get(int index);
+ method public java.util.List<androidx.compose.ui.text.font.Font> getFonts();
method public int getSize();
- method public int indexOf(androidx.ui.text.font.Font element);
+ method public int indexOf(androidx.compose.ui.text.font.Font element);
method public boolean isEmpty();
- method public java.util.Iterator<androidx.ui.text.font.Font> iterator();
- method public int lastIndexOf(androidx.ui.text.font.Font element);
- method public java.util.ListIterator<androidx.ui.text.font.Font> listIterator();
- method public java.util.ListIterator<androidx.ui.text.font.Font> listIterator(int index);
- method public java.util.List<androidx.ui.text.font.Font> subList(int fromIndex, int toIndex);
+ method public java.util.Iterator<androidx.compose.ui.text.font.Font> iterator();
+ method public int lastIndexOf(androidx.compose.ui.text.font.Font element);
+ method public java.util.ListIterator<androidx.compose.ui.text.font.Font> listIterator();
+ method public java.util.ListIterator<androidx.compose.ui.text.font.Font> listIterator(int index);
+ method public java.util.List<androidx.compose.ui.text.font.Font> subList(int fromIndex, int toIndex);
}
public enum FontStyle {
- method public static androidx.ui.text.font.FontStyle valueOf(String name) throws java.lang.IllegalArgumentException;
- method public static androidx.ui.text.font.FontStyle[] values();
- enum_constant public static final androidx.ui.text.font.FontStyle Italic;
- enum_constant public static final androidx.ui.text.font.FontStyle Normal;
+ method public static androidx.compose.ui.text.font.FontStyle valueOf(String name) throws java.lang.IllegalArgumentException;
+ method public static androidx.compose.ui.text.font.FontStyle[] values();
+ enum_constant public static final androidx.compose.ui.text.font.FontStyle Italic;
+ enum_constant public static final androidx.compose.ui.text.font.FontStyle Normal;
}
public enum FontSynthesis {
- method public static androidx.ui.text.font.FontSynthesis valueOf(String name) throws java.lang.IllegalArgumentException;
- method public static androidx.ui.text.font.FontSynthesis[] values();
- enum_constant public static final androidx.ui.text.font.FontSynthesis All;
- enum_constant public static final androidx.ui.text.font.FontSynthesis None;
- enum_constant public static final androidx.ui.text.font.FontSynthesis Style;
- enum_constant public static final androidx.ui.text.font.FontSynthesis Weight;
+ method public static androidx.compose.ui.text.font.FontSynthesis valueOf(String name) throws java.lang.IllegalArgumentException;
+ method public static androidx.compose.ui.text.font.FontSynthesis[] values();
+ enum_constant public static final androidx.compose.ui.text.font.FontSynthesis All;
+ enum_constant public static final androidx.compose.ui.text.font.FontSynthesis None;
+ enum_constant public static final androidx.compose.ui.text.font.FontSynthesis Style;
+ enum_constant public static final androidx.compose.ui.text.font.FontSynthesis Weight;
}
- @androidx.compose.Immutable public final class FontWeight implements java.lang.Comparable<androidx.ui.text.font.FontWeight> {
+ @androidx.compose.Immutable public final class FontWeight implements java.lang.Comparable<androidx.compose.ui.text.font.FontWeight> {
ctor public FontWeight(int weight);
- method public int compareTo(androidx.ui.text.font.FontWeight other);
+ method public int compareTo(androidx.compose.ui.text.font.FontWeight other);
method public int component1();
- method @androidx.compose.Immutable public androidx.ui.text.font.FontWeight copy(int weight);
+ method @androidx.compose.Immutable public androidx.compose.ui.text.font.FontWeight copy(int weight);
method public int getWeight();
- field public static final androidx.ui.text.font.FontWeight.Companion Companion;
+ field public static final androidx.compose.ui.text.font.FontWeight.Companion Companion;
}
public static final class FontWeight.Companion {
- method public androidx.ui.text.font.FontWeight getBlack();
- method public androidx.ui.text.font.FontWeight getBold();
- method public androidx.ui.text.font.FontWeight getExtraBold();
- method public androidx.ui.text.font.FontWeight getExtraLight();
- method public androidx.ui.text.font.FontWeight getLight();
- method public androidx.ui.text.font.FontWeight getMedium();
- method public androidx.ui.text.font.FontWeight getNormal();
- method public androidx.ui.text.font.FontWeight getSemiBold();
- method public androidx.ui.text.font.FontWeight getThin();
- method public androidx.ui.text.font.FontWeight getW100();
- method public androidx.ui.text.font.FontWeight getW200();
- method public androidx.ui.text.font.FontWeight getW300();
- method public androidx.ui.text.font.FontWeight getW400();
- method public androidx.ui.text.font.FontWeight getW500();
- method public androidx.ui.text.font.FontWeight getW600();
- method public androidx.ui.text.font.FontWeight getW700();
- method public androidx.ui.text.font.FontWeight getW800();
- method public androidx.ui.text.font.FontWeight getW900();
- property public final androidx.ui.text.font.FontWeight Black;
- property public final androidx.ui.text.font.FontWeight Bold;
- property public final androidx.ui.text.font.FontWeight ExtraBold;
- property public final androidx.ui.text.font.FontWeight ExtraLight;
- property public final androidx.ui.text.font.FontWeight Light;
- property public final androidx.ui.text.font.FontWeight Medium;
- property public final androidx.ui.text.font.FontWeight Normal;
- property public final androidx.ui.text.font.FontWeight SemiBold;
- property public final androidx.ui.text.font.FontWeight Thin;
- property public final androidx.ui.text.font.FontWeight W100;
- property public final androidx.ui.text.font.FontWeight W200;
- property public final androidx.ui.text.font.FontWeight W300;
- property public final androidx.ui.text.font.FontWeight W400;
- property public final androidx.ui.text.font.FontWeight W500;
- property public final androidx.ui.text.font.FontWeight W600;
- property public final androidx.ui.text.font.FontWeight W700;
- property public final androidx.ui.text.font.FontWeight W800;
- property public final androidx.ui.text.font.FontWeight W900;
+ method public androidx.compose.ui.text.font.FontWeight getBlack();
+ method public androidx.compose.ui.text.font.FontWeight getBold();
+ method public androidx.compose.ui.text.font.FontWeight getExtraBold();
+ method public androidx.compose.ui.text.font.FontWeight getExtraLight();
+ method public androidx.compose.ui.text.font.FontWeight getLight();
+ method public androidx.compose.ui.text.font.FontWeight getMedium();
+ method public androidx.compose.ui.text.font.FontWeight getNormal();
+ method public androidx.compose.ui.text.font.FontWeight getSemiBold();
+ method public androidx.compose.ui.text.font.FontWeight getThin();
+ method public androidx.compose.ui.text.font.FontWeight getW100();
+ method public androidx.compose.ui.text.font.FontWeight getW200();
+ method public androidx.compose.ui.text.font.FontWeight getW300();
+ method public androidx.compose.ui.text.font.FontWeight getW400();
+ method public androidx.compose.ui.text.font.FontWeight getW500();
+ method public androidx.compose.ui.text.font.FontWeight getW600();
+ method public androidx.compose.ui.text.font.FontWeight getW700();
+ method public androidx.compose.ui.text.font.FontWeight getW800();
+ method public androidx.compose.ui.text.font.FontWeight getW900();
+ property public final androidx.compose.ui.text.font.FontWeight Black;
+ property public final androidx.compose.ui.text.font.FontWeight Bold;
+ property public final androidx.compose.ui.text.font.FontWeight ExtraBold;
+ property public final androidx.compose.ui.text.font.FontWeight ExtraLight;
+ property public final androidx.compose.ui.text.font.FontWeight Light;
+ property public final androidx.compose.ui.text.font.FontWeight Medium;
+ property public final androidx.compose.ui.text.font.FontWeight Normal;
+ property public final androidx.compose.ui.text.font.FontWeight SemiBold;
+ property public final androidx.compose.ui.text.font.FontWeight Thin;
+ property public final androidx.compose.ui.text.font.FontWeight W100;
+ property public final androidx.compose.ui.text.font.FontWeight W200;
+ property public final androidx.compose.ui.text.font.FontWeight W300;
+ property public final androidx.compose.ui.text.font.FontWeight W400;
+ property public final androidx.compose.ui.text.font.FontWeight W500;
+ property public final androidx.compose.ui.text.font.FontWeight W600;
+ property public final androidx.compose.ui.text.font.FontWeight W700;
+ property public final androidx.compose.ui.text.font.FontWeight W800;
+ property public final androidx.compose.ui.text.font.FontWeight W900;
}
public final class FontWeightKt {
- method public static androidx.ui.text.font.FontWeight lerp(androidx.ui.text.font.FontWeight start, androidx.ui.text.font.FontWeight stop, float fraction);
+ method public static androidx.compose.ui.text.font.FontWeight lerp(androidx.compose.ui.text.font.FontWeight start, androidx.compose.ui.text.font.FontWeight stop, float fraction);
}
- @androidx.compose.Immutable public final class GenericFontFamily extends androidx.ui.text.font.SystemFontFamily {
+ @androidx.compose.Immutable public final class GenericFontFamily extends androidx.compose.ui.text.font.SystemFontFamily {
method public String getName();
}
- public final class LoadedFontFamily extends androidx.ui.text.font.FontFamily {
- ctor public LoadedFontFamily(androidx.ui.text.Typeface typeface);
- method public androidx.ui.text.Typeface component1();
- method public androidx.ui.text.font.LoadedFontFamily copy(androidx.ui.text.Typeface typeface);
- method public androidx.ui.text.Typeface getTypeface();
+ public final class LoadedFontFamily extends androidx.compose.ui.text.font.FontFamily {
+ ctor public LoadedFontFamily(androidx.compose.ui.text.Typeface typeface);
+ method public androidx.compose.ui.text.Typeface component1();
+ method public androidx.compose.ui.text.font.LoadedFontFamily copy(androidx.compose.ui.text.Typeface typeface);
+ method public androidx.compose.ui.text.Typeface getTypeface();
}
- public final class ResourceFont implements androidx.ui.text.font.Font {
- ctor public ResourceFont(int resId, androidx.ui.text.font.FontWeight weight, androidx.ui.text.font.FontStyle style);
+ public final class ResourceFont implements androidx.compose.ui.text.font.Font {
+ ctor public ResourceFont(int resId, androidx.compose.ui.text.font.FontWeight weight, androidx.compose.ui.text.font.FontStyle style);
method public int component1();
- method public androidx.ui.text.font.FontWeight component2();
- method public androidx.ui.text.font.FontStyle component3();
- method public androidx.ui.text.font.ResourceFont copy(int resId, androidx.ui.text.font.FontWeight weight, androidx.ui.text.font.FontStyle style);
+ method public androidx.compose.ui.text.font.FontWeight component2();
+ method public androidx.compose.ui.text.font.FontStyle component3();
+ method public androidx.compose.ui.text.font.ResourceFont copy(int resId, androidx.compose.ui.text.font.FontWeight weight, androidx.compose.ui.text.font.FontStyle style);
method public int getResId();
- method public androidx.ui.text.font.FontStyle getStyle();
- method public androidx.ui.text.font.FontWeight getWeight();
+ method public androidx.compose.ui.text.font.FontStyle getStyle();
+ method public androidx.compose.ui.text.font.FontWeight getWeight();
}
- public abstract sealed class SystemFontFamily extends androidx.ui.text.font.FontFamily {
+ public abstract sealed class SystemFontFamily extends androidx.compose.ui.text.font.FontFamily {
}
}
-package androidx.ui.text.platform {
+package androidx.compose.ui.text.input {
+
+ public final class BackspaceKeyEditOp implements androidx.compose.ui.text.input.EditOperation {
+ ctor public BackspaceKeyEditOp();
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public final class CommitTextEditOp implements androidx.compose.ui.text.input.EditOperation {
+ ctor public CommitTextEditOp(String text, int newCursorPosition);
+ method public String component1();
+ method public int component2();
+ method public androidx.compose.ui.text.input.CommitTextEditOp copy(String text, int newCursorPosition);
+ method public int getNewCursorPosition();
+ method public String getText();
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public final class DeleteAllEditOp implements androidx.compose.ui.text.input.EditOperation {
+ ctor public DeleteAllEditOp();
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public final class DeleteSurroundingTextEditOp implements androidx.compose.ui.text.input.EditOperation {
+ ctor public DeleteSurroundingTextEditOp(int beforeLength, int afterLength);
+ method public int component1();
+ method public int component2();
+ method public androidx.compose.ui.text.input.DeleteSurroundingTextEditOp copy(int beforeLength, int afterLength);
+ method public int getAfterLength();
+ method public int getBeforeLength();
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public final class DeleteSurroundingTextInCodePointsEditOp implements androidx.compose.ui.text.input.EditOperation {
+ ctor public DeleteSurroundingTextInCodePointsEditOp(int beforeLength, int afterLength);
+ method public int component1();
+ method public int component2();
+ method public androidx.compose.ui.text.input.DeleteSurroundingTextInCodePointsEditOp copy(int beforeLength, int afterLength);
+ method public int getAfterLength();
+ method public int getBeforeLength();
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public interface EditOperation {
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public final class EditingBuffer {
+ ctor public EditingBuffer(String initialText, androidx.compose.ui.text.TextRange initialSelection);
+ field public static final int NOWHERE = -1; // 0xffffffff
+ }
+
+ @Deprecated @androidx.compose.Immutable public final class EditorValue {
+ ctor @Deprecated public EditorValue(String text, androidx.compose.ui.text.TextRange selection, androidx.compose.ui.text.TextRange? composition);
+ ctor @Deprecated public EditorValue();
+ method @Deprecated public String component1();
+ method @Deprecated public androidx.compose.ui.text.TextRange component2();
+ method @Deprecated public androidx.compose.ui.text.TextRange? component3();
+ method @Deprecated @androidx.compose.Immutable public androidx.compose.ui.text.input.EditorValue copy(String text, androidx.compose.ui.text.TextRange selection, androidx.compose.ui.text.TextRange? composition);
+ method @Deprecated public androidx.compose.ui.text.TextRange? getComposition();
+ method @Deprecated public String getSelectedText();
+ method @Deprecated public androidx.compose.ui.text.TextRange getSelection();
+ method @Deprecated public String getText();
+ method @Deprecated public String getTextAfterSelection(int maxChars);
+ method @Deprecated public String getTextBeforeSelection(int maxChars);
+ }
+
+ public final class FinishComposingTextEditOp implements androidx.compose.ui.text.input.EditOperation {
+ ctor public FinishComposingTextEditOp();
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public final class GapBufferKt {
+ }
+
+ public enum ImeAction {
+ method public static androidx.compose.ui.text.input.ImeAction valueOf(String name) throws java.lang.IllegalArgumentException;
+ method public static androidx.compose.ui.text.input.ImeAction[] values();
+ enum_constant public static final androidx.compose.ui.text.input.ImeAction Done;
+ enum_constant public static final androidx.compose.ui.text.input.ImeAction Go;
+ enum_constant public static final androidx.compose.ui.text.input.ImeAction Next;
+ enum_constant public static final androidx.compose.ui.text.input.ImeAction NoAction;
+ enum_constant public static final androidx.compose.ui.text.input.ImeAction Previous;
+ enum_constant public static final androidx.compose.ui.text.input.ImeAction Search;
+ enum_constant public static final androidx.compose.ui.text.input.ImeAction Send;
+ enum_constant public static final androidx.compose.ui.text.input.ImeAction Unspecified;
+ }
+
+ public interface InputEventListener {
+ method public void onEditOperations(java.util.List<? extends androidx.compose.ui.text.input.EditOperation> editOps);
+ method public void onImeAction(androidx.compose.ui.text.input.ImeAction imeAction);
+ }
+
+ public enum KeyboardType {
+ method public static androidx.compose.ui.text.input.KeyboardType valueOf(String name) throws java.lang.IllegalArgumentException;
+ method public static androidx.compose.ui.text.input.KeyboardType[] values();
+ enum_constant public static final androidx.compose.ui.text.input.KeyboardType Ascii;
+ enum_constant public static final androidx.compose.ui.text.input.KeyboardType Email;
+ enum_constant public static final androidx.compose.ui.text.input.KeyboardType Number;
+ enum_constant public static final androidx.compose.ui.text.input.KeyboardType NumberPassword;
+ enum_constant public static final androidx.compose.ui.text.input.KeyboardType Password;
+ enum_constant public static final androidx.compose.ui.text.input.KeyboardType Phone;
+ enum_constant public static final androidx.compose.ui.text.input.KeyboardType Text;
+ enum_constant public static final androidx.compose.ui.text.input.KeyboardType Uri;
+ }
+
+ public final class MoveCursorEditOp implements androidx.compose.ui.text.input.EditOperation {
+ ctor public MoveCursorEditOp(int amount);
+ method public int component1();
+ method public androidx.compose.ui.text.input.MoveCursorEditOp copy(int amount);
+ method public int getAmount();
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public interface OffsetMap {
+ method public int originalToTransformed(int offset);
+ method public int transformedToOriginal(int offset);
+ field public static final androidx.compose.ui.text.input.OffsetMap.Companion Companion;
+ }
+
+ public static final class OffsetMap.Companion {
+ method public androidx.compose.ui.text.input.OffsetMap getIdentityOffsetMap();
+ property public final androidx.compose.ui.text.input.OffsetMap identityOffsetMap;
+ }
+
+ public final class PasswordVisualTransformation implements androidx.compose.ui.text.input.VisualTransformation {
+ ctor public PasswordVisualTransformation(char mask);
+ ctor public PasswordVisualTransformation();
+ method public char component1();
+ method public androidx.compose.ui.text.input.PasswordVisualTransformation copy(char mask);
+ method public androidx.compose.ui.text.input.TransformedText filter(androidx.compose.ui.text.AnnotatedString text);
+ method public char getMask();
+ }
+
+ public interface PlatformTextInputService {
+ method public void hideSoftwareKeyboard();
+ method public void notifyFocusedRect(androidx.ui.geometry.Rect rect);
+ method public void onStateUpdated(androidx.compose.ui.text.input.TextFieldValue value);
+ method public void showSoftwareKeyboard();
+ method public void startInput(androidx.compose.ui.text.input.TextFieldValue value, androidx.compose.ui.text.input.KeyboardType keyboardType, androidx.compose.ui.text.input.ImeAction imeAction, kotlin.jvm.functions.Function1<? super java.util.List<? extends androidx.compose.ui.text.input.EditOperation>,kotlin.Unit> onEditCommand, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.ImeAction,kotlin.Unit> onImeActionPerformed);
+ method public void stopInput();
+ }
+
+ public final class SetComposingRegionEditOp implements androidx.compose.ui.text.input.EditOperation {
+ ctor public SetComposingRegionEditOp(int start, int end);
+ method public int component1();
+ method public int component2();
+ method public androidx.compose.ui.text.input.SetComposingRegionEditOp copy(int start, int end);
+ method public int getEnd();
+ method public int getStart();
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public final class SetComposingTextEditOp implements androidx.compose.ui.text.input.EditOperation {
+ ctor public SetComposingTextEditOp(String text, int newCursorPosition);
+ method public String component1();
+ method public int component2();
+ method public androidx.compose.ui.text.input.SetComposingTextEditOp copy(String text, int newCursorPosition);
+ method public int getNewCursorPosition();
+ method public String getText();
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public final class SetSelectionEditOp implements androidx.compose.ui.text.input.EditOperation {
+ ctor public SetSelectionEditOp(int start, int end);
+ method public int component1();
+ method public int component2();
+ method public androidx.compose.ui.text.input.SetSelectionEditOp copy(int start, int end);
+ method public int getEnd();
+ method public int getStart();
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ @androidx.compose.Immutable public final class TextFieldValue {
+ ctor public TextFieldValue(String text, androidx.compose.ui.text.TextRange selection, androidx.compose.ui.text.TextRange? composition);
+ ctor public TextFieldValue();
+ method public String component1();
+ method public androidx.compose.ui.text.TextRange component2();
+ method public androidx.compose.ui.text.TextRange? component3();
+ method @androidx.compose.Immutable public androidx.compose.ui.text.input.TextFieldValue copy(String text, androidx.compose.ui.text.TextRange selection, androidx.compose.ui.text.TextRange? composition);
+ method public androidx.compose.ui.text.TextRange? getComposition();
+ method public androidx.compose.ui.text.TextRange getSelection();
+ method public String getText();
+ field public static final androidx.compose.ui.text.input.TextFieldValue.Companion Companion;
+ }
+
+ public static final class TextFieldValue.Companion {
+ method public androidx.compose.runtime.savedinstancestate.Saver<androidx.compose.ui.text.input.TextFieldValue,java.lang.Object> getSaver();
+ property public final androidx.compose.runtime.savedinstancestate.Saver<androidx.compose.ui.text.input.TextFieldValue,java.lang.Object> Saver;
+ }
+
+ public final class TextFieldValueKt {
+ method public static String getSelectedText(androidx.compose.ui.text.input.TextFieldValue);
+ method public static String getTextAfterSelection(androidx.compose.ui.text.input.TextFieldValue, int maxChars);
+ method public static String getTextBeforeSelection(androidx.compose.ui.text.input.TextFieldValue, int maxChars);
+ }
+
+ public class TextInputService {
+ ctor public TextInputService(androidx.compose.ui.text.input.PlatformTextInputService platformTextInputService);
+ method public void hideSoftwareKeyboard(int token);
+ method public void notifyFocusedRect(int token, androidx.ui.geometry.Rect rect);
+ method public void onStateUpdated(int token, androidx.compose.ui.text.input.TextFieldValue value);
+ method public void showSoftwareKeyboard(int token);
+ method public int startInput(androidx.compose.ui.text.input.TextFieldValue value, androidx.compose.ui.text.input.KeyboardType keyboardType, androidx.compose.ui.text.input.ImeAction imeAction, kotlin.jvm.functions.Function1<? super java.util.List<? extends androidx.compose.ui.text.input.EditOperation>,kotlin.Unit> onEditCommand, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.ImeAction,kotlin.Unit> onImeActionPerformed);
+ method public void stopInput(int token);
+ }
+
+ public final class TextInputServiceKt {
+ method @Deprecated public static kotlin.jvm.functions.Function1<androidx.compose.ui.text.input.PlatformTextInputService,androidx.compose.ui.text.input.TextInputService> getTextInputServiceFactory();
+ method @Deprecated public static void setTextInputServiceFactory(kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.PlatformTextInputService,? extends androidx.compose.ui.text.input.TextInputService> p);
+ field public static final int INVALID_SESSION = -1; // 0xffffffff
+ field public static final int NO_SESSION = 0; // 0x0
+ }
+
+ public final class TransformedText {
+ ctor public TransformedText(androidx.compose.ui.text.AnnotatedString transformedText, androidx.compose.ui.text.input.OffsetMap offsetMap);
+ method public androidx.compose.ui.text.AnnotatedString component1();
+ method public androidx.compose.ui.text.input.OffsetMap component2();
+ method public androidx.compose.ui.text.input.TransformedText copy(androidx.compose.ui.text.AnnotatedString transformedText, androidx.compose.ui.text.input.OffsetMap offsetMap);
+ method public androidx.compose.ui.text.input.OffsetMap getOffsetMap();
+ method public androidx.compose.ui.text.AnnotatedString getTransformedText();
+ }
+
+ @androidx.compose.Immutable public interface VisualTransformation {
+ method public androidx.compose.ui.text.input.TransformedText filter(androidx.compose.ui.text.AnnotatedString text);
+ field public static final androidx.compose.ui.text.input.VisualTransformation.Companion Companion;
+ }
+
+ public static final class VisualTransformation.Companion {
+ method public androidx.compose.ui.text.input.VisualTransformation getNone();
+ property public final androidx.compose.ui.text.input.VisualTransformation None;
+ }
+
+}
+
+package androidx.compose.ui.text.intl {
+
+ public final class AndroidPlatformLocaleKt {
+ }
+
+ @androidx.compose.Immutable public final class Locale {
+ ctor public Locale(String languageTag);
+ method public String getLanguage();
+ method public String getRegion();
+ method public String getScript();
+ method public String toLanguageTag();
+ property public final String language;
+ property public final String region;
+ property public final String script;
+ field public static final androidx.compose.ui.text.intl.Locale.Companion Companion;
+ }
+
+ public static final class Locale.Companion {
+ method public androidx.compose.ui.text.intl.Locale getCurrent();
+ property public final androidx.compose.ui.text.intl.Locale current;
+ }
+
+ @androidx.compose.Immutable public final class LocaleList implements java.util.Collection<androidx.compose.ui.text.intl.Locale> kotlin.jvm.internal.markers.KMappedMarker {
+ ctor public LocaleList(java.util.List<androidx.compose.ui.text.intl.Locale> localeList);
+ ctor public LocaleList(String languageTags);
+ ctor public LocaleList(androidx.compose.ui.text.intl.Locale... locales);
+ method public java.util.List<androidx.compose.ui.text.intl.Locale> component1();
+ method public operator boolean contains(androidx.compose.ui.text.intl.Locale element);
+ method public boolean containsAll(java.util.Collection<?> elements);
+ method @androidx.compose.Immutable public androidx.compose.ui.text.intl.LocaleList copy(java.util.List<androidx.compose.ui.text.intl.Locale> localeList);
+ method public operator androidx.compose.ui.text.intl.Locale get(int i);
+ method public java.util.List<androidx.compose.ui.text.intl.Locale> getLocaleList();
+ method public int getSize();
+ method public boolean isEmpty();
+ method public java.util.Iterator<androidx.compose.ui.text.intl.Locale> iterator();
+ property public int size;
+ field public static final androidx.compose.ui.text.intl.LocaleList.Companion Companion;
+ }
+
+ public static final class LocaleList.Companion {
+ method public androidx.compose.ui.text.intl.LocaleList getCurrent();
+ property public final androidx.compose.ui.text.intl.LocaleList current;
+ }
+
+ public final class PlatformLocaleKt {
+ }
+
+}
+
+package androidx.compose.ui.text.platform {
public final class AndroidParagraphHelperKt {
}
public final class AndroidParagraphIntrinsicsKt {
- method @Deprecated public static kotlin.jvm.functions.Function6<java.lang.String,androidx.ui.text.TextStyle,java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.SpanStyle>>,java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>>,androidx.ui.unit.Density,androidx.ui.text.font.Font.ResourceLoader,androidx.ui.text.ParagraphIntrinsics> getParagraphIntrinsicsActualFactory();
- method @Deprecated public static void setParagraphIntrinsicsActualFactory(kotlin.jvm.functions.Function6<? super java.lang.String,? super androidx.ui.text.TextStyle,? super java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.SpanStyle>>,? super java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>>,? super androidx.ui.unit.Density,? super androidx.ui.text.font.Font.ResourceLoader,? extends androidx.ui.text.ParagraphIntrinsics> p);
+ method @Deprecated public static kotlin.jvm.functions.Function6<java.lang.String,androidx.compose.ui.text.TextStyle,java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>>,java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>>,androidx.ui.unit.Density,androidx.compose.ui.text.font.Font.ResourceLoader,androidx.compose.ui.text.ParagraphIntrinsics> getParagraphIntrinsicsActualFactory();
+ method @Deprecated public static void setParagraphIntrinsicsActualFactory(kotlin.jvm.functions.Function6<? super java.lang.String,? super androidx.compose.ui.text.TextStyle,? super java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>>,? super java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>>,? super androidx.ui.unit.Density,? super androidx.compose.ui.text.font.Font.ResourceLoader,? extends androidx.compose.ui.text.ParagraphIntrinsics> p);
}
public final class AndroidParagraphKt {
- method @Deprecated public static kotlin.jvm.functions.Function4<androidx.ui.text.ParagraphIntrinsics,java.lang.Integer,java.lang.Boolean,androidx.ui.text.ParagraphConstraints,androidx.ui.text.Paragraph> getParagraphActualFactory();
- method @Deprecated public static void setParagraphActualFactory(kotlin.jvm.functions.Function4<? super androidx.ui.text.ParagraphIntrinsics,? super java.lang.Integer,? super java.lang.Boolean,? super androidx.ui.text.ParagraphConstraints,? extends androidx.ui.text.Paragraph> p);
+ method @Deprecated public static kotlin.jvm.functions.Function4<androidx.compose.ui.text.ParagraphIntrinsics,java.lang.Integer,java.lang.Boolean,androidx.compose.ui.text.ParagraphConstraints,androidx.compose.ui.text.Paragraph> getParagraphActualFactory();
+ method @Deprecated public static void setParagraphActualFactory(kotlin.jvm.functions.Function4<? super androidx.compose.ui.text.ParagraphIntrinsics,? super java.lang.Integer,? super java.lang.Boolean,? super androidx.compose.ui.text.ParagraphConstraints,? extends androidx.compose.ui.text.Paragraph> p);
}
public final class AndroidStringDelegateKt {
}
public final class TypefaceAdapterKt {
- method public static androidx.ui.text.Typeface typefaceFromFontFamily(android.content.Context context, androidx.ui.text.font.FontFamily fontFamily, java.util.List<? extends kotlin.Pair<androidx.ui.text.font.FontWeight,? extends androidx.ui.text.font.FontStyle>>? necessaryStyles = null);
+ method public static androidx.compose.ui.text.Typeface typefaceFromFontFamily(android.content.Context context, androidx.compose.ui.text.font.FontFamily fontFamily, java.util.List<? extends kotlin.Pair<androidx.compose.ui.text.font.FontWeight,? extends androidx.compose.ui.text.font.FontStyle>>? necessaryStyles = null);
}
}
-package androidx.ui.text.platform.extensions {
+package androidx.compose.ui.text.platform.extensions {
public final class LocaleExtensionsKt {
}
@@ -942,7 +942,7 @@
}
-package androidx.ui.text.style {
+package androidx.compose.ui.text.style {
@androidx.compose.Immutable public final inline class BaselineShift {
ctor public BaselineShift();
@@ -952,7 +952,7 @@
method public float getMultiplier();
method @androidx.compose.Immutable public static inline int hashCode-impl(float p);
method @androidx.compose.Immutable public static inline String! toString-impl(float p);
- field public static final androidx.ui.text.style.BaselineShift.Companion Companion;
+ field public static final androidx.compose.ui.text.style.BaselineShift.Companion Companion;
}
public static final class BaselineShift.Companion {
@@ -965,54 +965,54 @@
}
public final class BaselineShiftKt {
- method @androidx.compose.Stable public static float lerp-7csQwvo(float start, float stop, float fraction);
+ method @androidx.compose.Stable public static float lerp-ylBt8J4(float start, float stop, float fraction);
}
public enum ResolvedTextDirection {
- method public static androidx.ui.text.style.ResolvedTextDirection valueOf(String name) throws java.lang.IllegalArgumentException;
- method public static androidx.ui.text.style.ResolvedTextDirection[] values();
- enum_constant public static final androidx.ui.text.style.ResolvedTextDirection Ltr;
- enum_constant public static final androidx.ui.text.style.ResolvedTextDirection Rtl;
+ method public static androidx.compose.ui.text.style.ResolvedTextDirection valueOf(String name) throws java.lang.IllegalArgumentException;
+ method public static androidx.compose.ui.text.style.ResolvedTextDirection[] values();
+ enum_constant public static final androidx.compose.ui.text.style.ResolvedTextDirection Ltr;
+ enum_constant public static final androidx.compose.ui.text.style.ResolvedTextDirection Rtl;
}
public enum TextAlign {
- method public static androidx.ui.text.style.TextAlign valueOf(String name) throws java.lang.IllegalArgumentException;
- method public static androidx.ui.text.style.TextAlign[] values();
- enum_constant public static final androidx.ui.text.style.TextAlign Center;
- enum_constant public static final androidx.ui.text.style.TextAlign End;
- enum_constant public static final androidx.ui.text.style.TextAlign Justify;
- enum_constant public static final androidx.ui.text.style.TextAlign Left;
- enum_constant public static final androidx.ui.text.style.TextAlign Right;
- enum_constant public static final androidx.ui.text.style.TextAlign Start;
+ method public static androidx.compose.ui.text.style.TextAlign valueOf(String name) throws java.lang.IllegalArgumentException;
+ method public static androidx.compose.ui.text.style.TextAlign[] values();
+ enum_constant public static final androidx.compose.ui.text.style.TextAlign Center;
+ enum_constant public static final androidx.compose.ui.text.style.TextAlign End;
+ enum_constant public static final androidx.compose.ui.text.style.TextAlign Justify;
+ enum_constant public static final androidx.compose.ui.text.style.TextAlign Left;
+ enum_constant public static final androidx.compose.ui.text.style.TextAlign Right;
+ enum_constant public static final androidx.compose.ui.text.style.TextAlign Start;
}
@androidx.compose.Immutable public final class TextDecoration {
method public int component1();
- method public operator boolean contains(androidx.ui.text.style.TextDecoration other);
- method @androidx.compose.Immutable public androidx.ui.text.style.TextDecoration copy(int mask);
+ method public operator boolean contains(androidx.compose.ui.text.style.TextDecoration other);
+ method @androidx.compose.Immutable public androidx.compose.ui.text.style.TextDecoration copy(int mask);
method public int getMask();
- method public operator androidx.ui.text.style.TextDecoration plus(androidx.ui.text.style.TextDecoration decoration);
- field public static final androidx.ui.text.style.TextDecoration.Companion Companion;
+ method public operator androidx.compose.ui.text.style.TextDecoration plus(androidx.compose.ui.text.style.TextDecoration decoration);
+ field public static final androidx.compose.ui.text.style.TextDecoration.Companion Companion;
}
public static final class TextDecoration.Companion {
- method public androidx.ui.text.style.TextDecoration combine(java.util.List<androidx.ui.text.style.TextDecoration> decorations);
- method public androidx.ui.text.style.TextDecoration getLineThrough();
- method public androidx.ui.text.style.TextDecoration getNone();
- method public androidx.ui.text.style.TextDecoration getUnderline();
- property public final androidx.ui.text.style.TextDecoration LineThrough;
- property public final androidx.ui.text.style.TextDecoration None;
- property public final androidx.ui.text.style.TextDecoration Underline;
+ method public androidx.compose.ui.text.style.TextDecoration combine(java.util.List<androidx.compose.ui.text.style.TextDecoration> decorations);
+ method public androidx.compose.ui.text.style.TextDecoration getLineThrough();
+ method public androidx.compose.ui.text.style.TextDecoration getNone();
+ method public androidx.compose.ui.text.style.TextDecoration getUnderline();
+ property public final androidx.compose.ui.text.style.TextDecoration LineThrough;
+ property public final androidx.compose.ui.text.style.TextDecoration None;
+ property public final androidx.compose.ui.text.style.TextDecoration Underline;
}
public enum TextDirection {
- method public static androidx.ui.text.style.TextDirection valueOf(String name) throws java.lang.IllegalArgumentException;
- method public static androidx.ui.text.style.TextDirection[] values();
- enum_constant public static final androidx.ui.text.style.TextDirection Content;
- enum_constant public static final androidx.ui.text.style.TextDirection ContentOrLtr;
- enum_constant public static final androidx.ui.text.style.TextDirection ContentOrRtl;
- enum_constant public static final androidx.ui.text.style.TextDirection Ltr;
- enum_constant public static final androidx.ui.text.style.TextDirection Rtl;
+ method public static androidx.compose.ui.text.style.TextDirection valueOf(String name) throws java.lang.IllegalArgumentException;
+ method public static androidx.compose.ui.text.style.TextDirection[] values();
+ enum_constant public static final androidx.compose.ui.text.style.TextDirection Content;
+ enum_constant public static final androidx.compose.ui.text.style.TextDirection ContentOrLtr;
+ enum_constant public static final androidx.compose.ui.text.style.TextDirection ContentOrRtl;
+ enum_constant public static final androidx.compose.ui.text.style.TextDirection Ltr;
+ enum_constant public static final androidx.compose.ui.text.style.TextDirection Rtl;
}
@androidx.compose.Immutable public final class TextGeometricTransform {
@@ -1020,42 +1020,42 @@
ctor public TextGeometricTransform();
method public float component1();
method public float component2();
- method @androidx.compose.Immutable public androidx.ui.text.style.TextGeometricTransform copy(float scaleX, float skewX);
+ method @androidx.compose.Immutable public androidx.compose.ui.text.style.TextGeometricTransform copy(float scaleX, float skewX);
method public float getScaleX();
method public float getSkewX();
- field public static final androidx.ui.text.style.TextGeometricTransform.Companion Companion;
+ field public static final androidx.compose.ui.text.style.TextGeometricTransform.Companion Companion;
}
public static final class TextGeometricTransform.Companion {
}
public final class TextGeometricTransformKt {
- method public static androidx.ui.text.style.TextGeometricTransform lerp(androidx.ui.text.style.TextGeometricTransform start, androidx.ui.text.style.TextGeometricTransform stop, float fraction);
+ method public static androidx.compose.ui.text.style.TextGeometricTransform lerp(androidx.compose.ui.text.style.TextGeometricTransform start, androidx.compose.ui.text.style.TextGeometricTransform stop, float fraction);
}
@androidx.compose.Immutable public final class TextIndent {
method public long component1();
method public long component2();
- method @androidx.compose.Immutable public androidx.ui.text.style.TextIndent copy-gL_aCS0(long firstLine, long restLine);
+ method @androidx.compose.Immutable public androidx.compose.ui.text.style.TextIndent copy-gL_aCS0(long firstLine, long restLine);
method public long getFirstLine();
method public long getRestLine();
- field public static final androidx.ui.text.style.TextIndent.Companion Companion;
+ field public static final androidx.compose.ui.text.style.TextIndent.Companion Companion;
}
public static final class TextIndent.Companion {
- method public androidx.ui.text.style.TextIndent getNone();
- property public final androidx.ui.text.style.TextIndent None;
+ method public androidx.compose.ui.text.style.TextIndent getNone();
+ property public final androidx.compose.ui.text.style.TextIndent None;
}
public final class TextIndentKt {
- method public static androidx.ui.text.style.TextIndent lerp(androidx.ui.text.style.TextIndent start, androidx.ui.text.style.TextIndent stop, float fraction);
+ 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);
}
public enum TextOverflow {
- method public static androidx.ui.text.style.TextOverflow valueOf(String name) throws java.lang.IllegalArgumentException;
- method public static androidx.ui.text.style.TextOverflow[] values();
- enum_constant public static final androidx.ui.text.style.TextOverflow Clip;
- enum_constant public static final androidx.ui.text.style.TextOverflow Ellipsis;
+ method public static androidx.compose.ui.text.style.TextOverflow valueOf(String name) throws java.lang.IllegalArgumentException;
+ method public static androidx.compose.ui.text.style.TextOverflow[] values();
+ enum_constant public static final androidx.compose.ui.text.style.TextOverflow Clip;
+ enum_constant public static final androidx.compose.ui.text.style.TextOverflow Ellipsis;
}
}
diff --git a/ui/ui-text-core/api/restricted_current.txt b/ui/ui-text-core/api/restricted_current.txt
index b5c1f07..f75dd52 100644
--- a/ui/ui-text-core/api/restricted_current.txt
+++ b/ui/ui-text-core/api/restricted_current.txt
@@ -1,321 +1,38 @@
// Signature format: 3.0
-package androidx.ui.input {
-
- public final class BackspaceKeyEditOp implements androidx.ui.input.EditOperation {
- ctor public BackspaceKeyEditOp();
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- public final class CommitTextEditOp implements androidx.ui.input.EditOperation {
- ctor public CommitTextEditOp(String text, int newCursorPosition);
- method public String component1();
- method public int component2();
- method public androidx.ui.input.CommitTextEditOp copy(String text, int newCursorPosition);
- method public int getNewCursorPosition();
- method public String getText();
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- public final class DeleteAllEditOp implements androidx.ui.input.EditOperation {
- ctor public DeleteAllEditOp();
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- public final class DeleteSurroundingTextEditOp implements androidx.ui.input.EditOperation {
- ctor public DeleteSurroundingTextEditOp(int beforeLength, int afterLength);
- method public int component1();
- method public int component2();
- method public androidx.ui.input.DeleteSurroundingTextEditOp copy(int beforeLength, int afterLength);
- method public int getAfterLength();
- method public int getBeforeLength();
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- public final class DeleteSurroundingTextInCodePointsEditOp implements androidx.ui.input.EditOperation {
- ctor public DeleteSurroundingTextInCodePointsEditOp(int beforeLength, int afterLength);
- method public int component1();
- method public int component2();
- method public androidx.ui.input.DeleteSurroundingTextInCodePointsEditOp copy(int beforeLength, int afterLength);
- method public int getAfterLength();
- method public int getBeforeLength();
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- public interface EditOperation {
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- public final class EditingBuffer {
- ctor public EditingBuffer(String initialText, androidx.ui.text.TextRange initialSelection);
- field public static final int NOWHERE = -1; // 0xffffffff
- }
-
- @Deprecated @androidx.compose.Immutable public final class EditorValue {
- ctor @Deprecated public EditorValue(String text, androidx.ui.text.TextRange selection, androidx.ui.text.TextRange? composition);
- ctor @Deprecated public EditorValue();
- method @Deprecated public String component1();
- method @Deprecated public androidx.ui.text.TextRange component2();
- method @Deprecated public androidx.ui.text.TextRange? component3();
- method @Deprecated @androidx.compose.Immutable public androidx.ui.input.EditorValue copy(String text, androidx.ui.text.TextRange selection, androidx.ui.text.TextRange? composition);
- method @Deprecated public androidx.ui.text.TextRange? getComposition();
- method @Deprecated public String getSelectedText();
- method @Deprecated public androidx.ui.text.TextRange getSelection();
- method @Deprecated public String getText();
- method @Deprecated public String getTextAfterSelection(int maxChars);
- method @Deprecated public String getTextBeforeSelection(int maxChars);
- }
-
- public final class FinishComposingTextEditOp implements androidx.ui.input.EditOperation {
- ctor public FinishComposingTextEditOp();
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- public final class GapBufferKt {
- }
-
- public enum ImeAction {
- method public static androidx.ui.input.ImeAction valueOf(String name) throws java.lang.IllegalArgumentException;
- method public static androidx.ui.input.ImeAction[] values();
- enum_constant public static final androidx.ui.input.ImeAction Done;
- enum_constant public static final androidx.ui.input.ImeAction Go;
- enum_constant public static final androidx.ui.input.ImeAction Next;
- enum_constant public static final androidx.ui.input.ImeAction NoAction;
- enum_constant public static final androidx.ui.input.ImeAction Previous;
- enum_constant public static final androidx.ui.input.ImeAction Search;
- enum_constant public static final androidx.ui.input.ImeAction Send;
- enum_constant public static final androidx.ui.input.ImeAction Unspecified;
- }
-
- public interface InputEventListener {
- method public void onEditOperations(java.util.List<? extends androidx.ui.input.EditOperation> editOps);
- method public void onImeAction(androidx.ui.input.ImeAction imeAction);
- }
-
- public enum KeyboardType {
- method public static androidx.ui.input.KeyboardType valueOf(String name) throws java.lang.IllegalArgumentException;
- method public static androidx.ui.input.KeyboardType[] values();
- enum_constant public static final androidx.ui.input.KeyboardType Ascii;
- enum_constant public static final androidx.ui.input.KeyboardType Email;
- enum_constant public static final androidx.ui.input.KeyboardType Number;
- enum_constant public static final androidx.ui.input.KeyboardType NumberPassword;
- enum_constant public static final androidx.ui.input.KeyboardType Password;
- enum_constant public static final androidx.ui.input.KeyboardType Phone;
- enum_constant public static final androidx.ui.input.KeyboardType Text;
- enum_constant public static final androidx.ui.input.KeyboardType Uri;
- }
-
- public final class MoveCursorEditOp implements androidx.ui.input.EditOperation {
- ctor public MoveCursorEditOp(int amount);
- method public int component1();
- method public androidx.ui.input.MoveCursorEditOp copy(int amount);
- method public int getAmount();
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- public interface OffsetMap {
- method public int originalToTransformed(int offset);
- method public int transformedToOriginal(int offset);
- field public static final androidx.ui.input.OffsetMap.Companion Companion;
- }
-
- public static final class OffsetMap.Companion {
- method public androidx.ui.input.OffsetMap getIdentityOffsetMap();
- property public final androidx.ui.input.OffsetMap identityOffsetMap;
- }
-
- public final class PasswordVisualTransformation implements androidx.ui.input.VisualTransformation {
- ctor public PasswordVisualTransformation(char mask);
- ctor public PasswordVisualTransformation();
- method public char component1();
- method public androidx.ui.input.PasswordVisualTransformation copy(char mask);
- method public androidx.ui.input.TransformedText filter(androidx.ui.text.AnnotatedString text);
- method public char getMask();
- }
-
- public interface PlatformTextInputService {
- method public void hideSoftwareKeyboard();
- method public void notifyFocusedRect(androidx.ui.geometry.Rect rect);
- method public void onStateUpdated(androidx.ui.input.TextFieldValue value);
- method public void showSoftwareKeyboard();
- method public void startInput(androidx.ui.input.TextFieldValue value, androidx.ui.input.KeyboardType keyboardType, androidx.ui.input.ImeAction imeAction, kotlin.jvm.functions.Function1<? super java.util.List<? extends androidx.ui.input.EditOperation>,kotlin.Unit> onEditCommand, kotlin.jvm.functions.Function1<? super androidx.ui.input.ImeAction,kotlin.Unit> onImeActionPerformed);
- method public void stopInput();
- }
-
- public final class SetComposingRegionEditOp implements androidx.ui.input.EditOperation {
- ctor public SetComposingRegionEditOp(int start, int end);
- method public int component1();
- method public int component2();
- method public androidx.ui.input.SetComposingRegionEditOp copy(int start, int end);
- method public int getEnd();
- method public int getStart();
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- public final class SetComposingTextEditOp implements androidx.ui.input.EditOperation {
- ctor public SetComposingTextEditOp(String text, int newCursorPosition);
- method public String component1();
- method public int component2();
- method public androidx.ui.input.SetComposingTextEditOp copy(String text, int newCursorPosition);
- method public int getNewCursorPosition();
- method public String getText();
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- public final class SetSelectionEditOp implements androidx.ui.input.EditOperation {
- ctor public SetSelectionEditOp(int start, int end);
- method public int component1();
- method public int component2();
- method public androidx.ui.input.SetSelectionEditOp copy(int start, int end);
- method public int getEnd();
- method public int getStart();
- method public void process(androidx.ui.input.EditingBuffer buffer);
- }
-
- @androidx.compose.Immutable public final class TextFieldValue {
- ctor public TextFieldValue(String text, androidx.ui.text.TextRange selection, androidx.ui.text.TextRange? composition);
- ctor public TextFieldValue();
- method public String component1();
- method public androidx.ui.text.TextRange component2();
- method public androidx.ui.text.TextRange? component3();
- method @androidx.compose.Immutable public androidx.ui.input.TextFieldValue copy(String text, androidx.ui.text.TextRange selection, androidx.ui.text.TextRange? composition);
- method public androidx.ui.text.TextRange? getComposition();
- method public androidx.ui.text.TextRange getSelection();
- method public String getText();
- field public static final androidx.ui.input.TextFieldValue.Companion Companion;
- }
-
- public static final class TextFieldValue.Companion {
- method public androidx.compose.runtime.savedinstancestate.Saver<androidx.ui.input.TextFieldValue,java.lang.Object> getSaver();
- property public final androidx.compose.runtime.savedinstancestate.Saver<androidx.ui.input.TextFieldValue,java.lang.Object> Saver;
- }
-
- public final class TextFieldValueKt {
- method public static String getSelectedText(androidx.ui.input.TextFieldValue);
- method public static String getTextAfterSelection(androidx.ui.input.TextFieldValue, int maxChars);
- method public static String getTextBeforeSelection(androidx.ui.input.TextFieldValue, int maxChars);
- }
-
- public class TextInputService {
- ctor public TextInputService(androidx.ui.input.PlatformTextInputService platformTextInputService);
- method public void hideSoftwareKeyboard(int token);
- method public void notifyFocusedRect(int token, androidx.ui.geometry.Rect rect);
- method public void onStateUpdated(int token, androidx.ui.input.TextFieldValue value);
- method public void showSoftwareKeyboard(int token);
- method public int startInput(androidx.ui.input.TextFieldValue value, androidx.ui.input.KeyboardType keyboardType, androidx.ui.input.ImeAction imeAction, kotlin.jvm.functions.Function1<? super java.util.List<? extends androidx.ui.input.EditOperation>,kotlin.Unit> onEditCommand, kotlin.jvm.functions.Function1<? super androidx.ui.input.ImeAction,kotlin.Unit> onImeActionPerformed);
- method public void stopInput(int token);
- }
-
- public final class TextInputServiceKt {
- method @Deprecated public static kotlin.jvm.functions.Function1<androidx.ui.input.PlatformTextInputService,androidx.ui.input.TextInputService> getTextInputServiceFactory();
- method @Deprecated public static void setTextInputServiceFactory(kotlin.jvm.functions.Function1<? super androidx.ui.input.PlatformTextInputService,? extends androidx.ui.input.TextInputService> p);
- field public static final int INVALID_SESSION = -1; // 0xffffffff
- field public static final int NO_SESSION = 0; // 0x0
- }
-
- public final class TransformedText {
- ctor public TransformedText(androidx.ui.text.AnnotatedString transformedText, androidx.ui.input.OffsetMap offsetMap);
- method public androidx.ui.text.AnnotatedString component1();
- method public androidx.ui.input.OffsetMap component2();
- method public androidx.ui.input.TransformedText copy(androidx.ui.text.AnnotatedString transformedText, androidx.ui.input.OffsetMap offsetMap);
- method public androidx.ui.input.OffsetMap getOffsetMap();
- method public androidx.ui.text.AnnotatedString getTransformedText();
- }
-
- @androidx.compose.Immutable public interface VisualTransformation {
- method public androidx.ui.input.TransformedText filter(androidx.ui.text.AnnotatedString text);
- field public static final androidx.ui.input.VisualTransformation.Companion Companion;
- }
-
- public static final class VisualTransformation.Companion {
- method public androidx.ui.input.VisualTransformation getNone();
- property public final androidx.ui.input.VisualTransformation None;
- }
-
-}
-
-package androidx.ui.intl {
-
- public final class AndroidPlatformLocaleKt {
- }
-
- @androidx.compose.Immutable public final class Locale {
- ctor public Locale(String languageTag);
- method public String getLanguage();
- method public String getRegion();
- method public String getScript();
- method public String toLanguageTag();
- property public final String language;
- property public final String region;
- property public final String script;
- field public static final androidx.ui.intl.Locale.Companion Companion;
- }
-
- public static final class Locale.Companion {
- method public androidx.ui.intl.Locale getCurrent();
- property public final androidx.ui.intl.Locale current;
- }
-
- @androidx.compose.Immutable public final class LocaleList implements java.util.Collection<androidx.ui.intl.Locale> kotlin.jvm.internal.markers.KMappedMarker {
- ctor public LocaleList(java.util.List<androidx.ui.intl.Locale> localeList);
- ctor public LocaleList(String languageTags);
- ctor public LocaleList(androidx.ui.intl.Locale... locales);
- method public java.util.List<androidx.ui.intl.Locale> component1();
- method public operator boolean contains(androidx.ui.intl.Locale element);
- method public boolean containsAll(java.util.Collection<?> elements);
- method @androidx.compose.Immutable public androidx.ui.intl.LocaleList copy(java.util.List<androidx.ui.intl.Locale> localeList);
- method public operator androidx.ui.intl.Locale get(int i);
- method public java.util.List<androidx.ui.intl.Locale> getLocaleList();
- method public int getSize();
- method public boolean isEmpty();
- method public java.util.Iterator<androidx.ui.intl.Locale> iterator();
- property public int size;
- field public static final androidx.ui.intl.LocaleList.Companion Companion;
- }
-
- public static final class LocaleList.Companion {
- method public androidx.ui.intl.LocaleList getCurrent();
- property public final androidx.ui.intl.LocaleList current;
- }
-
- public final class PlatformLocaleKt {
- }
-
-}
-
-package androidx.ui.text {
+package androidx.compose.ui.text {
@androidx.compose.Immutable public final class AnnotatedString {
- ctor public AnnotatedString(String text, java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.SpanStyle>> spanStyles, java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.ParagraphStyle>> paragraphStyles);
+ ctor public AnnotatedString(String text, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> spanStyles, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.ParagraphStyle>> paragraphStyles);
method public String component1();
- method public java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.SpanStyle>> component2();
- method public java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.ParagraphStyle>> component3();
- method @androidx.compose.Immutable public androidx.ui.text.AnnotatedString copy(String text, java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.SpanStyle>> spanStyles, java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.ParagraphStyle>> paragraphStyles, java.util.List<androidx.ui.text.AnnotatedString.Range<java.lang.String>> annotations);
- method public java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.ParagraphStyle>> getParagraphStyles();
- method public java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.SpanStyle>> getSpanStyles();
- method public java.util.List<androidx.ui.text.AnnotatedString.Range<java.lang.String>> getStringAnnotations(String tag, int start, int end);
- method public java.util.List<androidx.ui.text.AnnotatedString.Range<java.lang.String>> getStringAnnotations(int start, int end);
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> component2();
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.ParagraphStyle>> component3();
+ method @androidx.compose.Immutable public androidx.compose.ui.text.AnnotatedString copy(String text, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> spanStyles, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.ParagraphStyle>> paragraphStyles, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<java.lang.String>> annotations);
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.ParagraphStyle>> getParagraphStyles();
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> getSpanStyles();
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<java.lang.String>> getStringAnnotations(String tag, int start, int end);
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<java.lang.String>> getStringAnnotations(int start, int end);
method public String getText();
- method @androidx.compose.Stable public operator androidx.ui.text.AnnotatedString plus(androidx.ui.text.AnnotatedString other);
+ method @androidx.compose.Stable public operator androidx.compose.ui.text.AnnotatedString plus(androidx.compose.ui.text.AnnotatedString other);
}
public static final class AnnotatedString.Builder {
ctor public AnnotatedString.Builder(int capacity);
ctor public AnnotatedString.Builder();
ctor public AnnotatedString.Builder(String text);
- ctor public AnnotatedString.Builder(androidx.ui.text.AnnotatedString text);
+ ctor public AnnotatedString.Builder(androidx.compose.ui.text.AnnotatedString text);
method public void addStringAnnotation(String scope, String annotation, int start, int end);
- method public void addStyle(androidx.ui.text.SpanStyle style, int start, int end);
- method public void addStyle(androidx.ui.text.ParagraphStyle style, int start, int end);
+ method public void addStyle(androidx.compose.ui.text.SpanStyle style, int start, int end);
+ method public void addStyle(androidx.compose.ui.text.ParagraphStyle style, int start, int end);
method public void append(String text);
method public void append(char p);
- method public void append(androidx.ui.text.AnnotatedString text);
+ method public void append(androidx.compose.ui.text.AnnotatedString text);
method public int getLength();
method public void pop();
method public void pop(int index);
method public int pushStringAnnotation(String tag, String annotation);
- method public int pushStyle(androidx.ui.text.SpanStyle style);
- method public int pushStyle(androidx.ui.text.ParagraphStyle style);
- method public androidx.ui.text.AnnotatedString toAnnotatedString();
+ method public int pushStyle(androidx.compose.ui.text.SpanStyle style);
+ method public int pushStyle(androidx.compose.ui.text.ParagraphStyle style);
+ method public androidx.compose.ui.text.AnnotatedString toAnnotatedString();
property public final int length;
}
@@ -326,7 +43,7 @@
method public int component2();
method public int component3();
method public String component4();
- method public androidx.ui.text.AnnotatedString.Range<T> copy(T! item, int start, int end, String tag);
+ method public androidx.compose.ui.text.AnnotatedString.Range<T> copy(T! item, int start, int end, String tag);
method public int getEnd();
method public T! getItem();
method public int getStart();
@@ -334,18 +51,18 @@
}
public final class AnnotatedStringKt {
- method public static androidx.ui.text.AnnotatedString AnnotatedString(String text, androidx.ui.text.SpanStyle spanStyle, androidx.ui.text.ParagraphStyle? paragraphStyle = null);
- method public static androidx.ui.text.AnnotatedString AnnotatedString(String text, androidx.ui.text.ParagraphStyle paragraphStyle);
- method @Deprecated public static inline androidx.ui.text.AnnotatedString AnnotatedString(kotlin.jvm.functions.Function1<? super androidx.ui.text.AnnotatedString.Builder,kotlin.Unit> builder);
- method public static inline androidx.ui.text.AnnotatedString annotatedString(kotlin.jvm.functions.Function1<? super androidx.ui.text.AnnotatedString.Builder,kotlin.Unit> builder);
- method public static androidx.ui.text.AnnotatedString capitalize(androidx.ui.text.AnnotatedString, androidx.ui.intl.LocaleList localeList = LocaleList.current);
- method public static androidx.ui.text.AnnotatedString decapitalize(androidx.ui.text.AnnotatedString, androidx.ui.intl.LocaleList localeList = LocaleList.current);
- method public static int getLength(androidx.ui.text.AnnotatedString);
- method public static androidx.ui.text.AnnotatedString subSequence(androidx.ui.text.AnnotatedString, int start, int end);
- method public static androidx.ui.text.AnnotatedString toLowerCase(androidx.ui.text.AnnotatedString, androidx.ui.intl.LocaleList localeList = LocaleList.current);
- method public static androidx.ui.text.AnnotatedString toUpperCase(androidx.ui.text.AnnotatedString, androidx.ui.intl.LocaleList localeList = LocaleList.current);
- method public static inline <R> R withStyle(androidx.ui.text.AnnotatedString.Builder, androidx.ui.text.SpanStyle style, kotlin.jvm.functions.Function1<? super androidx.ui.text.AnnotatedString.Builder,? extends R> block);
- method public static inline <R> R withStyle(androidx.ui.text.AnnotatedString.Builder, androidx.ui.text.ParagraphStyle style, kotlin.jvm.functions.Function1<? super androidx.ui.text.AnnotatedString.Builder,? extends R> block);
+ method public static androidx.compose.ui.text.AnnotatedString AnnotatedString(String text, androidx.compose.ui.text.SpanStyle spanStyle, androidx.compose.ui.text.ParagraphStyle? paragraphStyle = null);
+ method public static androidx.compose.ui.text.AnnotatedString AnnotatedString(String text, androidx.compose.ui.text.ParagraphStyle paragraphStyle);
+ method @Deprecated public static inline androidx.compose.ui.text.AnnotatedString AnnotatedString(kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.AnnotatedString.Builder,kotlin.Unit> builder);
+ method public static inline androidx.compose.ui.text.AnnotatedString annotatedString(kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.AnnotatedString.Builder,kotlin.Unit> builder);
+ method public static androidx.compose.ui.text.AnnotatedString capitalize(androidx.compose.ui.text.AnnotatedString, androidx.compose.ui.text.intl.LocaleList localeList = LocaleList.current);
+ method public static androidx.compose.ui.text.AnnotatedString decapitalize(androidx.compose.ui.text.AnnotatedString, androidx.compose.ui.text.intl.LocaleList localeList = LocaleList.current);
+ method public static int getLength(androidx.compose.ui.text.AnnotatedString);
+ method public static androidx.compose.ui.text.AnnotatedString subSequence(androidx.compose.ui.text.AnnotatedString, int start, int end);
+ method public static androidx.compose.ui.text.AnnotatedString toLowerCase(androidx.compose.ui.text.AnnotatedString, androidx.compose.ui.text.intl.LocaleList localeList = LocaleList.current);
+ method public static androidx.compose.ui.text.AnnotatedString toUpperCase(androidx.compose.ui.text.AnnotatedString, androidx.compose.ui.text.intl.LocaleList localeList = LocaleList.current);
+ method public static inline <R> R withStyle(androidx.compose.ui.text.AnnotatedString.Builder, androidx.compose.ui.text.SpanStyle style, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.AnnotatedString.Builder,? extends R> block);
+ method public static inline <R> R withStyle(androidx.compose.ui.text.AnnotatedString.Builder, androidx.compose.ui.text.ParagraphStyle style, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.AnnotatedString.Builder,? extends R> block);
}
@kotlin.RequiresOptIn(level=RequiresOptIn.Level.ERROR, message="This is internal API that may change frequently and without warning.") @kotlin.annotation.Target(allowedTargets={AnnotationTarget.CLASS, AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY}) public @interface InternalTextApi {
@@ -355,16 +72,16 @@
}
public final class MultiParagraph {
- ctor public MultiParagraph(androidx.ui.text.MultiParagraphIntrinsics intrinsics, int maxLines, boolean ellipsis, androidx.ui.text.ParagraphConstraints constraints);
- ctor public MultiParagraph(androidx.ui.text.AnnotatedString annotatedString, androidx.ui.text.TextStyle style, java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>> placeholders, int maxLines, boolean ellipsis, androidx.ui.text.ParagraphConstraints constraints, androidx.ui.unit.Density density, androidx.ui.text.font.Font.ResourceLoader resourceLoader);
- method public androidx.ui.text.style.ResolvedTextDirection getBidiRunDirection(int offset);
+ ctor public MultiParagraph(androidx.compose.ui.text.MultiParagraphIntrinsics intrinsics, int maxLines, boolean ellipsis, androidx.compose.ui.text.ParagraphConstraints constraints);
+ ctor public MultiParagraph(androidx.compose.ui.text.AnnotatedString annotatedString, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, int maxLines, boolean ellipsis, androidx.compose.ui.text.ParagraphConstraints constraints, androidx.ui.unit.Density density, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getBidiRunDirection(int offset);
method public androidx.ui.geometry.Rect getBoundingBox(int offset);
method public androidx.ui.geometry.Rect getCursorRect(int offset);
method public boolean getDidExceedMaxLines();
method public float getFirstBaseline();
method public float getHeight();
method public float getHorizontalPosition(int offset, boolean usePrimaryDirection);
- method public androidx.ui.text.MultiParagraphIntrinsics getIntrinsics();
+ method public androidx.compose.ui.text.MultiParagraphIntrinsics getIntrinsics();
method public float getLastBaseline();
method public float getLineBottom(int lineIndex);
method public int getLineCount();
@@ -382,11 +99,11 @@
method public int getMaxLines();
method public float getMinIntrinsicWidth();
method public int getOffsetForPosition(androidx.ui.geometry.Offset position);
- method public androidx.ui.text.style.ResolvedTextDirection getParagraphDirection(int offset);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getParagraphDirection(int offset);
method public androidx.ui.graphics.Path getPathForRange(int start, int end);
method public java.util.List<androidx.ui.geometry.Rect> getPlaceholderRects();
method public float getWidth();
- method public androidx.ui.text.TextRange getWordBoundary(int offset);
+ method public androidx.compose.ui.text.TextRange getWordBoundary(int offset);
method public void paint(androidx.ui.graphics.Canvas canvas);
property public final boolean didExceedMaxLines;
property public final float firstBaseline;
@@ -399,12 +116,12 @@
property public final float width;
}
- public final class MultiParagraphIntrinsics implements androidx.ui.text.ParagraphIntrinsics {
- ctor public MultiParagraphIntrinsics(androidx.ui.text.AnnotatedString annotatedString, androidx.ui.text.TextStyle style, java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>> placeholders, androidx.ui.unit.Density density, androidx.ui.text.font.Font.ResourceLoader resourceLoader);
- method public androidx.ui.text.AnnotatedString getAnnotatedString();
+ public final class MultiParagraphIntrinsics implements androidx.compose.ui.text.ParagraphIntrinsics {
+ ctor public MultiParagraphIntrinsics(androidx.compose.ui.text.AnnotatedString annotatedString, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, androidx.ui.unit.Density density, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader);
+ method public androidx.compose.ui.text.AnnotatedString getAnnotatedString();
method public float getMaxIntrinsicWidth();
method public float getMinIntrinsicWidth();
- method public java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>> getPlaceholders();
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> getPlaceholders();
property public float maxIntrinsicWidth;
property public float minIntrinsicWidth;
}
@@ -416,7 +133,7 @@
}
public interface Paragraph {
- method public androidx.ui.text.style.ResolvedTextDirection getBidiRunDirection(int offset);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getBidiRunDirection(int offset);
method public androidx.ui.geometry.Rect getBoundingBox(int offset);
method public androidx.ui.geometry.Rect getCursorRect(int offset);
method public boolean getDidExceedMaxLines();
@@ -439,11 +156,11 @@
method public float getMaxIntrinsicWidth();
method public float getMinIntrinsicWidth();
method public int getOffsetForPosition(androidx.ui.geometry.Offset position);
- method public androidx.ui.text.style.ResolvedTextDirection getParagraphDirection(int offset);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getParagraphDirection(int offset);
method public androidx.ui.graphics.Path getPathForRange(int start, int end);
method public java.util.List<androidx.ui.geometry.Rect> getPlaceholderRects();
method public float getWidth();
- method public androidx.ui.text.TextRange getWordBoundary(int offset);
+ method public androidx.compose.ui.text.TextRange getWordBoundary(int offset);
method public void paint(androidx.ui.graphics.Canvas canvas);
property public abstract boolean didExceedMaxLines;
property public abstract float firstBaseline;
@@ -459,7 +176,7 @@
public final class ParagraphConstraints {
ctor public ParagraphConstraints(float width);
method public float component1();
- method public androidx.ui.text.ParagraphConstraints copy(float width);
+ method public androidx.compose.ui.text.ParagraphConstraints copy(float width);
method public float getWidth();
}
@@ -471,56 +188,56 @@
}
public final class ParagraphIntrinsicsKt {
- method public static androidx.ui.text.ParagraphIntrinsics ParagraphIntrinsics(String text, androidx.ui.text.TextStyle style, java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.SpanStyle>> spanStyles = listOf(), java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>> placeholders = listOf(), androidx.ui.unit.Density density, androidx.ui.text.font.Font.ResourceLoader resourceLoader);
+ method public static androidx.compose.ui.text.ParagraphIntrinsics ParagraphIntrinsics(String text, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> spanStyles = listOf(), java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders = listOf(), androidx.ui.unit.Density density, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader);
}
public final class ParagraphKt {
- method public static androidx.ui.text.Paragraph Paragraph(String text, androidx.ui.text.TextStyle style, java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.SpanStyle>> spanStyles = listOf(), java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>> placeholders = listOf(), int maxLines = 2147483647, boolean ellipsis = false, androidx.ui.text.ParagraphConstraints constraints, androidx.ui.unit.Density density, androidx.ui.text.font.Font.ResourceLoader resourceLoader);
- method public static androidx.ui.text.Paragraph Paragraph(androidx.ui.text.ParagraphIntrinsics paragraphIntrinsics, int maxLines = 2147483647, boolean ellipsis = false, androidx.ui.text.ParagraphConstraints constraints);
+ method public static androidx.compose.ui.text.Paragraph Paragraph(String text, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>> spanStyles = listOf(), java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders = listOf(), int maxLines = 2147483647, boolean ellipsis = false, androidx.compose.ui.text.ParagraphConstraints constraints, androidx.ui.unit.Density density, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader);
+ method public static androidx.compose.ui.text.Paragraph Paragraph(androidx.compose.ui.text.ParagraphIntrinsics paragraphIntrinsics, int maxLines = 2147483647, boolean ellipsis = false, androidx.compose.ui.text.ParagraphConstraints constraints);
}
@androidx.compose.Immutable public final class ParagraphStyle {
- method public androidx.ui.text.style.TextAlign? component1();
- method public androidx.ui.text.style.TextDirection? component2();
+ method public androidx.compose.ui.text.style.TextAlign? component1();
+ method public androidx.compose.ui.text.style.TextDirection? component2();
method public long component3();
- method public androidx.ui.text.style.TextIndent? component4();
- method @androidx.compose.Immutable public androidx.ui.text.ParagraphStyle copy-JVmhFNw(androidx.ui.text.style.TextAlign? textAlign, androidx.ui.text.style.TextDirection? textDirection, long lineHeight, androidx.ui.text.style.TextIndent? textIndent);
+ method public androidx.compose.ui.text.style.TextIndent? component4();
+ method @androidx.compose.Immutable public androidx.compose.ui.text.ParagraphStyle copy-yfYFPjM(androidx.compose.ui.text.style.TextAlign? textAlign, androidx.compose.ui.text.style.TextDirection? textDirection, long lineHeight, androidx.compose.ui.text.style.TextIndent? textIndent);
method public long getLineHeight();
- method public androidx.ui.text.style.TextAlign? getTextAlign();
- method public androidx.ui.text.style.TextDirection? getTextDirection();
- method public androidx.ui.text.style.TextIndent? getTextIndent();
- method @androidx.compose.Stable public androidx.ui.text.ParagraphStyle merge(androidx.ui.text.ParagraphStyle? other = null);
- method @androidx.compose.Stable public operator androidx.ui.text.ParagraphStyle plus(androidx.ui.text.ParagraphStyle other);
+ 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.Stable public androidx.compose.ui.text.ParagraphStyle merge(androidx.compose.ui.text.ParagraphStyle? other = null);
+ method @androidx.compose.Stable public operator androidx.compose.ui.text.ParagraphStyle plus(androidx.compose.ui.text.ParagraphStyle other);
}
public final class ParagraphStyleKt {
- method @androidx.compose.Stable public static androidx.ui.text.ParagraphStyle lerp(androidx.ui.text.ParagraphStyle start, androidx.ui.text.ParagraphStyle stop, float fraction);
+ method @androidx.compose.Stable public static androidx.compose.ui.text.ParagraphStyle lerp(androidx.compose.ui.text.ParagraphStyle start, androidx.compose.ui.text.ParagraphStyle stop, float fraction);
}
@androidx.compose.Immutable public final class Placeholder {
method public long component1();
method public long component2();
- method public androidx.ui.text.PlaceholderVerticalAlign component3();
- method @androidx.compose.Immutable public androidx.ui.text.Placeholder copy-eLqjHCw(long width, long height, androidx.ui.text.PlaceholderVerticalAlign placeholderVerticalAlign);
+ method public androidx.compose.ui.text.PlaceholderVerticalAlign component3();
+ method @androidx.compose.Immutable public androidx.compose.ui.text.Placeholder copy-LxtbTAo(long width, long height, androidx.compose.ui.text.PlaceholderVerticalAlign placeholderVerticalAlign);
method public long getHeight();
- method public androidx.ui.text.PlaceholderVerticalAlign getPlaceholderVerticalAlign();
+ method public androidx.compose.ui.text.PlaceholderVerticalAlign getPlaceholderVerticalAlign();
method public long getWidth();
}
public enum PlaceholderVerticalAlign {
- method public static androidx.ui.text.PlaceholderVerticalAlign valueOf(String name) throws java.lang.IllegalArgumentException;
- method public static androidx.ui.text.PlaceholderVerticalAlign[] values();
- enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign AboveBaseline;
- enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign Bottom;
- enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign Center;
- enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign TextBottom;
- enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign TextCenter;
- enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign TextTop;
- enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign Top;
+ method public static androidx.compose.ui.text.PlaceholderVerticalAlign valueOf(String name) throws java.lang.IllegalArgumentException;
+ method public static androidx.compose.ui.text.PlaceholderVerticalAlign[] values();
+ enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign AboveBaseline;
+ enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign Bottom;
+ enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign Center;
+ enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign TextBottom;
+ enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign TextCenter;
+ enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign TextTop;
+ enum_constant public static final androidx.compose.ui.text.PlaceholderVerticalAlign Top;
}
public final class SoftwareKeyboardController {
- ctor public SoftwareKeyboardController(androidx.ui.input.TextInputService textInputService, int token);
+ ctor public SoftwareKeyboardController(androidx.compose.ui.text.input.TextInputService textInputService, int token);
method public void hideSoftwareKeyboard();
method public void notifyFocusedRect(androidx.ui.geometry.Rect rect);
method public void showSoftwareKeyboard();
@@ -528,86 +245,86 @@
@androidx.compose.Immutable public final class SpanStyle {
method public long component1();
- method public androidx.ui.text.style.TextGeometricTransform? component10();
- method public androidx.ui.intl.LocaleList? component11();
+ method public androidx.compose.ui.text.style.TextGeometricTransform? component10();
+ method public androidx.compose.ui.text.intl.LocaleList? component11();
method public long component12();
- method public androidx.ui.text.style.TextDecoration? component13();
+ method public androidx.compose.ui.text.style.TextDecoration? component13();
method public androidx.ui.graphics.Shadow? component14();
method public long component2();
- method public androidx.ui.text.font.FontWeight? component3();
- method public androidx.ui.text.font.FontStyle? component4();
- method public androidx.ui.text.font.FontSynthesis? component5();
- method public androidx.ui.text.font.FontFamily? component6();
+ method public androidx.compose.ui.text.font.FontWeight? component3();
+ method public androidx.compose.ui.text.font.FontStyle? component4();
+ method public androidx.compose.ui.text.font.FontSynthesis? component5();
+ method public androidx.compose.ui.text.font.FontFamily? component6();
method public String? component7();
method public long component8();
- method public androidx.ui.text.style.BaselineShift? component9();
- method @androidx.compose.Immutable public androidx.ui.text.SpanStyle copy-HjQ0eR4(long color, long fontSize, androidx.ui.text.font.FontWeight? fontWeight, androidx.ui.text.font.FontStyle? fontStyle, androidx.ui.text.font.FontSynthesis? fontSynthesis, androidx.ui.text.font.FontFamily? fontFamily, String? fontFeatureSettings, long letterSpacing, androidx.ui.text.style.BaselineShift? baselineShift, androidx.ui.text.style.TextGeometricTransform? textGeometricTransform, androidx.ui.intl.LocaleList? localeList, long background, androidx.ui.text.style.TextDecoration? textDecoration, androidx.ui.graphics.Shadow? shadow);
+ method public androidx.compose.ui.text.style.BaselineShift? component9();
+ method @androidx.compose.Immutable public androidx.compose.ui.text.SpanStyle copy-3JaCuMk(long color, long fontSize, androidx.compose.ui.text.font.FontWeight? fontWeight, androidx.compose.ui.text.font.FontStyle? fontStyle, androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, androidx.compose.ui.text.font.FontFamily? fontFamily, String? fontFeatureSettings, long letterSpacing, androidx.compose.ui.text.style.BaselineShift? baselineShift, androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, androidx.compose.ui.text.intl.LocaleList? localeList, long background, androidx.compose.ui.text.style.TextDecoration? textDecoration, androidx.ui.graphics.Shadow? shadow);
method public long getBackground();
- method public androidx.ui.text.style.BaselineShift? getBaselineShift();
+ method public androidx.compose.ui.text.style.BaselineShift? getBaselineShift();
method public long getColor();
- method public androidx.ui.text.font.FontFamily? getFontFamily();
+ method public androidx.compose.ui.text.font.FontFamily? getFontFamily();
method public String? getFontFeatureSettings();
method public long getFontSize();
- method public androidx.ui.text.font.FontStyle? getFontStyle();
- method public androidx.ui.text.font.FontSynthesis? getFontSynthesis();
- method public androidx.ui.text.font.FontWeight? getFontWeight();
+ method public androidx.compose.ui.text.font.FontStyle? getFontStyle();
+ method public androidx.compose.ui.text.font.FontSynthesis? getFontSynthesis();
+ method public androidx.compose.ui.text.font.FontWeight? getFontWeight();
method public long getLetterSpacing();
- method public androidx.ui.intl.LocaleList? getLocaleList();
+ method public androidx.compose.ui.text.intl.LocaleList? getLocaleList();
method public androidx.ui.graphics.Shadow? getShadow();
- method public androidx.ui.text.style.TextDecoration? getTextDecoration();
- method public androidx.ui.text.style.TextGeometricTransform? getTextGeometricTransform();
- method @androidx.compose.Stable public androidx.ui.text.SpanStyle merge(androidx.ui.text.SpanStyle? other = null);
- method @androidx.compose.Stable public operator androidx.ui.text.SpanStyle plus(androidx.ui.text.SpanStyle other);
+ method public androidx.compose.ui.text.style.TextDecoration? getTextDecoration();
+ method public androidx.compose.ui.text.style.TextGeometricTransform? getTextGeometricTransform();
+ method @androidx.compose.Stable public androidx.compose.ui.text.SpanStyle merge(androidx.compose.ui.text.SpanStyle? other = null);
+ method @androidx.compose.Stable public operator androidx.compose.ui.text.SpanStyle plus(androidx.compose.ui.text.SpanStyle other);
}
public final class SpanStyleKt {
- method public static androidx.ui.text.SpanStyle lerp(androidx.ui.text.SpanStyle start, androidx.ui.text.SpanStyle stop, float fraction);
+ method public static androidx.compose.ui.text.SpanStyle lerp(androidx.compose.ui.text.SpanStyle start, androidx.compose.ui.text.SpanStyle stop, float fraction);
}
public final class StringKt {
- method public static String capitalize(String, androidx.ui.intl.Locale locale);
- method public static String capitalize(String, androidx.ui.intl.LocaleList localeList);
- method public static String decapitalize(String, androidx.ui.intl.Locale locale);
- method public static String decapitalize(String, androidx.ui.intl.LocaleList localeList);
- method public static String toLowerCase(String, androidx.ui.intl.Locale locale);
- method public static String toLowerCase(String, androidx.ui.intl.LocaleList localeList);
- method public static String toUpperCase(String, androidx.ui.intl.Locale locale);
- method public static String toUpperCase(String, androidx.ui.intl.LocaleList localeList);
+ method public static String capitalize(String, androidx.compose.ui.text.intl.Locale locale);
+ method public static String capitalize(String, androidx.compose.ui.text.intl.LocaleList localeList);
+ method public static String decapitalize(String, androidx.compose.ui.text.intl.Locale locale);
+ method public static String decapitalize(String, androidx.compose.ui.text.intl.LocaleList localeList);
+ method public static String toLowerCase(String, androidx.compose.ui.text.intl.Locale locale);
+ method public static String toLowerCase(String, androidx.compose.ui.text.intl.LocaleList localeList);
+ method public static String toUpperCase(String, androidx.compose.ui.text.intl.Locale locale);
+ method public static String toUpperCase(String, androidx.compose.ui.text.intl.LocaleList localeList);
}
public final class TextLayoutHelperKt {
}
public final class TextLayoutInput {
- ctor public TextLayoutInput(androidx.ui.text.AnnotatedString text, androidx.ui.text.TextStyle style, java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>> placeholders, int maxLines, boolean softWrap, androidx.ui.text.style.TextOverflow overflow, androidx.ui.unit.Density density, androidx.ui.core.LayoutDirection layoutDirection, androidx.ui.text.font.Font.ResourceLoader resourceLoader, androidx.ui.core.Constraints constraints);
- method public androidx.ui.text.AnnotatedString component1();
+ ctor public TextLayoutInput(androidx.compose.ui.text.AnnotatedString text, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, int maxLines, boolean softWrap, androidx.compose.ui.text.style.TextOverflow overflow, androidx.ui.unit.Density density, androidx.ui.core.LayoutDirection layoutDirection, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader, androidx.ui.core.Constraints constraints);
+ method public androidx.compose.ui.text.AnnotatedString component1();
method public androidx.ui.core.Constraints component10();
- method public androidx.ui.text.TextStyle component2();
- method public java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>> component3();
+ method public androidx.compose.ui.text.TextStyle component2();
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> component3();
method public int component4();
method public boolean component5();
- method public androidx.ui.text.style.TextOverflow component6();
+ method public androidx.compose.ui.text.style.TextOverflow component6();
method public androidx.ui.unit.Density component7();
method public androidx.ui.core.LayoutDirection component8();
- method public androidx.ui.text.font.Font.ResourceLoader component9();
- method public androidx.ui.text.TextLayoutInput copy(androidx.ui.text.AnnotatedString text, androidx.ui.text.TextStyle style, java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>> placeholders, int maxLines, boolean softWrap, androidx.ui.text.style.TextOverflow overflow, androidx.ui.unit.Density density, androidx.ui.core.LayoutDirection layoutDirection, androidx.ui.text.font.Font.ResourceLoader resourceLoader, androidx.ui.core.Constraints constraints);
+ method public androidx.compose.ui.text.font.Font.ResourceLoader component9();
+ method public androidx.compose.ui.text.TextLayoutInput copy(androidx.compose.ui.text.AnnotatedString text, androidx.compose.ui.text.TextStyle style, java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> placeholders, int maxLines, boolean softWrap, androidx.compose.ui.text.style.TextOverflow overflow, androidx.ui.unit.Density density, androidx.ui.core.LayoutDirection layoutDirection, androidx.compose.ui.text.font.Font.ResourceLoader resourceLoader, androidx.ui.core.Constraints constraints);
method public androidx.ui.core.Constraints getConstraints();
method public androidx.ui.unit.Density getDensity();
method public androidx.ui.core.LayoutDirection getLayoutDirection();
method public int getMaxLines();
- method public androidx.ui.text.style.TextOverflow getOverflow();
- method public java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>> getPlaceholders();
- method public androidx.ui.text.font.Font.ResourceLoader getResourceLoader();
+ method public androidx.compose.ui.text.style.TextOverflow getOverflow();
+ method public java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>> getPlaceholders();
+ method public androidx.compose.ui.text.font.Font.ResourceLoader getResourceLoader();
method public boolean getSoftWrap();
- method public androidx.ui.text.TextStyle getStyle();
- method public androidx.ui.text.AnnotatedString getText();
+ method public androidx.compose.ui.text.TextStyle getStyle();
+ method public androidx.compose.ui.text.AnnotatedString getText();
}
public final class TextLayoutResult {
- method public androidx.ui.text.TextLayoutInput component1();
+ method public androidx.compose.ui.text.TextLayoutInput component1();
method public androidx.ui.unit.IntSize component3();
- method public androidx.ui.text.TextLayoutResult copy(androidx.ui.text.TextLayoutInput layoutInput, androidx.ui.text.MultiParagraph multiParagraph, androidx.ui.unit.IntSize size);
- method public androidx.ui.text.style.ResolvedTextDirection getBidiRunDirection(int offset);
+ method public androidx.compose.ui.text.TextLayoutResult copy(androidx.compose.ui.text.TextLayoutInput layoutInput, androidx.compose.ui.text.MultiParagraph multiParagraph, androidx.ui.unit.IntSize size);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getBidiRunDirection(int offset);
method public androidx.ui.geometry.Rect getBoundingBox(int offset);
method public androidx.ui.geometry.Rect getCursorRect(int offset);
method public boolean getDidOverflowHeight();
@@ -616,7 +333,7 @@
method public boolean getHasVisualOverflow();
method public float getHorizontalPosition(int offset, boolean usePrimaryDirection);
method public float getLastBaseline();
- method public androidx.ui.text.TextLayoutInput getLayoutInput();
+ method public androidx.compose.ui.text.TextLayoutInput getLayoutInput();
method public float getLineBottom(int lineIndex);
method public int getLineCount();
method public int getLineEnd(int lineIndex);
@@ -626,11 +343,11 @@
method public int getLineStart(int lineIndex);
method public float getLineTop(int lineIndex);
method public int getOffsetForPosition(androidx.ui.geometry.Offset position);
- method public androidx.ui.text.style.ResolvedTextDirection getParagraphDirection(int offset);
+ method public androidx.compose.ui.text.style.ResolvedTextDirection getParagraphDirection(int offset);
method public androidx.ui.graphics.Path getPathForRange(int start, int end);
method public java.util.List<androidx.ui.geometry.Rect> getPlaceholderRects();
method public androidx.ui.unit.IntSize getSize();
- method public androidx.ui.text.TextRange getWordBoundary(int offset);
+ method public androidx.compose.ui.text.TextRange getWordBoundary(int offset);
property public final boolean didOverflowHeight;
property public final boolean didOverflowWidth;
property public final float firstBaseline;
@@ -641,17 +358,17 @@
}
public final class TextPainter {
- method public void paint(androidx.ui.graphics.Canvas canvas, androidx.ui.text.TextLayoutResult textLayoutResult);
- field public static final androidx.ui.text.TextPainter INSTANCE;
+ method public void paint(androidx.ui.graphics.Canvas canvas, androidx.compose.ui.text.TextLayoutResult textLayoutResult);
+ field public static final androidx.compose.ui.text.TextPainter INSTANCE;
}
@androidx.compose.Immutable public final class TextRange {
ctor public TextRange(@IntRange(from=null) int start, @IntRange(from=null) int end);
method public int component1();
method public int component2();
- method public operator boolean contains(androidx.ui.text.TextRange other);
+ method public operator boolean contains(androidx.compose.ui.text.TextRange other);
method public operator boolean contains(int offset);
- method @androidx.compose.Immutable public androidx.ui.text.TextRange copy(int start, int end);
+ method @androidx.compose.Immutable public androidx.compose.ui.text.TextRange copy(int start, int end);
method public boolean getCollapsed();
method public int getEnd();
method public int getLength();
@@ -659,274 +376,557 @@
method public int getMin();
method public boolean getReversed();
method public int getStart();
- method public boolean intersects(androidx.ui.text.TextRange other);
+ method public boolean intersects(androidx.compose.ui.text.TextRange other);
property public final boolean collapsed;
property public final int length;
property public final int max;
property public final int min;
property public final boolean reversed;
- field public static final androidx.ui.text.TextRange.Companion Companion;
+ field public static final androidx.compose.ui.text.TextRange.Companion Companion;
}
public static final class TextRange.Companion {
- method public androidx.ui.text.TextRange getZero();
- property public final androidx.ui.text.TextRange Zero;
+ method public androidx.compose.ui.text.TextRange getZero();
+ property public final androidx.compose.ui.text.TextRange Zero;
}
public final class TextRangeKt {
- method public static androidx.ui.text.TextRange TextRange(int index);
- method public static String substring(CharSequence, androidx.ui.text.TextRange range);
+ method public static androidx.compose.ui.text.TextRange TextRange(int index);
+ method public static String substring(CharSequence, androidx.compose.ui.text.TextRange range);
}
@androidx.compose.Immutable public final class TextStyle {
method public long component1();
- method public androidx.ui.text.style.TextGeometricTransform? component10();
- method public androidx.ui.intl.LocaleList? component11();
+ method public androidx.compose.ui.text.style.TextGeometricTransform? component10();
+ method public androidx.compose.ui.text.intl.LocaleList? component11();
method public long component12();
- method public androidx.ui.text.style.TextDecoration? component13();
+ method public androidx.compose.ui.text.style.TextDecoration? component13();
method public androidx.ui.graphics.Shadow? component14();
- method public androidx.ui.text.style.TextAlign? component15();
- method public androidx.ui.text.style.TextDirection? component16();
+ method public androidx.compose.ui.text.style.TextAlign? component15();
+ method public androidx.compose.ui.text.style.TextDirection? component16();
method public long component17();
- method public androidx.ui.text.style.TextIndent? component18();
+ method public androidx.compose.ui.text.style.TextIndent? component18();
method public long component2();
- method public androidx.ui.text.font.FontWeight? component3();
- method public androidx.ui.text.font.FontStyle? component4();
- method public androidx.ui.text.font.FontSynthesis? component5();
- method public androidx.ui.text.font.FontFamily? component6();
+ method public androidx.compose.ui.text.font.FontWeight? component3();
+ method public androidx.compose.ui.text.font.FontStyle? component4();
+ method public androidx.compose.ui.text.font.FontSynthesis? component5();
+ method public androidx.compose.ui.text.font.FontFamily? component6();
method public String? component7();
method public long component8();
- method public androidx.ui.text.style.BaselineShift? component9();
- method @androidx.compose.Immutable public androidx.ui.text.TextStyle copy-7aJ7aFo(long color, long fontSize, androidx.ui.text.font.FontWeight? fontWeight, androidx.ui.text.font.FontStyle? fontStyle, androidx.ui.text.font.FontSynthesis? fontSynthesis, androidx.ui.text.font.FontFamily? fontFamily, String? fontFeatureSettings, long letterSpacing, androidx.ui.text.style.BaselineShift? baselineShift, androidx.ui.text.style.TextGeometricTransform? textGeometricTransform, androidx.ui.intl.LocaleList? localeList, long background, androidx.ui.text.style.TextDecoration? textDecoration, androidx.ui.graphics.Shadow? shadow, androidx.ui.text.style.TextAlign? textAlign, androidx.ui.text.style.TextDirection? textDirection, long lineHeight, androidx.ui.text.style.TextIndent? textIndent);
+ method public androidx.compose.ui.text.style.BaselineShift? component9();
+ method @androidx.compose.Immutable public androidx.compose.ui.text.TextStyle copy-7Y_OIKU(long color, long fontSize, androidx.compose.ui.text.font.FontWeight? fontWeight, androidx.compose.ui.text.font.FontStyle? fontStyle, androidx.compose.ui.text.font.FontSynthesis? fontSynthesis, androidx.compose.ui.text.font.FontFamily? fontFamily, String? fontFeatureSettings, long letterSpacing, androidx.compose.ui.text.style.BaselineShift? baselineShift, androidx.compose.ui.text.style.TextGeometricTransform? textGeometricTransform, androidx.compose.ui.text.intl.LocaleList? localeList, long background, androidx.compose.ui.text.style.TextDecoration? textDecoration, androidx.ui.graphics.Shadow? shadow, androidx.compose.ui.text.style.TextAlign? textAlign, androidx.compose.ui.text.style.TextDirection? textDirection, long lineHeight, androidx.compose.ui.text.style.TextIndent? textIndent);
method public long getBackground();
- method public androidx.ui.text.style.BaselineShift? getBaselineShift();
+ method public androidx.compose.ui.text.style.BaselineShift? getBaselineShift();
method public long getColor();
- method public androidx.ui.text.font.FontFamily? getFontFamily();
+ method public androidx.compose.ui.text.font.FontFamily? getFontFamily();
method public String? getFontFeatureSettings();
method public long getFontSize();
- method public androidx.ui.text.font.FontStyle? getFontStyle();
- method public androidx.ui.text.font.FontSynthesis? getFontSynthesis();
- method public androidx.ui.text.font.FontWeight? getFontWeight();
+ method public androidx.compose.ui.text.font.FontStyle? getFontStyle();
+ method public androidx.compose.ui.text.font.FontSynthesis? getFontSynthesis();
+ method public androidx.compose.ui.text.font.FontWeight? getFontWeight();
method public long getLetterSpacing();
method public long getLineHeight();
- method public androidx.ui.intl.LocaleList? getLocaleList();
+ method public androidx.compose.ui.text.intl.LocaleList? getLocaleList();
method public androidx.ui.graphics.Shadow? getShadow();
- method public androidx.ui.text.style.TextAlign? getTextAlign();
- method public androidx.ui.text.style.TextDecoration? getTextDecoration();
- method public androidx.ui.text.style.TextDirection? getTextDirection();
- method public androidx.ui.text.style.TextGeometricTransform? getTextGeometricTransform();
- method public androidx.ui.text.style.TextIndent? getTextIndent();
- method @androidx.compose.Stable public androidx.ui.text.TextStyle merge(androidx.ui.text.TextStyle? other = null);
- method @androidx.compose.Stable public androidx.ui.text.TextStyle merge(androidx.ui.text.SpanStyle other);
- method @androidx.compose.Stable public androidx.ui.text.TextStyle merge(androidx.ui.text.ParagraphStyle other);
- method @androidx.compose.Stable public operator androidx.ui.text.TextStyle plus(androidx.ui.text.TextStyle other);
- method @androidx.compose.Stable public operator androidx.ui.text.TextStyle plus(androidx.ui.text.ParagraphStyle other);
- method @androidx.compose.Stable public operator androidx.ui.text.TextStyle plus(androidx.ui.text.SpanStyle other);
- method @androidx.compose.Stable public androidx.ui.text.ParagraphStyle toParagraphStyle();
- method @androidx.compose.Stable public androidx.ui.text.SpanStyle toSpanStyle();
- field public static final androidx.ui.text.TextStyle.Companion Companion;
+ method public androidx.compose.ui.text.style.TextAlign? getTextAlign();
+ method public androidx.compose.ui.text.style.TextDecoration? getTextDecoration();
+ 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.Stable public androidx.compose.ui.text.TextStyle merge(androidx.compose.ui.text.TextStyle? other = null);
+ method @androidx.compose.Stable public androidx.compose.ui.text.TextStyle merge(androidx.compose.ui.text.SpanStyle other);
+ method @androidx.compose.Stable public androidx.compose.ui.text.TextStyle merge(androidx.compose.ui.text.ParagraphStyle other);
+ method @androidx.compose.Stable public operator androidx.compose.ui.text.TextStyle plus(androidx.compose.ui.text.TextStyle other);
+ method @androidx.compose.Stable public operator androidx.compose.ui.text.TextStyle plus(androidx.compose.ui.text.ParagraphStyle other);
+ method @androidx.compose.Stable public operator androidx.compose.ui.text.TextStyle plus(androidx.compose.ui.text.SpanStyle other);
+ method @androidx.compose.Stable public androidx.compose.ui.text.ParagraphStyle toParagraphStyle();
+ method @androidx.compose.Stable public androidx.compose.ui.text.SpanStyle toSpanStyle();
+ field public static final androidx.compose.ui.text.TextStyle.Companion Companion;
}
public static final class TextStyle.Companion {
- method public androidx.ui.text.TextStyle getDefault();
- property public final androidx.ui.text.TextStyle Default;
+ method public androidx.compose.ui.text.TextStyle getDefault();
+ property public final androidx.compose.ui.text.TextStyle Default;
}
public final class TextStyleKt {
- method public static androidx.ui.text.TextStyle lerp(androidx.ui.text.TextStyle start, androidx.ui.text.TextStyle stop, float fraction);
- method public static androidx.ui.text.TextStyle resolveDefaults(androidx.ui.text.TextStyle style, androidx.ui.core.LayoutDirection direction);
+ method public static androidx.compose.ui.text.TextStyle lerp(androidx.compose.ui.text.TextStyle start, androidx.compose.ui.text.TextStyle stop, float fraction);
+ method public static androidx.compose.ui.text.TextStyle resolveDefaults(androidx.compose.ui.text.TextStyle style, androidx.ui.core.LayoutDirection direction);
}
public interface Typeface {
- method public androidx.ui.text.font.FontFamily getFontFamily();
- property public abstract androidx.ui.text.font.FontFamily fontFamily;
+ method public androidx.compose.ui.text.font.FontFamily getFontFamily();
+ property public abstract androidx.compose.ui.text.font.FontFamily fontFamily;
}
}
-package androidx.ui.text.font {
+package androidx.compose.ui.text.font {
- public abstract sealed class FileBasedFontFamily extends androidx.ui.text.font.FontFamily {
+ public abstract sealed class FileBasedFontFamily extends androidx.compose.ui.text.font.FontFamily {
}
@androidx.compose.Immutable public interface Font {
- method public androidx.ui.text.font.FontStyle getStyle();
- method public androidx.ui.text.font.FontWeight getWeight();
- property public abstract androidx.ui.text.font.FontStyle style;
- property public abstract androidx.ui.text.font.FontWeight weight;
+ method public androidx.compose.ui.text.font.FontStyle getStyle();
+ method public androidx.compose.ui.text.font.FontWeight getWeight();
+ property public abstract androidx.compose.ui.text.font.FontStyle style;
+ property public abstract androidx.compose.ui.text.font.FontWeight weight;
}
public static interface Font.ResourceLoader {
- method public Object load(androidx.ui.text.font.Font font);
+ method public Object load(androidx.compose.ui.text.font.Font font);
}
@androidx.compose.Immutable public abstract sealed class FontFamily {
method public final boolean getCanLoadSynchronously();
- field public static final androidx.ui.text.font.FontFamily.Companion Companion;
+ field public static final androidx.compose.ui.text.font.FontFamily.Companion Companion;
}
public static final class FontFamily.Companion {
- method public androidx.ui.text.font.GenericFontFamily getCursive();
- method public androidx.ui.text.font.SystemFontFamily getDefault();
- method public androidx.ui.text.font.GenericFontFamily getMonospace();
- method public androidx.ui.text.font.GenericFontFamily getSansSerif();
- method public androidx.ui.text.font.GenericFontFamily getSerif();
- property public final androidx.ui.text.font.GenericFontFamily Cursive;
- property public final androidx.ui.text.font.SystemFontFamily Default;
- property public final androidx.ui.text.font.GenericFontFamily Monospace;
- property public final androidx.ui.text.font.GenericFontFamily SansSerif;
- property public final androidx.ui.text.font.GenericFontFamily Serif;
+ method public androidx.compose.ui.text.font.GenericFontFamily getCursive();
+ method public androidx.compose.ui.text.font.SystemFontFamily getDefault();
+ method public androidx.compose.ui.text.font.GenericFontFamily getMonospace();
+ method public androidx.compose.ui.text.font.GenericFontFamily getSansSerif();
+ method public androidx.compose.ui.text.font.GenericFontFamily getSerif();
+ property public final androidx.compose.ui.text.font.GenericFontFamily Cursive;
+ property public final androidx.compose.ui.text.font.SystemFontFamily Default;
+ property public final androidx.compose.ui.text.font.GenericFontFamily Monospace;
+ property public final androidx.compose.ui.text.font.GenericFontFamily SansSerif;
+ property public final androidx.compose.ui.text.font.GenericFontFamily Serif;
}
public final class FontFamilyKt {
- method @androidx.compose.Stable public static androidx.ui.text.font.FontListFontFamily fontFamily(java.util.List<? extends androidx.ui.text.font.Font> fonts);
- method @androidx.compose.Stable public static androidx.ui.text.font.FontListFontFamily fontFamily(androidx.ui.text.font.Font... fonts);
- method public static androidx.ui.text.font.LoadedFontFamily fontFamily(androidx.ui.text.Typeface typeface);
+ method @androidx.compose.Stable public static androidx.compose.ui.text.font.FontListFontFamily fontFamily(java.util.List<? extends androidx.compose.ui.text.font.Font> fonts);
+ method @androidx.compose.Stable public static androidx.compose.ui.text.font.FontListFontFamily fontFamily(androidx.compose.ui.text.font.Font... fonts);
+ method public static androidx.compose.ui.text.font.LoadedFontFamily fontFamily(androidx.compose.ui.text.Typeface typeface);
}
public final class FontKt {
- method @androidx.compose.Stable public static androidx.ui.text.font.FontListFontFamily asFontFamily(androidx.ui.text.font.Font);
- method @androidx.compose.Stable public static androidx.ui.text.font.Font font(int resId, androidx.ui.text.font.FontWeight weight = FontWeight.Normal, androidx.ui.text.font.FontStyle style = androidx.ui.text.font.FontStyle.Normal);
+ method @androidx.compose.Stable public static androidx.compose.ui.text.font.FontListFontFamily asFontFamily(androidx.compose.ui.text.font.Font);
+ method @androidx.compose.Stable public static androidx.compose.ui.text.font.Font font(int resId, androidx.compose.ui.text.font.FontWeight weight = FontWeight.Normal, androidx.compose.ui.text.font.FontStyle style = androidx.compose.ui.text.font.FontStyle.Normal);
}
- @androidx.compose.Immutable public final class FontListFontFamily extends androidx.ui.text.font.FileBasedFontFamily implements kotlin.jvm.internal.markers.KMappedMarker java.util.List<androidx.ui.text.font.Font> {
- ctor public FontListFontFamily(java.util.List<? extends androidx.ui.text.font.Font> fonts);
- method public java.util.List<androidx.ui.text.font.Font> component1();
- method public boolean contains(androidx.ui.text.font.Font element);
+ @androidx.compose.Immutable public final class FontListFontFamily extends androidx.compose.ui.text.font.FileBasedFontFamily implements kotlin.jvm.internal.markers.KMappedMarker java.util.List<androidx.compose.ui.text.font.Font> {
+ ctor public FontListFontFamily(java.util.List<? extends androidx.compose.ui.text.font.Font> fonts);
+ method public java.util.List<androidx.compose.ui.text.font.Font> component1();
+ method public boolean contains(androidx.compose.ui.text.font.Font element);
method public boolean containsAll(java.util.Collection<?> elements);
- method @androidx.compose.Immutable public androidx.ui.text.font.FontListFontFamily copy(java.util.List<? extends androidx.ui.text.font.Font> fonts);
- method public androidx.ui.text.font.Font get(int index);
- method public java.util.List<androidx.ui.text.font.Font> getFonts();
+ method @androidx.compose.Immutable public androidx.compose.ui.text.font.FontListFontFamily copy(java.util.List<? extends androidx.compose.ui.text.font.Font> fonts);
+ method public androidx.compose.ui.text.font.Font get(int index);
+ method public java.util.List<androidx.compose.ui.text.font.Font> getFonts();
method public int getSize();
- method public int indexOf(androidx.ui.text.font.Font element);
+ method public int indexOf(androidx.compose.ui.text.font.Font element);
method public boolean isEmpty();
- method public java.util.Iterator<androidx.ui.text.font.Font> iterator();
- method public int lastIndexOf(androidx.ui.text.font.Font element);
- method public java.util.ListIterator<androidx.ui.text.font.Font> listIterator();
- method public java.util.ListIterator<androidx.ui.text.font.Font> listIterator(int index);
- method public java.util.List<androidx.ui.text.font.Font> subList(int fromIndex, int toIndex);
+ method public java.util.Iterator<androidx.compose.ui.text.font.Font> iterator();
+ method public int lastIndexOf(androidx.compose.ui.text.font.Font element);
+ method public java.util.ListIterator<androidx.compose.ui.text.font.Font> listIterator();
+ method public java.util.ListIterator<androidx.compose.ui.text.font.Font> listIterator(int index);
+ method public java.util.List<androidx.compose.ui.text.font.Font> subList(int fromIndex, int toIndex);
}
public enum FontStyle {
- method public static androidx.ui.text.font.FontStyle valueOf(String name) throws java.lang.IllegalArgumentException;
- method public static androidx.ui.text.font.FontStyle[] values();
- enum_constant public static final androidx.ui.text.font.FontStyle Italic;
- enum_constant public static final androidx.ui.text.font.FontStyle Normal;
+ method public static androidx.compose.ui.text.font.FontStyle valueOf(String name) throws java.lang.IllegalArgumentException;
+ method public static androidx.compose.ui.text.font.FontStyle[] values();
+ enum_constant public static final androidx.compose.ui.text.font.FontStyle Italic;
+ enum_constant public static final androidx.compose.ui.text.font.FontStyle Normal;
}
public enum FontSynthesis {
- method public static androidx.ui.text.font.FontSynthesis valueOf(String name) throws java.lang.IllegalArgumentException;
- method public static androidx.ui.text.font.FontSynthesis[] values();
- enum_constant public static final androidx.ui.text.font.FontSynthesis All;
- enum_constant public static final androidx.ui.text.font.FontSynthesis None;
- enum_constant public static final androidx.ui.text.font.FontSynthesis Style;
- enum_constant public static final androidx.ui.text.font.FontSynthesis Weight;
+ method public static androidx.compose.ui.text.font.FontSynthesis valueOf(String name) throws java.lang.IllegalArgumentException;
+ method public static androidx.compose.ui.text.font.FontSynthesis[] values();
+ enum_constant public static final androidx.compose.ui.text.font.FontSynthesis All;
+ enum_constant public static final androidx.compose.ui.text.font.FontSynthesis None;
+ enum_constant public static final androidx.compose.ui.text.font.FontSynthesis Style;
+ enum_constant public static final androidx.compose.ui.text.font.FontSynthesis Weight;
}
- @androidx.compose.Immutable public final class FontWeight implements java.lang.Comparable<androidx.ui.text.font.FontWeight> {
+ @androidx.compose.Immutable public final class FontWeight implements java.lang.Comparable<androidx.compose.ui.text.font.FontWeight> {
ctor public FontWeight(int weight);
- method public int compareTo(androidx.ui.text.font.FontWeight other);
+ method public int compareTo(androidx.compose.ui.text.font.FontWeight other);
method public int component1();
- method @androidx.compose.Immutable public androidx.ui.text.font.FontWeight copy(int weight);
+ method @androidx.compose.Immutable public androidx.compose.ui.text.font.FontWeight copy(int weight);
method public int getWeight();
- field public static final androidx.ui.text.font.FontWeight.Companion Companion;
+ field public static final androidx.compose.ui.text.font.FontWeight.Companion Companion;
}
public static final class FontWeight.Companion {
- method public androidx.ui.text.font.FontWeight getBlack();
- method public androidx.ui.text.font.FontWeight getBold();
- method public androidx.ui.text.font.FontWeight getExtraBold();
- method public androidx.ui.text.font.FontWeight getExtraLight();
- method public androidx.ui.text.font.FontWeight getLight();
- method public androidx.ui.text.font.FontWeight getMedium();
- method public androidx.ui.text.font.FontWeight getNormal();
- method public androidx.ui.text.font.FontWeight getSemiBold();
- method public androidx.ui.text.font.FontWeight getThin();
- method public androidx.ui.text.font.FontWeight getW100();
- method public androidx.ui.text.font.FontWeight getW200();
- method public androidx.ui.text.font.FontWeight getW300();
- method public androidx.ui.text.font.FontWeight getW400();
- method public androidx.ui.text.font.FontWeight getW500();
- method public androidx.ui.text.font.FontWeight getW600();
- method public androidx.ui.text.font.FontWeight getW700();
- method public androidx.ui.text.font.FontWeight getW800();
- method public androidx.ui.text.font.FontWeight getW900();
- property public final androidx.ui.text.font.FontWeight Black;
- property public final androidx.ui.text.font.FontWeight Bold;
- property public final androidx.ui.text.font.FontWeight ExtraBold;
- property public final androidx.ui.text.font.FontWeight ExtraLight;
- property public final androidx.ui.text.font.FontWeight Light;
- property public final androidx.ui.text.font.FontWeight Medium;
- property public final androidx.ui.text.font.FontWeight Normal;
- property public final androidx.ui.text.font.FontWeight SemiBold;
- property public final androidx.ui.text.font.FontWeight Thin;
- property public final androidx.ui.text.font.FontWeight W100;
- property public final androidx.ui.text.font.FontWeight W200;
- property public final androidx.ui.text.font.FontWeight W300;
- property public final androidx.ui.text.font.FontWeight W400;
- property public final androidx.ui.text.font.FontWeight W500;
- property public final androidx.ui.text.font.FontWeight W600;
- property public final androidx.ui.text.font.FontWeight W700;
- property public final androidx.ui.text.font.FontWeight W800;
- property public final androidx.ui.text.font.FontWeight W900;
+ method public androidx.compose.ui.text.font.FontWeight getBlack();
+ method public androidx.compose.ui.text.font.FontWeight getBold();
+ method public androidx.compose.ui.text.font.FontWeight getExtraBold();
+ method public androidx.compose.ui.text.font.FontWeight getExtraLight();
+ method public androidx.compose.ui.text.font.FontWeight getLight();
+ method public androidx.compose.ui.text.font.FontWeight getMedium();
+ method public androidx.compose.ui.text.font.FontWeight getNormal();
+ method public androidx.compose.ui.text.font.FontWeight getSemiBold();
+ method public androidx.compose.ui.text.font.FontWeight getThin();
+ method public androidx.compose.ui.text.font.FontWeight getW100();
+ method public androidx.compose.ui.text.font.FontWeight getW200();
+ method public androidx.compose.ui.text.font.FontWeight getW300();
+ method public androidx.compose.ui.text.font.FontWeight getW400();
+ method public androidx.compose.ui.text.font.FontWeight getW500();
+ method public androidx.compose.ui.text.font.FontWeight getW600();
+ method public androidx.compose.ui.text.font.FontWeight getW700();
+ method public androidx.compose.ui.text.font.FontWeight getW800();
+ method public androidx.compose.ui.text.font.FontWeight getW900();
+ property public final androidx.compose.ui.text.font.FontWeight Black;
+ property public final androidx.compose.ui.text.font.FontWeight Bold;
+ property public final androidx.compose.ui.text.font.FontWeight ExtraBold;
+ property public final androidx.compose.ui.text.font.FontWeight ExtraLight;
+ property public final androidx.compose.ui.text.font.FontWeight Light;
+ property public final androidx.compose.ui.text.font.FontWeight Medium;
+ property public final androidx.compose.ui.text.font.FontWeight Normal;
+ property public final androidx.compose.ui.text.font.FontWeight SemiBold;
+ property public final androidx.compose.ui.text.font.FontWeight Thin;
+ property public final androidx.compose.ui.text.font.FontWeight W100;
+ property public final androidx.compose.ui.text.font.FontWeight W200;
+ property public final androidx.compose.ui.text.font.FontWeight W300;
+ property public final androidx.compose.ui.text.font.FontWeight W400;
+ property public final androidx.compose.ui.text.font.FontWeight W500;
+ property public final androidx.compose.ui.text.font.FontWeight W600;
+ property public final androidx.compose.ui.text.font.FontWeight W700;
+ property public final androidx.compose.ui.text.font.FontWeight W800;
+ property public final androidx.compose.ui.text.font.FontWeight W900;
}
public final class FontWeightKt {
- method public static androidx.ui.text.font.FontWeight lerp(androidx.ui.text.font.FontWeight start, androidx.ui.text.font.FontWeight stop, float fraction);
+ method public static androidx.compose.ui.text.font.FontWeight lerp(androidx.compose.ui.text.font.FontWeight start, androidx.compose.ui.text.font.FontWeight stop, float fraction);
}
- @androidx.compose.Immutable public final class GenericFontFamily extends androidx.ui.text.font.SystemFontFamily {
+ @androidx.compose.Immutable public final class GenericFontFamily extends androidx.compose.ui.text.font.SystemFontFamily {
method public String getName();
}
- public final class LoadedFontFamily extends androidx.ui.text.font.FontFamily {
- ctor public LoadedFontFamily(androidx.ui.text.Typeface typeface);
- method public androidx.ui.text.Typeface component1();
- method public androidx.ui.text.font.LoadedFontFamily copy(androidx.ui.text.Typeface typeface);
- method public androidx.ui.text.Typeface getTypeface();
+ public final class LoadedFontFamily extends androidx.compose.ui.text.font.FontFamily {
+ ctor public LoadedFontFamily(androidx.compose.ui.text.Typeface typeface);
+ method public androidx.compose.ui.text.Typeface component1();
+ method public androidx.compose.ui.text.font.LoadedFontFamily copy(androidx.compose.ui.text.Typeface typeface);
+ method public androidx.compose.ui.text.Typeface getTypeface();
}
- public final class ResourceFont implements androidx.ui.text.font.Font {
- ctor public ResourceFont(int resId, androidx.ui.text.font.FontWeight weight, androidx.ui.text.font.FontStyle style);
+ public final class ResourceFont implements androidx.compose.ui.text.font.Font {
+ ctor public ResourceFont(int resId, androidx.compose.ui.text.font.FontWeight weight, androidx.compose.ui.text.font.FontStyle style);
method public int component1();
- method public androidx.ui.text.font.FontWeight component2();
- method public androidx.ui.text.font.FontStyle component3();
- method public androidx.ui.text.font.ResourceFont copy(int resId, androidx.ui.text.font.FontWeight weight, androidx.ui.text.font.FontStyle style);
+ method public androidx.compose.ui.text.font.FontWeight component2();
+ method public androidx.compose.ui.text.font.FontStyle component3();
+ method public androidx.compose.ui.text.font.ResourceFont copy(int resId, androidx.compose.ui.text.font.FontWeight weight, androidx.compose.ui.text.font.FontStyle style);
method public int getResId();
- method public androidx.ui.text.font.FontStyle getStyle();
- method public androidx.ui.text.font.FontWeight getWeight();
+ method public androidx.compose.ui.text.font.FontStyle getStyle();
+ method public androidx.compose.ui.text.font.FontWeight getWeight();
}
- public abstract sealed class SystemFontFamily extends androidx.ui.text.font.FontFamily {
+ public abstract sealed class SystemFontFamily extends androidx.compose.ui.text.font.FontFamily {
}
}
-package androidx.ui.text.platform {
+package androidx.compose.ui.text.input {
+
+ public final class BackspaceKeyEditOp implements androidx.compose.ui.text.input.EditOperation {
+ ctor public BackspaceKeyEditOp();
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public final class CommitTextEditOp implements androidx.compose.ui.text.input.EditOperation {
+ ctor public CommitTextEditOp(String text, int newCursorPosition);
+ method public String component1();
+ method public int component2();
+ method public androidx.compose.ui.text.input.CommitTextEditOp copy(String text, int newCursorPosition);
+ method public int getNewCursorPosition();
+ method public String getText();
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public final class DeleteAllEditOp implements androidx.compose.ui.text.input.EditOperation {
+ ctor public DeleteAllEditOp();
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public final class DeleteSurroundingTextEditOp implements androidx.compose.ui.text.input.EditOperation {
+ ctor public DeleteSurroundingTextEditOp(int beforeLength, int afterLength);
+ method public int component1();
+ method public int component2();
+ method public androidx.compose.ui.text.input.DeleteSurroundingTextEditOp copy(int beforeLength, int afterLength);
+ method public int getAfterLength();
+ method public int getBeforeLength();
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public final class DeleteSurroundingTextInCodePointsEditOp implements androidx.compose.ui.text.input.EditOperation {
+ ctor public DeleteSurroundingTextInCodePointsEditOp(int beforeLength, int afterLength);
+ method public int component1();
+ method public int component2();
+ method public androidx.compose.ui.text.input.DeleteSurroundingTextInCodePointsEditOp copy(int beforeLength, int afterLength);
+ method public int getAfterLength();
+ method public int getBeforeLength();
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public interface EditOperation {
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public final class EditingBuffer {
+ ctor public EditingBuffer(String initialText, androidx.compose.ui.text.TextRange initialSelection);
+ field public static final int NOWHERE = -1; // 0xffffffff
+ }
+
+ @Deprecated @androidx.compose.Immutable public final class EditorValue {
+ ctor @Deprecated public EditorValue(String text, androidx.compose.ui.text.TextRange selection, androidx.compose.ui.text.TextRange? composition);
+ ctor @Deprecated public EditorValue();
+ method @Deprecated public String component1();
+ method @Deprecated public androidx.compose.ui.text.TextRange component2();
+ method @Deprecated public androidx.compose.ui.text.TextRange? component3();
+ method @Deprecated @androidx.compose.Immutable public androidx.compose.ui.text.input.EditorValue copy(String text, androidx.compose.ui.text.TextRange selection, androidx.compose.ui.text.TextRange? composition);
+ method @Deprecated public androidx.compose.ui.text.TextRange? getComposition();
+ method @Deprecated public String getSelectedText();
+ method @Deprecated public androidx.compose.ui.text.TextRange getSelection();
+ method @Deprecated public String getText();
+ method @Deprecated public String getTextAfterSelection(int maxChars);
+ method @Deprecated public String getTextBeforeSelection(int maxChars);
+ }
+
+ public final class FinishComposingTextEditOp implements androidx.compose.ui.text.input.EditOperation {
+ ctor public FinishComposingTextEditOp();
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public final class GapBufferKt {
+ }
+
+ public enum ImeAction {
+ method public static androidx.compose.ui.text.input.ImeAction valueOf(String name) throws java.lang.IllegalArgumentException;
+ method public static androidx.compose.ui.text.input.ImeAction[] values();
+ enum_constant public static final androidx.compose.ui.text.input.ImeAction Done;
+ enum_constant public static final androidx.compose.ui.text.input.ImeAction Go;
+ enum_constant public static final androidx.compose.ui.text.input.ImeAction Next;
+ enum_constant public static final androidx.compose.ui.text.input.ImeAction NoAction;
+ enum_constant public static final androidx.compose.ui.text.input.ImeAction Previous;
+ enum_constant public static final androidx.compose.ui.text.input.ImeAction Search;
+ enum_constant public static final androidx.compose.ui.text.input.ImeAction Send;
+ enum_constant public static final androidx.compose.ui.text.input.ImeAction Unspecified;
+ }
+
+ public interface InputEventListener {
+ method public void onEditOperations(java.util.List<? extends androidx.compose.ui.text.input.EditOperation> editOps);
+ method public void onImeAction(androidx.compose.ui.text.input.ImeAction imeAction);
+ }
+
+ public enum KeyboardType {
+ method public static androidx.compose.ui.text.input.KeyboardType valueOf(String name) throws java.lang.IllegalArgumentException;
+ method public static androidx.compose.ui.text.input.KeyboardType[] values();
+ enum_constant public static final androidx.compose.ui.text.input.KeyboardType Ascii;
+ enum_constant public static final androidx.compose.ui.text.input.KeyboardType Email;
+ enum_constant public static final androidx.compose.ui.text.input.KeyboardType Number;
+ enum_constant public static final androidx.compose.ui.text.input.KeyboardType NumberPassword;
+ enum_constant public static final androidx.compose.ui.text.input.KeyboardType Password;
+ enum_constant public static final androidx.compose.ui.text.input.KeyboardType Phone;
+ enum_constant public static final androidx.compose.ui.text.input.KeyboardType Text;
+ enum_constant public static final androidx.compose.ui.text.input.KeyboardType Uri;
+ }
+
+ public final class MoveCursorEditOp implements androidx.compose.ui.text.input.EditOperation {
+ ctor public MoveCursorEditOp(int amount);
+ method public int component1();
+ method public androidx.compose.ui.text.input.MoveCursorEditOp copy(int amount);
+ method public int getAmount();
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public interface OffsetMap {
+ method public int originalToTransformed(int offset);
+ method public int transformedToOriginal(int offset);
+ field public static final androidx.compose.ui.text.input.OffsetMap.Companion Companion;
+ }
+
+ public static final class OffsetMap.Companion {
+ method public androidx.compose.ui.text.input.OffsetMap getIdentityOffsetMap();
+ property public final androidx.compose.ui.text.input.OffsetMap identityOffsetMap;
+ }
+
+ public final class PasswordVisualTransformation implements androidx.compose.ui.text.input.VisualTransformation {
+ ctor public PasswordVisualTransformation(char mask);
+ ctor public PasswordVisualTransformation();
+ method public char component1();
+ method public androidx.compose.ui.text.input.PasswordVisualTransformation copy(char mask);
+ method public androidx.compose.ui.text.input.TransformedText filter(androidx.compose.ui.text.AnnotatedString text);
+ method public char getMask();
+ }
+
+ public interface PlatformTextInputService {
+ method public void hideSoftwareKeyboard();
+ method public void notifyFocusedRect(androidx.ui.geometry.Rect rect);
+ method public void onStateUpdated(androidx.compose.ui.text.input.TextFieldValue value);
+ method public void showSoftwareKeyboard();
+ method public void startInput(androidx.compose.ui.text.input.TextFieldValue value, androidx.compose.ui.text.input.KeyboardType keyboardType, androidx.compose.ui.text.input.ImeAction imeAction, kotlin.jvm.functions.Function1<? super java.util.List<? extends androidx.compose.ui.text.input.EditOperation>,kotlin.Unit> onEditCommand, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.ImeAction,kotlin.Unit> onImeActionPerformed);
+ method public void stopInput();
+ }
+
+ public final class SetComposingRegionEditOp implements androidx.compose.ui.text.input.EditOperation {
+ ctor public SetComposingRegionEditOp(int start, int end);
+ method public int component1();
+ method public int component2();
+ method public androidx.compose.ui.text.input.SetComposingRegionEditOp copy(int start, int end);
+ method public int getEnd();
+ method public int getStart();
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public final class SetComposingTextEditOp implements androidx.compose.ui.text.input.EditOperation {
+ ctor public SetComposingTextEditOp(String text, int newCursorPosition);
+ method public String component1();
+ method public int component2();
+ method public androidx.compose.ui.text.input.SetComposingTextEditOp copy(String text, int newCursorPosition);
+ method public int getNewCursorPosition();
+ method public String getText();
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ public final class SetSelectionEditOp implements androidx.compose.ui.text.input.EditOperation {
+ ctor public SetSelectionEditOp(int start, int end);
+ method public int component1();
+ method public int component2();
+ method public androidx.compose.ui.text.input.SetSelectionEditOp copy(int start, int end);
+ method public int getEnd();
+ method public int getStart();
+ method public void process(androidx.compose.ui.text.input.EditingBuffer buffer);
+ }
+
+ @androidx.compose.Immutable public final class TextFieldValue {
+ ctor public TextFieldValue(String text, androidx.compose.ui.text.TextRange selection, androidx.compose.ui.text.TextRange? composition);
+ ctor public TextFieldValue();
+ method public String component1();
+ method public androidx.compose.ui.text.TextRange component2();
+ method public androidx.compose.ui.text.TextRange? component3();
+ method @androidx.compose.Immutable public androidx.compose.ui.text.input.TextFieldValue copy(String text, androidx.compose.ui.text.TextRange selection, androidx.compose.ui.text.TextRange? composition);
+ method public androidx.compose.ui.text.TextRange? getComposition();
+ method public androidx.compose.ui.text.TextRange getSelection();
+ method public String getText();
+ field public static final androidx.compose.ui.text.input.TextFieldValue.Companion Companion;
+ }
+
+ public static final class TextFieldValue.Companion {
+ method public androidx.compose.runtime.savedinstancestate.Saver<androidx.compose.ui.text.input.TextFieldValue,java.lang.Object> getSaver();
+ property public final androidx.compose.runtime.savedinstancestate.Saver<androidx.compose.ui.text.input.TextFieldValue,java.lang.Object> Saver;
+ }
+
+ public final class TextFieldValueKt {
+ method public static String getSelectedText(androidx.compose.ui.text.input.TextFieldValue);
+ method public static String getTextAfterSelection(androidx.compose.ui.text.input.TextFieldValue, int maxChars);
+ method public static String getTextBeforeSelection(androidx.compose.ui.text.input.TextFieldValue, int maxChars);
+ }
+
+ public class TextInputService {
+ ctor public TextInputService(androidx.compose.ui.text.input.PlatformTextInputService platformTextInputService);
+ method public void hideSoftwareKeyboard(int token);
+ method public void notifyFocusedRect(int token, androidx.ui.geometry.Rect rect);
+ method public void onStateUpdated(int token, androidx.compose.ui.text.input.TextFieldValue value);
+ method public void showSoftwareKeyboard(int token);
+ method public int startInput(androidx.compose.ui.text.input.TextFieldValue value, androidx.compose.ui.text.input.KeyboardType keyboardType, androidx.compose.ui.text.input.ImeAction imeAction, kotlin.jvm.functions.Function1<? super java.util.List<? extends androidx.compose.ui.text.input.EditOperation>,kotlin.Unit> onEditCommand, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.ImeAction,kotlin.Unit> onImeActionPerformed);
+ method public void stopInput(int token);
+ }
+
+ public final class TextInputServiceKt {
+ method @Deprecated public static kotlin.jvm.functions.Function1<androidx.compose.ui.text.input.PlatformTextInputService,androidx.compose.ui.text.input.TextInputService> getTextInputServiceFactory();
+ method @Deprecated public static void setTextInputServiceFactory(kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.PlatformTextInputService,? extends androidx.compose.ui.text.input.TextInputService> p);
+ field public static final int INVALID_SESSION = -1; // 0xffffffff
+ field public static final int NO_SESSION = 0; // 0x0
+ }
+
+ public final class TransformedText {
+ ctor public TransformedText(androidx.compose.ui.text.AnnotatedString transformedText, androidx.compose.ui.text.input.OffsetMap offsetMap);
+ method public androidx.compose.ui.text.AnnotatedString component1();
+ method public androidx.compose.ui.text.input.OffsetMap component2();
+ method public androidx.compose.ui.text.input.TransformedText copy(androidx.compose.ui.text.AnnotatedString transformedText, androidx.compose.ui.text.input.OffsetMap offsetMap);
+ method public androidx.compose.ui.text.input.OffsetMap getOffsetMap();
+ method public androidx.compose.ui.text.AnnotatedString getTransformedText();
+ }
+
+ @androidx.compose.Immutable public interface VisualTransformation {
+ method public androidx.compose.ui.text.input.TransformedText filter(androidx.compose.ui.text.AnnotatedString text);
+ field public static final androidx.compose.ui.text.input.VisualTransformation.Companion Companion;
+ }
+
+ public static final class VisualTransformation.Companion {
+ method public androidx.compose.ui.text.input.VisualTransformation getNone();
+ property public final androidx.compose.ui.text.input.VisualTransformation None;
+ }
+
+}
+
+package androidx.compose.ui.text.intl {
+
+ public final class AndroidPlatformLocaleKt {
+ }
+
+ @androidx.compose.Immutable public final class Locale {
+ ctor public Locale(String languageTag);
+ method public String getLanguage();
+ method public String getRegion();
+ method public String getScript();
+ method public String toLanguageTag();
+ property public final String language;
+ property public final String region;
+ property public final String script;
+ field public static final androidx.compose.ui.text.intl.Locale.Companion Companion;
+ }
+
+ public static final class Locale.Companion {
+ method public androidx.compose.ui.text.intl.Locale getCurrent();
+ property public final androidx.compose.ui.text.intl.Locale current;
+ }
+
+ @androidx.compose.Immutable public final class LocaleList implements java.util.Collection<androidx.compose.ui.text.intl.Locale> kotlin.jvm.internal.markers.KMappedMarker {
+ ctor public LocaleList(java.util.List<androidx.compose.ui.text.intl.Locale> localeList);
+ ctor public LocaleList(String languageTags);
+ ctor public LocaleList(androidx.compose.ui.text.intl.Locale... locales);
+ method public java.util.List<androidx.compose.ui.text.intl.Locale> component1();
+ method public operator boolean contains(androidx.compose.ui.text.intl.Locale element);
+ method public boolean containsAll(java.util.Collection<?> elements);
+ method @androidx.compose.Immutable public androidx.compose.ui.text.intl.LocaleList copy(java.util.List<androidx.compose.ui.text.intl.Locale> localeList);
+ method public operator androidx.compose.ui.text.intl.Locale get(int i);
+ method public java.util.List<androidx.compose.ui.text.intl.Locale> getLocaleList();
+ method public int getSize();
+ method public boolean isEmpty();
+ method public java.util.Iterator<androidx.compose.ui.text.intl.Locale> iterator();
+ property public int size;
+ field public static final androidx.compose.ui.text.intl.LocaleList.Companion Companion;
+ }
+
+ public static final class LocaleList.Companion {
+ method public androidx.compose.ui.text.intl.LocaleList getCurrent();
+ property public final androidx.compose.ui.text.intl.LocaleList current;
+ }
+
+ public final class PlatformLocaleKt {
+ }
+
+}
+
+package androidx.compose.ui.text.platform {
public final class AndroidParagraphHelperKt {
}
public final class AndroidParagraphIntrinsicsKt {
- method @Deprecated public static kotlin.jvm.functions.Function6<java.lang.String,androidx.ui.text.TextStyle,java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.SpanStyle>>,java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>>,androidx.ui.unit.Density,androidx.ui.text.font.Font.ResourceLoader,androidx.ui.text.ParagraphIntrinsics> getParagraphIntrinsicsActualFactory();
- method @Deprecated public static void setParagraphIntrinsicsActualFactory(kotlin.jvm.functions.Function6<? super java.lang.String,? super androidx.ui.text.TextStyle,? super java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.SpanStyle>>,? super java.util.List<androidx.ui.text.AnnotatedString.Range<androidx.ui.text.Placeholder>>,? super androidx.ui.unit.Density,? super androidx.ui.text.font.Font.ResourceLoader,? extends androidx.ui.text.ParagraphIntrinsics> p);
+ method @Deprecated public static kotlin.jvm.functions.Function6<java.lang.String,androidx.compose.ui.text.TextStyle,java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>>,java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>>,androidx.ui.unit.Density,androidx.compose.ui.text.font.Font.ResourceLoader,androidx.compose.ui.text.ParagraphIntrinsics> getParagraphIntrinsicsActualFactory();
+ method @Deprecated public static void setParagraphIntrinsicsActualFactory(kotlin.jvm.functions.Function6<? super java.lang.String,? super androidx.compose.ui.text.TextStyle,? super java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.SpanStyle>>,? super java.util.List<androidx.compose.ui.text.AnnotatedString.Range<androidx.compose.ui.text.Placeholder>>,? super androidx.ui.unit.Density,? super androidx.compose.ui.text.font.Font.ResourceLoader,? extends androidx.compose.ui.text.ParagraphIntrinsics> p);
}
public final class AndroidParagraphKt {
- method @Deprecated public static kotlin.jvm.functions.Function4<androidx.ui.text.ParagraphIntrinsics,java.lang.Integer,java.lang.Boolean,androidx.ui.text.ParagraphConstraints,androidx.ui.text.Paragraph> getParagraphActualFactory();
- method @Deprecated public static void setParagraphActualFactory(kotlin.jvm.functions.Function4<? super androidx.ui.text.ParagraphIntrinsics,? super java.lang.Integer,? super java.lang.Boolean,? super androidx.ui.text.ParagraphConstraints,? extends androidx.ui.text.Paragraph> p);
+ method @Deprecated public static kotlin.jvm.functions.Function4<androidx.compose.ui.text.ParagraphIntrinsics,java.lang.Integer,java.lang.Boolean,androidx.compose.ui.text.ParagraphConstraints,androidx.compose.ui.text.Paragraph> getParagraphActualFactory();
+ method @Deprecated public static void setParagraphActualFactory(kotlin.jvm.functions.Function4<? super androidx.compose.ui.text.ParagraphIntrinsics,? super java.lang.Integer,? super java.lang.Boolean,? super androidx.compose.ui.text.ParagraphConstraints,? extends androidx.compose.ui.text.Paragraph> p);
}
public final class AndroidStringDelegateKt {
}
public final class TypefaceAdapterKt {
- method public static androidx.ui.text.Typeface typefaceFromFontFamily(android.content.Context context, androidx.ui.text.font.FontFamily fontFamily, java.util.List<? extends kotlin.Pair<androidx.ui.text.font.FontWeight,? extends androidx.ui.text.font.FontStyle>>? necessaryStyles = null);
+ method public static androidx.compose.ui.text.Typeface typefaceFromFontFamily(android.content.Context context, androidx.compose.ui.text.font.FontFamily fontFamily, java.util.List<? extends kotlin.Pair<androidx.compose.ui.text.font.FontWeight,? extends androidx.compose.ui.text.font.FontStyle>>? necessaryStyles = null);
}
}
-package androidx.ui.text.platform.extensions {
+package androidx.compose.ui.text.platform.extensions {
public final class LocaleExtensionsKt {
}
@@ -942,7 +942,7 @@
}
-package androidx.ui.text.style {
+package androidx.compose.ui.text.style {
@androidx.compose.Immutable public final inline class BaselineShift {
ctor public BaselineShift();
@@ -952,7 +952,7 @@
method public float getMultiplier();
method @androidx.compose.Immutable public static inline int hashCode-impl(float p);
method @androidx.compose.Immutable public static inline String! toString-impl(float p);
- field public static final androidx.ui.text.style.BaselineShift.Companion Companion;
+ field public static final androidx.compose.ui.text.style.BaselineShift.Companion Companion;
}
public static final class BaselineShift.Companion {
@@ -965,54 +965,54 @@
}
public final class BaselineShiftKt {
- method @androidx.compose.Stable public static float lerp-7csQwvo(float start, float stop, float fraction);
+ method @androidx.compose.Stable public static float lerp-ylBt8J4(float start, float stop, float fraction);
}
public enum ResolvedTextDirection {
- method public static androidx.ui.text.style.ResolvedTextDirection valueOf(String name) throws java.lang.IllegalArgumentException;
- method public static androidx.ui.text.style.ResolvedTextDirection[] values();
- enum_constant public static final androidx.ui.text.style.ResolvedTextDirection Ltr;
- enum_constant public static final androidx.ui.text.style.ResolvedTextDirection Rtl;
+ method public static androidx.compose.ui.text.style.ResolvedTextDirection valueOf(String name) throws java.lang.IllegalArgumentException;
+ method public static androidx.compose.ui.text.style.ResolvedTextDirection[] values();
+ enum_constant public static final androidx.compose.ui.text.style.ResolvedTextDirection Ltr;
+ enum_constant public static final androidx.compose.ui.text.style.ResolvedTextDirection Rtl;
}
public enum TextAlign {
- method public static androidx.ui.text.style.TextAlign valueOf(String name) throws java.lang.IllegalArgumentException;
- method public static androidx.ui.text.style.TextAlign[] values();
- enum_constant public static final androidx.ui.text.style.TextAlign Center;
- enum_constant public static final androidx.ui.text.style.TextAlign End;
- enum_constant public static final androidx.ui.text.style.TextAlign Justify;
- enum_constant public static final androidx.ui.text.style.TextAlign Left;
- enum_constant public static final androidx.ui.text.style.TextAlign Right;
- enum_constant public static final androidx.ui.text.style.TextAlign Start;
+ method public static androidx.compose.ui.text.style.TextAlign valueOf(String name) throws java.lang.IllegalArgumentException;
+ method public static androidx.compose.ui.text.style.TextAlign[] values();
+ enum_constant public static final androidx.compose.ui.text.style.TextAlign Center;
+ enum_constant public static final androidx.compose.ui.text.style.TextAlign End;
+ enum_constant public static final androidx.compose.ui.text.style.TextAlign Justify;
+ enum_constant public static final androidx.compose.ui.text.style.TextAlign Left;
+ enum_constant public static final androidx.compose.ui.text.style.TextAlign Right;
+ enum_constant public static final androidx.compose.ui.text.style.TextAlign Start;
}
@androidx.compose.Immutable public final class TextDecoration {
method public int component1();
- method public operator boolean contains(androidx.ui.text.style.TextDecoration other);
- method @androidx.compose.Immutable public androidx.ui.text.style.TextDecoration copy(int mask);
+ method public operator boolean contains(androidx.compose.ui.text.style.TextDecoration other);
+ method @androidx.compose.Immutable public androidx.compose.ui.text.style.TextDecoration copy(int mask);
method public int getMask();
- method public operator androidx.ui.text.style.TextDecoration plus(androidx.ui.text.style.TextDecoration decoration);
- field public static final androidx.ui.text.style.TextDecoration.Companion Companion;
+ method public operator androidx.compose.ui.text.style.TextDecoration plus(androidx.compose.ui.text.style.TextDecoration decoration);
+ field public static final androidx.compose.ui.text.style.TextDecoration.Companion Companion;
}
public static final class TextDecoration.Companion {
- method public androidx.ui.text.style.TextDecoration combine(java.util.List<androidx.ui.text.style.TextDecoration> decorations);
- method public androidx.ui.text.style.TextDecoration getLineThrough();
- method public androidx.ui.text.style.TextDecoration getNone();
- method public androidx.ui.text.style.TextDecoration getUnderline();
- property public final androidx.ui.text.style.TextDecoration LineThrough;
- property public final androidx.ui.text.style.TextDecoration None;
- property public final androidx.ui.text.style.TextDecoration Underline;
+ method public androidx.compose.ui.text.style.TextDecoration combine(java.util.List<androidx.compose.ui.text.style.TextDecoration> decorations);
+ method public androidx.compose.ui.text.style.TextDecoration getLineThrough();
+ method public androidx.compose.ui.text.style.TextDecoration getNone();
+ method public androidx.compose.ui.text.style.TextDecoration getUnderline();
+ property public final androidx.compose.ui.text.style.TextDecoration LineThrough;
+ property public final androidx.compose.ui.text.style.TextDecoration None;
+ property public final androidx.compose.ui.text.style.TextDecoration Underline;
}
public enum TextDirection {
- method public static androidx.ui.text.style.TextDirection valueOf(String name) throws java.lang.IllegalArgumentException;
- method public static androidx.ui.text.style.TextDirection[] values();
- enum_constant public static final androidx.ui.text.style.TextDirection Content;
- enum_constant public static final androidx.ui.text.style.TextDirection ContentOrLtr;
- enum_constant public static final androidx.ui.text.style.TextDirection ContentOrRtl;
- enum_constant public static final androidx.ui.text.style.TextDirection Ltr;
- enum_constant public static final androidx.ui.text.style.TextDirection Rtl;
+ method public static androidx.compose.ui.text.style.TextDirection valueOf(String name) throws java.lang.IllegalArgumentException;
+ method public static androidx.compose.ui.text.style.TextDirection[] values();
+ enum_constant public static final androidx.compose.ui.text.style.TextDirection Content;
+ enum_constant public static final androidx.compose.ui.text.style.TextDirection ContentOrLtr;
+ enum_constant public static final androidx.compose.ui.text.style.TextDirection ContentOrRtl;
+ enum_constant public static final androidx.compose.ui.text.style.TextDirection Ltr;
+ enum_constant public static final androidx.compose.ui.text.style.TextDirection Rtl;
}
@androidx.compose.Immutable public final class TextGeometricTransform {
@@ -1020,42 +1020,42 @@
ctor public TextGeometricTransform();
method public float component1();
method public float component2();
- method @androidx.compose.Immutable public androidx.ui.text.style.TextGeometricTransform copy(float scaleX, float skewX);
+ method @androidx.compose.Immutable public androidx.compose.ui.text.style.TextGeometricTransform copy(float scaleX, float skewX);
method public float getScaleX();
method public float getSkewX();
- field public static final androidx.ui.text.style.TextGeometricTransform.Companion Companion;
+ field public static final androidx.compose.ui.text.style.TextGeometricTransform.Companion Companion;
}
public static final class TextGeometricTransform.Companion {
}
public final class TextGeometricTransformKt {
- method public static androidx.ui.text.style.TextGeometricTransform lerp(androidx.ui.text.style.TextGeometricTransform start, androidx.ui.text.style.TextGeometricTransform stop, float fraction);
+ method public static androidx.compose.ui.text.style.TextGeometricTransform lerp(androidx.compose.ui.text.style.TextGeometricTransform start, androidx.compose.ui.text.style.TextGeometricTransform stop, float fraction);
}
@androidx.compose.Immutable public final class TextIndent {
method public long component1();
method public long component2();
- method @androidx.compose.Immutable public androidx.ui.text.style.TextIndent copy-gL_aCS0(long firstLine, long restLine);
+ method @androidx.compose.Immutable public androidx.compose.ui.text.style.TextIndent copy-gL_aCS0(long firstLine, long restLine);
method public long getFirstLine();
method public long getRestLine();
- field public static final androidx.ui.text.style.TextIndent.Companion Companion;
+ field public static final androidx.compose.ui.text.style.TextIndent.Companion Companion;
}
public static final class TextIndent.Companion {
- method public androidx.ui.text.style.TextIndent getNone();
- property public final androidx.ui.text.style.TextIndent None;
+ method public androidx.compose.ui.text.style.TextIndent getNone();
+ property public final androidx.compose.ui.text.style.TextIndent None;
}
public final class TextIndentKt {
- method public static androidx.ui.text.style.TextIndent lerp(androidx.ui.text.style.TextIndent start, androidx.ui.text.style.TextIndent stop, float fraction);
+ 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);
}
public enum TextOverflow {
- method public static androidx.ui.text.style.TextOverflow valueOf(String name) throws java.lang.IllegalArgumentException;
- method public static androidx.ui.text.style.TextOverflow[] values();
- enum_constant public static final androidx.ui.text.style.TextOverflow Clip;
- enum_constant public static final androidx.ui.text.style.TextOverflow Ellipsis;
+ method public static androidx.compose.ui.text.style.TextOverflow valueOf(String name) throws java.lang.IllegalArgumentException;
+ method public static androidx.compose.ui.text.style.TextOverflow[] values();
+ enum_constant public static final androidx.compose.ui.text.style.TextOverflow Clip;
+ enum_constant public static final androidx.compose.ui.text.style.TextOverflow Ellipsis;
}
}
diff --git a/ui/ui-text-core/samples/src/main/AndroidManifest.xml b/ui/ui-text-core/samples/src/main/AndroidManifest.xml
index 361b69f..88c8279 100644
--- a/ui/ui-text-core/samples/src/main/AndroidManifest.xml
+++ b/ui/ui-text-core/samples/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
limitations under the License.
-->
-<manifest package="androidx.ui.text.samples" />
+<manifest package="androidx.compose.ui.text.samples" />
diff --git a/ui/ui-text-core/samples/src/main/java/androidx/ui/text/samples/AnnotatedStringBuilderSamples.kt b/ui/ui-text-core/samples/src/main/java/androidx/compose/ui/text/samples/AnnotatedStringBuilderSamples.kt
similarity index 91%
rename from ui/ui-text-core/samples/src/main/java/androidx/ui/text/samples/AnnotatedStringBuilderSamples.kt
rename to ui/ui-text-core/samples/src/main/java/androidx/compose/ui/text/samples/AnnotatedStringBuilderSamples.kt
index 22f18f7..919c4f3 100644
--- a/ui/ui-text-core/samples/src/main/java/androidx/ui/text/samples/AnnotatedStringBuilderSamples.kt
+++ b/ui/ui-text-core/samples/src/main/java/androidx/compose/ui/text/samples/AnnotatedStringBuilderSamples.kt
@@ -14,18 +14,18 @@
* limitations under the License.
*/
-package androidx.ui.text.samples
+package androidx.compose.ui.text.samples
import androidx.annotation.Sampled
import androidx.ui.graphics.Color
-import androidx.ui.text.AnnotatedString
-import androidx.ui.text.ParagraphStyle
-import androidx.ui.text.SpanStyle
-import androidx.ui.text.annotatedString
-import androidx.ui.text.font.FontStyle
-import androidx.ui.text.style.TextAlign
-import androidx.ui.text.style.TextIndent
-import androidx.ui.text.withStyle
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.ParagraphStyle
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.annotatedString
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextIndent
+import androidx.compose.ui.text.withStyle
import androidx.ui.unit.sp
@Sampled
diff --git a/ui/ui-text-core/samples/src/main/java/androidx/ui/text/samples/BaselineShiftSamples.kt b/ui/ui-text-core/samples/src/main/java/androidx/compose/ui/text/samples/BaselineShiftSamples.kt
similarity index 86%
rename from ui/ui-text-core/samples/src/main/java/androidx/ui/text/samples/BaselineShiftSamples.kt
rename to ui/ui-text-core/samples/src/main/java/androidx/compose/ui/text/samples/BaselineShiftSamples.kt
index 0bd524f..9f1f9c2 100644
--- a/ui/ui-text-core/samples/src/main/java/androidx/ui/text/samples/BaselineShiftSamples.kt
+++ b/ui/ui-text-core/samples/src/main/java/androidx/compose/ui/text/samples/BaselineShiftSamples.kt
@@ -14,15 +14,15 @@
* limitations under the License.
*/
-package androidx.ui.text.samples
+package androidx.compose.ui.text.samples
import androidx.annotation.Sampled
import androidx.compose.Composable
import androidx.compose.foundation.Text
-import androidx.ui.text.SpanStyle
-import androidx.ui.text.annotatedString
-import androidx.ui.text.style.BaselineShift
-import androidx.ui.text.withStyle
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.annotatedString
+import androidx.compose.ui.text.style.BaselineShift
+import androidx.compose.ui.text.withStyle
import androidx.ui.unit.sp
@Sampled
diff --git a/ui/ui-text-core/samples/src/main/java/androidx/ui/text/samples/FontFamilySamples.kt b/ui/ui-text-core/samples/src/main/java/androidx/compose/ui/text/samples/FontFamilySamples.kt
similarity index 86%
rename from ui/ui-text-core/samples/src/main/java/androidx/ui/text/samples/FontFamilySamples.kt
rename to ui/ui-text-core/samples/src/main/java/androidx/compose/ui/text/samples/FontFamilySamples.kt
index b184c7a..1a1344c 100644
--- a/ui/ui-text-core/samples/src/main/java/androidx/ui/text/samples/FontFamilySamples.kt
+++ b/ui/ui-text-core/samples/src/main/java/androidx/compose/ui/text/samples/FontFamilySamples.kt
@@ -14,18 +14,18 @@
* limitations under the License.
*/
-package androidx.ui.text.samples
+package androidx.compose.ui.text.samples
import androidx.annotation.Sampled
import androidx.compose.Composable
import androidx.compose.foundation.Text
-import androidx.ui.text.TextStyle
-import androidx.ui.text.font.FontFamily
-import androidx.ui.text.font.FontStyle
-import androidx.ui.text.font.FontSynthesis
-import androidx.ui.text.font.FontWeight
-import androidx.ui.text.font.font
-import androidx.ui.text.font.fontFamily
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.font.FontSynthesis
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.font.font
+import androidx.compose.ui.text.font.fontFamily
@Sampled
@Composable
diff --git a/ui/ui-text-core/samples/src/main/java/androidx/ui/text/samples/ParagraphStyleSamples.kt b/ui/ui-text-core/samples/src/main/java/androidx/compose/ui/text/samples/ParagraphStyleSamples.kt
similarity index 88%
rename from ui/ui-text-core/samples/src/main/java/androidx/ui/text/samples/ParagraphStyleSamples.kt
rename to ui/ui-text-core/samples/src/main/java/androidx/compose/ui/text/samples/ParagraphStyleSamples.kt
index bfa3f78..b37cec7 100644
--- a/ui/ui-text-core/samples/src/main/java/androidx/ui/text/samples/ParagraphStyleSamples.kt
+++ b/ui/ui-text-core/samples/src/main/java/androidx/compose/ui/text/samples/ParagraphStyleSamples.kt
@@ -14,16 +14,16 @@
* limitations under the License.
*/
-package androidx.ui.text.samples
+package androidx.compose.ui.text.samples
import androidx.annotation.Sampled
import androidx.compose.Composable
import androidx.compose.foundation.Text
-import androidx.ui.text.ParagraphStyle
-import androidx.ui.text.TextStyle
-import androidx.ui.text.annotatedString
-import androidx.ui.text.style.TextAlign
-import androidx.ui.text.style.TextIndent
+import androidx.compose.ui.text.ParagraphStyle
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.annotatedString
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextIndent
import androidx.ui.unit.sp
@Sampled
diff --git a/ui/ui-text-core/samples/src/main/java/androidx/ui/text/samples/SpanStyleSamples.kt b/ui/ui-text-core/samples/src/main/java/androidx/compose/ui/text/samples/SpanStyleSamples.kt
similarity index 86%
rename from ui/ui-text-core/samples/src/main/java/androidx/ui/text/samples/SpanStyleSamples.kt
rename to ui/ui-text-core/samples/src/main/java/androidx/compose/ui/text/samples/SpanStyleSamples.kt
index 725a166..5d0a747 100644
--- a/ui/ui-text-core/samples/src/main/java/androidx/ui/text/samples/SpanStyleSamples.kt
+++ b/ui/ui-text-core/samples/src/main/java/androidx/compose/ui/text/samples/SpanStyleSamples.kt
@@ -14,15 +14,15 @@
* limitations under the License.
*/
-package androidx.ui.text.samples
+package androidx.compose.ui.text.samples
import androidx.annotation.Sampled
import androidx.compose.Composable
import androidx.compose.foundation.Text
import androidx.ui.graphics.Color
-import androidx.ui.text.SpanStyle
-import androidx.ui.text.annotatedString
-import androidx.ui.text.withStyle
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.annotatedString
+import androidx.compose.ui.text.withStyle
import androidx.ui.unit.sp
@Sampled
diff --git a/ui/ui-text-core/samples/src/main/java/androidx/ui/text/samples/TextDecorationSamples.kt b/ui/ui-text-core/samples/src/main/java/androidx/compose/ui/text/samples/TextDecorationSamples.kt
similarity index 92%
rename from ui/ui-text-core/samples/src/main/java/androidx/ui/text/samples/TextDecorationSamples.kt
rename to ui/ui-text-core/samples/src/main/java/androidx/compose/ui/text/samples/TextDecorationSamples.kt
index cc3d3b8..b6c1da3 100644
--- a/ui/ui-text-core/samples/src/main/java/androidx/ui/text/samples/TextDecorationSamples.kt
+++ b/ui/ui-text-core/samples/src/main/java/androidx/compose/ui/text/samples/TextDecorationSamples.kt
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-package androidx.ui.text.samples
+package androidx.compose.ui.text.samples
import androidx.annotation.Sampled
import androidx.compose.Composable
import androidx.compose.foundation.Text
-import androidx.ui.text.style.TextDecoration
+import androidx.compose.ui.text.style.TextDecoration
@Sampled
@Composable
diff --git a/ui/ui-text-core/samples/src/main/java/androidx/ui/text/samples/TextStyleSamples.kt b/ui/ui-text-core/samples/src/main/java/androidx/compose/ui/text/samples/TextStyleSamples.kt
similarity index 81%
rename from ui/ui-text-core/samples/src/main/java/androidx/ui/text/samples/TextStyleSamples.kt
rename to ui/ui-text-core/samples/src/main/java/androidx/compose/ui/text/samples/TextStyleSamples.kt
index b12cc0d8..5b14f7e 100644
--- a/ui/ui-text-core/samples/src/main/java/androidx/ui/text/samples/TextStyleSamples.kt
+++ b/ui/ui-text-core/samples/src/main/java/androidx/compose/ui/text/samples/TextStyleSamples.kt
@@ -14,17 +14,17 @@
* limitations under the License.
*/
-package androidx.ui.text.samples
+package androidx.compose.ui.text.samples
import androidx.annotation.Sampled
import androidx.compose.Composable
import androidx.compose.foundation.Text
import androidx.ui.graphics.Color
-import androidx.ui.text.TextStyle
-import androidx.ui.text.font.FontFamily
-import androidx.ui.text.font.FontStyle
-import androidx.ui.text.font.FontWeight
-import androidx.ui.text.style.TextDecoration
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextDecoration
import androidx.ui.unit.em
import androidx.ui.unit.sp
diff --git a/ui/ui-text-core/samples/src/main/java/androidx/ui/text/samples/VisualTransformationSamples.kt b/ui/ui-text-core/samples/src/main/java/androidx/compose/ui/text/samples/VisualTransformationSamples.kt
similarity index 92%
rename from ui/ui-text-core/samples/src/main/java/androidx/ui/text/samples/VisualTransformationSamples.kt
rename to ui/ui-text-core/samples/src/main/java/androidx/compose/ui/text/samples/VisualTransformationSamples.kt
index e25e640..11e3f72 100644
--- a/ui/ui-text-core/samples/src/main/java/androidx/ui/text/samples/VisualTransformationSamples.kt
+++ b/ui/ui-text-core/samples/src/main/java/androidx/compose/ui/text/samples/VisualTransformationSamples.kt
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-package androidx.ui.text.samples
+package androidx.compose.ui.text.samples
import androidx.annotation.Sampled
-import androidx.ui.input.OffsetMap
-import androidx.ui.input.TransformedText
-import androidx.ui.text.AnnotatedString
+import androidx.compose.ui.text.input.OffsetMap
+import androidx.compose.ui.text.input.TransformedText
+import androidx.compose.ui.text.AnnotatedString
@Sampled
fun passwordFilter(text: AnnotatedString): TransformedText {
diff --git a/ui/ui-text-core/src/androidAndroidTest/AndroidManifest.xml b/ui/ui-text-core/src/androidAndroidTest/AndroidManifest.xml
index 92206d6..39e91c6 100644
--- a/ui/ui-text-core/src/androidAndroidTest/AndroidManifest.xml
+++ b/ui/ui-text-core/src/androidAndroidTest/AndroidManifest.xml
@@ -14,4 +14,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="androidx.ui.text.core.test" />
+<manifest package="androidx.compose.ui.text" />
diff --git a/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/FontTestData.kt b/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/FontTestData.kt
similarity index 95%
rename from ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/FontTestData.kt
rename to ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/FontTestData.kt
index cccb5e7..21fe261 100644
--- a/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/FontTestData.kt
+++ b/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/FontTestData.kt
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-package androidx.ui.text
+package androidx.compose.ui.text
-import androidx.ui.text.font.font
-import androidx.ui.text.font.FontStyle
-import androidx.ui.text.font.FontWeight
-import androidx.ui.text.font.test.R
+import androidx.compose.ui.text.font.font
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.font.test.R
class FontTestData {
companion object {
diff --git a/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/MultiParagraphIntegrationTest.kt b/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/MultiParagraphIntegrationTest.kt
similarity index 98%
rename from ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/MultiParagraphIntegrationTest.kt
rename to ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/MultiParagraphIntegrationTest.kt
index 8c54adf..f1b57593 100644
--- a/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/MultiParagraphIntegrationTest.kt
+++ b/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/MultiParagraphIntegrationTest.kt
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package androidx.ui.text
+package androidx.compose.ui.text
import androidx.test.filters.SdkSuppress
import androidx.test.filters.SmallTest
@@ -23,13 +23,13 @@
import androidx.ui.geometry.Rect
import androidx.ui.graphics.Path
import androidx.ui.graphics.PathOperation
-import androidx.ui.intl.LocaleList
-import androidx.ui.text.FontTestData.Companion.BASIC_MEASURE_FONT
-import androidx.ui.text.font.asFontFamily
-import androidx.ui.text.style.ResolvedTextDirection
-import androidx.ui.text.style.TextAlign
-import androidx.ui.text.style.TextDirection
-import androidx.ui.text.style.TextIndent
+import androidx.compose.ui.text.intl.LocaleList
+import androidx.compose.ui.text.FontTestData.Companion.BASIC_MEASURE_FONT
+import androidx.compose.ui.text.font.asFontFamily
+import androidx.compose.ui.text.style.ResolvedTextDirection
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextDirection
+import androidx.compose.ui.text.style.TextIndent
import androidx.ui.unit.Density
import androidx.ui.unit.TextUnit
import androidx.ui.unit.em
diff --git a/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/MultiParagraphIntegrationTextDirectionTest.kt b/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/MultiParagraphIntegrationTextDirectionTest.kt
similarity index 97%
rename from ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/MultiParagraphIntegrationTextDirectionTest.kt
rename to ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/MultiParagraphIntegrationTextDirectionTest.kt
index 4ea7ff5..e71ea3e 100644
--- a/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/MultiParagraphIntegrationTextDirectionTest.kt
+++ b/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/MultiParagraphIntegrationTextDirectionTest.kt
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package androidx.ui.text
+package androidx.compose.ui.text
import androidx.test.filters.SmallTest
import androidx.test.platform.app.InstrumentationRegistry
-import androidx.ui.intl.LocaleList
-import androidx.ui.text.font.asFontFamily
-import androidx.ui.text.style.ResolvedTextDirection
-import androidx.ui.text.style.TextDirection
+import androidx.compose.ui.text.intl.LocaleList
+import androidx.compose.ui.text.font.asFontFamily
+import androidx.compose.ui.text.style.ResolvedTextDirection
+import androidx.compose.ui.text.style.TextDirection
import androidx.ui.unit.Density
import androidx.ui.unit.TextUnit
import androidx.ui.unit.sp
diff --git a/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/ParagraphIntegrationTest.kt b/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/ParagraphIntegrationTest.kt
similarity index 99%
rename from ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/ParagraphIntegrationTest.kt
rename to ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/ParagraphIntegrationTest.kt
index 4f2e661..e195555 100644
--- a/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/ParagraphIntegrationTest.kt
+++ b/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/ParagraphIntegrationTest.kt
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package androidx.ui.text
+package androidx.compose.ui.text
import androidx.test.filters.SdkSuppress
import androidx.test.filters.SmallTest
import androidx.test.platform.app.InstrumentationRegistry
-import androidx.ui.intl.LocaleList
+import androidx.compose.ui.text.intl.LocaleList
import androidx.ui.geometry.Rect
import androidx.ui.graphics.Canvas
import androidx.ui.graphics.Color
@@ -28,18 +28,18 @@
import androidx.ui.graphics.PathOperation
import androidx.ui.graphics.Shadow
import androidx.ui.graphics.asAndroidBitmap
-import androidx.ui.text.FontTestData.Companion.BASIC_KERN_FONT
-import androidx.ui.text.FontTestData.Companion.BASIC_MEASURE_FONT
-import androidx.ui.text.FontTestData.Companion.FONT_100_REGULAR
-import androidx.ui.text.FontTestData.Companion.FONT_200_REGULAR
-import androidx.ui.text.font.asFontFamily
-import androidx.ui.text.matchers.assertThat
-import androidx.ui.text.matchers.isZero
-import androidx.ui.text.style.TextAlign
-import androidx.ui.text.style.ResolvedTextDirection
-import androidx.ui.text.style.TextDirection
-import androidx.ui.text.style.TextGeometricTransform
-import androidx.ui.text.style.TextIndent
+import androidx.compose.ui.text.FontTestData.Companion.BASIC_KERN_FONT
+import androidx.compose.ui.text.FontTestData.Companion.BASIC_MEASURE_FONT
+import androidx.compose.ui.text.FontTestData.Companion.FONT_100_REGULAR
+import androidx.compose.ui.text.FontTestData.Companion.FONT_200_REGULAR
+import androidx.compose.ui.text.font.asFontFamily
+import androidx.compose.ui.text.matchers.assertThat
+import androidx.compose.ui.text.matchers.isZero
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.ResolvedTextDirection
+import androidx.compose.ui.text.style.TextDirection
+import androidx.compose.ui.text.style.TextGeometricTransform
+import androidx.compose.ui.text.style.TextIndent
import androidx.ui.unit.Density
import androidx.ui.geometry.Offset
import androidx.ui.unit.em
diff --git a/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/ParagraphIntegrationTextDirectionTest.kt b/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/ParagraphIntegrationTextDirectionTest.kt
similarity index 95%
rename from ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/ParagraphIntegrationTextDirectionTest.kt
rename to ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/ParagraphIntegrationTextDirectionTest.kt
index 6aa73e2..1cde843 100644
--- a/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/ParagraphIntegrationTextDirectionTest.kt
+++ b/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/ParagraphIntegrationTextDirectionTest.kt
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-package androidx.ui.text
+package androidx.compose.ui.text
import androidx.test.filters.SmallTest
import androidx.test.platform.app.InstrumentationRegistry
-import androidx.ui.intl.LocaleList
-import androidx.ui.text.style.ResolvedTextDirection
+import androidx.compose.ui.text.intl.LocaleList
+import androidx.compose.ui.text.style.ResolvedTextDirection
import androidx.ui.unit.Density
import com.google.common.truth.Truth.assertThat
import org.junit.After
diff --git a/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/ParagraphIntrinsicIntegrationTest.kt b/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/ParagraphIntrinsicIntegrationTest.kt
similarity index 98%
rename from ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/ParagraphIntrinsicIntegrationTest.kt
rename to ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/ParagraphIntrinsicIntegrationTest.kt
index 1aaea33..59cc6bc 100644
--- a/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/ParagraphIntrinsicIntegrationTest.kt
+++ b/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/ParagraphIntrinsicIntegrationTest.kt
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package androidx.ui.text
+package androidx.compose.ui.text
import androidx.test.filters.SmallTest
import androidx.test.platform.app.InstrumentationRegistry
-import androidx.ui.text.font.asFontFamily
+import androidx.compose.ui.text.font.asFontFamily
import androidx.ui.unit.Density
import androidx.ui.unit.TextUnit
import androidx.ui.unit.sp
diff --git a/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/ParagraphPlaceholderIntegrationTest.kt b/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/ParagraphPlaceholderIntegrationTest.kt
similarity index 99%
rename from ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/ParagraphPlaceholderIntegrationTest.kt
rename to ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/ParagraphPlaceholderIntegrationTest.kt
index b2b1fe2..ace7224 100644
--- a/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/ParagraphPlaceholderIntegrationTest.kt
+++ b/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/ParagraphPlaceholderIntegrationTest.kt
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package androidx.ui.text
+package androidx.compose.ui.text
import androidx.test.platform.app.InstrumentationRegistry
-import androidx.ui.text.font.asFontFamily
+import androidx.compose.ui.text.font.asFontFamily
import androidx.ui.unit.Density
import androidx.ui.unit.TextUnit
import androidx.ui.unit.em
diff --git a/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/StringTest.kt b/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/StringTest.kt
similarity index 95%
rename from ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/StringTest.kt
rename to ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/StringTest.kt
index 2b24cbd..4370df6 100644
--- a/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/StringTest.kt
+++ b/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/StringTest.kt
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package androidx.ui.text
+package androidx.compose.ui.text
import androidx.test.filters.SmallTest
-import androidx.ui.intl.LocaleList
+import androidx.compose.ui.text.intl.LocaleList
import com.google.common.truth.Truth.assertThat
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/TextDelegateIntegrationTest.kt b/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/TextDelegateIntegrationTest.kt
similarity index 98%
rename from ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/TextDelegateIntegrationTest.kt
rename to ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/TextDelegateIntegrationTest.kt
index 5eca43e..48e6d90 100644
--- a/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/TextDelegateIntegrationTest.kt
+++ b/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/TextDelegateIntegrationTest.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.text
+package androidx.compose.ui.text
import android.graphics.Bitmap
import androidx.test.filters.SmallTest
@@ -25,9 +25,9 @@
import androidx.ui.graphics.Canvas
import androidx.ui.graphics.Color
import androidx.ui.graphics.Paint
-import androidx.ui.text.FontTestData.Companion.BASIC_MEASURE_FONT
-import androidx.ui.text.font.asFontFamily
-import androidx.ui.text.matchers.assertThat
+import androidx.compose.ui.text.FontTestData.Companion.BASIC_MEASURE_FONT
+import androidx.compose.ui.text.font.asFontFamily
+import androidx.compose.ui.text.matchers.assertThat
import androidx.ui.unit.Density
import androidx.ui.unit.sp
import com.google.common.truth.Truth.assertThat
diff --git a/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/TextLayoutResultIntegrationTest.kt b/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/TextLayoutResultIntegrationTest.kt
similarity index 96%
rename from ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/TextLayoutResultIntegrationTest.kt
rename to ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/TextLayoutResultIntegrationTest.kt
index cbe373b..58e833e 100644
--- a/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/TextLayoutResultIntegrationTest.kt
+++ b/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/TextLayoutResultIntegrationTest.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.text
+package androidx.compose.ui.text
import androidx.test.filters.SmallTest
import androidx.test.platform.app.InstrumentationRegistry
@@ -22,9 +22,9 @@
import androidx.ui.core.LayoutDirection
import androidx.ui.geometry.Offset
import androidx.ui.graphics.Canvas
-import androidx.ui.text.FontTestData.Companion.BASIC_MEASURE_FONT
-import androidx.ui.text.font.asFontFamily
-import androidx.ui.text.matchers.isZero
+import androidx.compose.ui.text.FontTestData.Companion.BASIC_MEASURE_FONT
+import androidx.compose.ui.text.font.asFontFamily
+import androidx.compose.ui.text.matchers.isZero
import androidx.ui.unit.Density
import androidx.ui.unit.sp
import com.google.common.truth.Truth.assertThat
diff --git a/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/TextTestExtensions.kt b/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/TextTestExtensions.kt
similarity index 92%
rename from ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/TextTestExtensions.kt
rename to ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/TextTestExtensions.kt
index e596f60..a0bd79f 100644
--- a/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/TextTestExtensions.kt
+++ b/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/TextTestExtensions.kt
@@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package androidx.ui.text
+package androidx.compose.ui.text
import android.content.Context
import android.graphics.Bitmap
import android.graphics.Canvas
import android.graphics.Typeface
import androidx.core.content.res.ResourcesCompat
-import androidx.ui.text.font.Font
-import androidx.ui.text.font.ResourceFont
+import androidx.compose.ui.text.font.Font
+import androidx.compose.ui.text.font.ResourceFont
import kotlin.math.ceil
import kotlin.math.roundToInt
diff --git a/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/input/BackspaceKeyEditOpTest.kt b/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/input/BackspaceKeyEditOpTest.kt
similarity index 97%
rename from ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/input/BackspaceKeyEditOpTest.kt
rename to ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/input/BackspaceKeyEditOpTest.kt
index ac30fd6..9427a195a 100644
--- a/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/input/BackspaceKeyEditOpTest.kt
+++ b/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/input/BackspaceKeyEditOpTest.kt
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package androidx.ui.input
+package androidx.compose.ui.text.input
import androidx.test.filters.SdkSuppress
import androidx.test.filters.SmallTest
-import androidx.ui.text.TextRange
+import androidx.compose.ui.text.TextRange
import org.junit.Assert.assertEquals
import org.junit.Assert.assertFalse
import org.junit.Test
diff --git a/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/input/MoveCursorEditOpTest.kt b/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/input/MoveCursorEditOpTest.kt
similarity index 98%
rename from ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/input/MoveCursorEditOpTest.kt
rename to ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/input/MoveCursorEditOpTest.kt
index 85d4ec0..b25c8cb 100644
--- a/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/input/MoveCursorEditOpTest.kt
+++ b/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/input/MoveCursorEditOpTest.kt
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package androidx.ui.input
+package androidx.compose.ui.text.input
import androidx.test.filters.SdkSuppress
import androidx.test.filters.SmallTest
-import androidx.ui.text.TextRange
+import androidx.compose.ui.text.TextRange
import org.junit.Assert.assertEquals
import org.junit.Assert.assertFalse
import org.junit.Test
diff --git a/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/intl/LocaleListTest.kt b/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/intl/LocaleListTest.kt
similarity index 97%
rename from ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/intl/LocaleListTest.kt
rename to ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/intl/LocaleListTest.kt
index 0839a0e..5b10e8a 100644
--- a/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/intl/LocaleListTest.kt
+++ b/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/intl/LocaleListTest.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.intl
+package androidx.compose.ui.text.intl
import androidx.test.filters.SmallTest
import com.google.common.truth.Truth.assertThat
diff --git a/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/intl/LocaleTest.kt b/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/intl/LocaleTest.kt
similarity index 97%
rename from ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/intl/LocaleTest.kt
rename to ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/intl/LocaleTest.kt
index 890157b..a86994c 100644
--- a/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/intl/LocaleTest.kt
+++ b/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/intl/LocaleTest.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.intl
+package androidx.compose.ui.text.intl
import androidx.test.filters.SmallTest
import com.google.common.truth.Truth.assertThat
diff --git a/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/matchers/BitmapSubject.kt b/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/matchers/BitmapSubject.kt
similarity index 97%
rename from ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/matchers/BitmapSubject.kt
rename to ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/matchers/BitmapSubject.kt
index 192dc3c..ab87842 100644
--- a/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/matchers/BitmapSubject.kt
+++ b/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/matchers/BitmapSubject.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.text.matchers
+package androidx.compose.ui.text.matchers
import android.graphics.Bitmap
import com.google.common.truth.FailureMetadata
diff --git a/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/matchers/CharSequenceSubject.kt b/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/matchers/CharSequenceSubject.kt
similarity index 99%
rename from ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/matchers/CharSequenceSubject.kt
rename to ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/matchers/CharSequenceSubject.kt
index 0b6238b..2dc842c 100644
--- a/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/matchers/CharSequenceSubject.kt
+++ b/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/matchers/CharSequenceSubject.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.text.matchers
+package androidx.compose.ui.text.matchers
import android.text.Spanned
import com.google.common.truth.Fact.simpleFact
diff --git a/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/matchers/ComposeMatchers.kt b/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/matchers/ComposeMatchers.kt
similarity index 96%
rename from ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/matchers/ComposeMatchers.kt
rename to ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/matchers/ComposeMatchers.kt
index f7366ae..bec7fcb 100644
--- a/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/matchers/ComposeMatchers.kt
+++ b/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/matchers/ComposeMatchers.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.text.matchers
+package androidx.compose.ui.text.matchers
import android.graphics.Bitmap
import android.graphics.Typeface
diff --git a/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/matchers/TypefaceSubject.kt b/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/matchers/TypefaceSubject.kt
similarity index 95%
rename from ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/matchers/TypefaceSubject.kt
rename to ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/matchers/TypefaceSubject.kt
index 3a3edbb..7d86827 100644
--- a/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/matchers/TypefaceSubject.kt
+++ b/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/matchers/TypefaceSubject.kt
@@ -14,15 +14,15 @@
* limitations under the License.
*/
-package androidx.ui.text.matchers
+package androidx.compose.ui.text.matchers
import android.graphics.Typeface
import android.os.Build
import android.text.TextPaint
-import androidx.ui.text.FontTestData
-import androidx.ui.text.font.FontStyle
-import androidx.ui.text.font.FontWeight
-import androidx.ui.text.matchers.TypefaceSubject.Companion.DEFINED_CHARACTERS
+import androidx.compose.ui.text.FontTestData
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.matchers.TypefaceSubject.Companion.DEFINED_CHARACTERS
import com.google.common.truth.FailureMetadata
import com.google.common.truth.Subject
import com.google.common.truth.Subject.Factory
diff --git a/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/platform/AndroidParagraphTest.kt b/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/platform/AndroidParagraphTest.kt
similarity index 97%
rename from ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/platform/AndroidParagraphTest.kt
rename to ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/platform/AndroidParagraphTest.kt
index c3e2c3e..e0cfd35 100644
--- a/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/platform/AndroidParagraphTest.kt
+++ b/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/platform/AndroidParagraphTest.kt
@@ -1,4 +1,4 @@
-package androidx.ui.text.platform
+package androidx.compose.ui.text.platform
import android.graphics.Paint
import android.text.TextPaint
@@ -11,27 +11,27 @@
import android.text.style.ScaleXSpan
import android.text.style.StrikethroughSpan
import android.text.style.UnderlineSpan
-import androidx.compose.ui.text.android.InternalPlatformTextApi
-import androidx.compose.ui.text.android.TextLayout
import androidx.test.filters.SmallTest
import androidx.test.platform.app.InstrumentationRegistry
import androidx.ui.geometry.Offset
import androidx.ui.graphics.Color
import androidx.ui.graphics.Shadow
import androidx.ui.graphics.toArgb
-import androidx.ui.intl.LocaleList
-import androidx.ui.text.AnnotatedString
-import androidx.ui.text.FontTestData.Companion.BASIC_MEASURE_FONT
-import androidx.ui.text.ParagraphConstraints
-import androidx.ui.text.SpanStyle
-import androidx.ui.text.TestFontResourceLoader
-import androidx.ui.text.TextStyle
-import androidx.ui.text.font.FontFamily
-import androidx.ui.text.font.FontStyle
-import androidx.ui.text.font.FontSynthesis
-import androidx.ui.text.font.FontWeight
-import androidx.ui.text.font.asFontFamily
-import androidx.ui.text.matchers.assertThat
+import androidx.compose.ui.text.intl.LocaleList
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.FontTestData.Companion.BASIC_MEASURE_FONT
+import androidx.compose.ui.text.ParagraphConstraints
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.TestFontResourceLoader
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.android.InternalPlatformTextApi
+import androidx.compose.ui.text.android.TextLayout
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.font.FontSynthesis
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.font.asFontFamily
+import androidx.compose.ui.text.matchers.assertThat
import androidx.compose.ui.text.android.style.BaselineShiftSpan
import androidx.compose.ui.text.android.style.FontFeatureSpan
import androidx.compose.ui.text.android.style.FontSpan
@@ -39,11 +39,11 @@
import androidx.compose.ui.text.android.style.LetterSpacingSpanPx
import androidx.compose.ui.text.android.style.ShadowSpan
import androidx.compose.ui.text.android.style.SkewXSpan
-import androidx.ui.text.style.BaselineShift
-import androidx.ui.text.style.TextAlign
-import androidx.ui.text.style.TextDecoration
-import androidx.ui.text.style.TextGeometricTransform
-import androidx.ui.text.style.TextIndent
+import androidx.compose.ui.text.style.BaselineShift
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextDecoration
+import androidx.compose.ui.text.style.TextGeometricTransform
+import androidx.compose.ui.text.style.TextIndent
import androidx.ui.unit.Density
import androidx.ui.unit.em
import androidx.ui.unit.sp
diff --git a/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/platform/AndroidParagraphTextDirectionTest.kt b/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/platform/AndroidParagraphTextDirectionTest.kt
similarity index 96%
rename from ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/platform/AndroidParagraphTextDirectionTest.kt
rename to ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/platform/AndroidParagraphTextDirectionTest.kt
index 6c1e7d0..61365d6 100644
--- a/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/platform/AndroidParagraphTextDirectionTest.kt
+++ b/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/platform/AndroidParagraphTextDirectionTest.kt
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-package androidx.ui.text.platform
+package androidx.compose.ui.text.platform
import androidx.compose.ui.text.android.InternalPlatformTextApi
import androidx.compose.ui.text.android.LayoutCompat
import androidx.test.filters.SmallTest
-import androidx.ui.intl.LocaleList
-import androidx.ui.text.style.TextDirection
+import androidx.compose.ui.text.intl.LocaleList
+import androidx.compose.ui.text.style.TextDirection
import com.google.common.truth.Truth.assertThat
import org.junit.After
import org.junit.Before
diff --git a/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/platform/AndroidTypefaceCacheTest.kt b/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/platform/AndroidTypefaceCacheTest.kt
similarity index 91%
rename from ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/platform/AndroidTypefaceCacheTest.kt
rename to ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/platform/AndroidTypefaceCacheTest.kt
index 74daa86..3d04b1d 100644
--- a/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/platform/AndroidTypefaceCacheTest.kt
+++ b/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/platform/AndroidTypefaceCacheTest.kt
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-package androidx.ui.text.platform
+package androidx.compose.ui.text.platform
import androidx.test.filters.SmallTest
import androidx.test.platform.app.InstrumentationRegistry
-import androidx.ui.text.FontTestData
-import androidx.ui.text.matchers.assertThat
+import androidx.compose.ui.text.FontTestData
+import androidx.compose.ui.text.matchers.assertThat
import org.junit.Test
import org.junit.runner.RunWith
import org.mockito.junit.MockitoJUnitRunner
diff --git a/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/platform/AndroidTypefaceSubsetTest.kt b/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/platform/AndroidTypefaceSubsetTest.kt
similarity index 91%
rename from ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/platform/AndroidTypefaceSubsetTest.kt
rename to ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/platform/AndroidTypefaceSubsetTest.kt
index 92cffca..08a805a 100644
--- a/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/platform/AndroidTypefaceSubsetTest.kt
+++ b/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/platform/AndroidTypefaceSubsetTest.kt
@@ -14,18 +14,18 @@
* limitations under the License.
*/
-package androidx.ui.text.platform
+package androidx.compose.ui.text.platform
import android.content.Context
import androidx.test.filters.SmallTest
import androidx.test.platform.app.InstrumentationRegistry
-import androidx.ui.text.FontTestData
-import androidx.ui.text.font.FontFamily
-import androidx.ui.text.font.FontStyle
-import androidx.ui.text.font.FontSynthesis
-import androidx.ui.text.font.FontWeight
-import androidx.ui.text.font.fontFamily
-import androidx.ui.text.matchers.assertThat
+import androidx.compose.ui.text.FontTestData
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.font.FontSynthesis
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.font.fontFamily
+import androidx.compose.ui.text.matchers.assertThat
import org.junit.Test
import org.junit.runner.RunWith
import org.mockito.junit.MockitoJUnitRunner
diff --git a/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/platform/AndroidTypefaceTest.kt b/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/platform/AndroidTypefaceTest.kt
similarity index 96%
rename from ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/platform/AndroidTypefaceTest.kt
rename to ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/platform/AndroidTypefaceTest.kt
index 8b66324..c60c98c 100644
--- a/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/platform/AndroidTypefaceTest.kt
+++ b/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/platform/AndroidTypefaceTest.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.text.platform
+package androidx.compose.ui.text.platform
import android.content.Context
import android.graphics.Typeface
@@ -22,17 +22,17 @@
import androidx.test.filters.SdkSuppress
import androidx.test.filters.SmallTest
import androidx.test.platform.app.InstrumentationRegistry
-import androidx.ui.text.FontTestData
-import androidx.ui.text.font.FontFamily
-import androidx.ui.text.font.FontMatcher
-import androidx.ui.text.font.FontStyle
-import androidx.ui.text.font.FontSynthesis
-import androidx.ui.text.font.FontWeight
-import androidx.ui.text.font.asFontFamily
-import androidx.ui.text.font.font
-import androidx.ui.text.font.fontFamily
-import androidx.ui.text.matchers.assertThat
-import androidx.ui.text.core.test.R
+import androidx.compose.ui.text.FontTestData
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontMatcher
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.font.FontSynthesis
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.font.asFontFamily
+import androidx.compose.ui.text.font.font
+import androidx.compose.ui.text.font.fontFamily
+import androidx.compose.ui.text.matchers.assertThat
+import androidx.compose.ui.text.test.R
import com.google.common.truth.Truth.assertThat
import com.nhaarman.mockitokotlin2.any
import com.nhaarman.mockitokotlin2.eq
diff --git a/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/platform/GenerifFontFamilyCacheTest.kt b/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/platform/GenerifFontFamilyCacheTest.kt
similarity index 84%
rename from ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/platform/GenerifFontFamilyCacheTest.kt
rename to ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/platform/GenerifFontFamilyCacheTest.kt
index a094134..47e7d9a 100644
--- a/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/platform/GenerifFontFamilyCacheTest.kt
+++ b/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/platform/GenerifFontFamilyCacheTest.kt
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package androidx.ui.text.platform
+package androidx.compose.ui.text.platform
import androidx.test.filters.SmallTest
-import androidx.ui.text.font.FontFamily
-import androidx.ui.text.font.FontStyle
-import androidx.ui.text.font.FontSynthesis
-import androidx.ui.text.font.FontWeight
-import androidx.ui.text.matchers.assertThat
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.font.FontSynthesis
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.matchers.assertThat
import org.junit.Test
import org.junit.runner.RunWith
import org.mockito.junit.MockitoJUnitRunner
diff --git a/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/platform/TextTestExtensions.kt b/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/platform/TextTestExtensions.kt
similarity index 97%
rename from ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/platform/TextTestExtensions.kt
rename to ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/platform/TextTestExtensions.kt
index e686786..175ba72 100644
--- a/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/platform/TextTestExtensions.kt
+++ b/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/platform/TextTestExtensions.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.text.platform
+package androidx.compose.ui.text.platform
import android.graphics.Bitmap
import android.graphics.Canvas
diff --git a/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/platform/TypefaceAdapterTest.kt b/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/platform/TypefaceAdapterTest.kt
similarity index 89%
rename from ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/platform/TypefaceAdapterTest.kt
rename to ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/platform/TypefaceAdapterTest.kt
index 419d336..11e1a26 100644
--- a/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/ui/text/platform/TypefaceAdapterTest.kt
+++ b/ui/ui-text-core/src/androidAndroidTest/kotlin/androidx/compose/ui/text/platform/TypefaceAdapterTest.kt
@@ -13,42 +13,42 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package androidx.ui.text.platform
+package androidx.compose.ui.text.platform
import android.graphics.Typeface
import android.os.Build
import androidx.test.filters.SdkSuppress
import androidx.test.filters.SmallTest
import androidx.test.platform.app.InstrumentationRegistry
-import androidx.ui.text.FontTestData.Companion.FONT_100_ITALIC
-import androidx.ui.text.FontTestData.Companion.FONT_100_REGULAR
-import androidx.ui.text.FontTestData.Companion.FONT_200_ITALIC
-import androidx.ui.text.FontTestData.Companion.FONT_200_REGULAR
-import androidx.ui.text.FontTestData.Companion.FONT_300_ITALIC
-import androidx.ui.text.FontTestData.Companion.FONT_300_REGULAR
-import androidx.ui.text.FontTestData.Companion.FONT_400_ITALIC
-import androidx.ui.text.FontTestData.Companion.FONT_400_REGULAR
-import androidx.ui.text.FontTestData.Companion.FONT_500_ITALIC
-import androidx.ui.text.FontTestData.Companion.FONT_500_REGULAR
-import androidx.ui.text.FontTestData.Companion.FONT_600_ITALIC
-import androidx.ui.text.FontTestData.Companion.FONT_600_REGULAR
-import androidx.ui.text.FontTestData.Companion.FONT_700_ITALIC
-import androidx.ui.text.FontTestData.Companion.FONT_700_REGULAR
-import androidx.ui.text.FontTestData.Companion.FONT_800_ITALIC
-import androidx.ui.text.FontTestData.Companion.FONT_800_REGULAR
-import androidx.ui.text.FontTestData.Companion.FONT_900_ITALIC
-import androidx.ui.text.FontTestData.Companion.FONT_900_REGULAR
-import androidx.ui.text.TestFontResourceLoader
-import androidx.ui.text.font.FontFamily
-import androidx.ui.text.font.font
-import androidx.ui.text.font.fontFamily
-import androidx.ui.text.font.FontMatcher
-import androidx.ui.text.font.FontStyle
-import androidx.ui.text.font.FontSynthesis
-import androidx.ui.text.font.FontWeight
-import androidx.ui.text.font.asFontFamily
-import androidx.ui.text.matchers.assertThat
-import androidx.ui.text.core.test.R
+import androidx.compose.ui.text.FontTestData.Companion.FONT_100_ITALIC
+import androidx.compose.ui.text.FontTestData.Companion.FONT_100_REGULAR
+import androidx.compose.ui.text.FontTestData.Companion.FONT_200_ITALIC
+import androidx.compose.ui.text.FontTestData.Companion.FONT_200_REGULAR
+import androidx.compose.ui.text.FontTestData.Companion.FONT_300_ITALIC
+import androidx.compose.ui.text.FontTestData.Companion.FONT_300_REGULAR
+import androidx.compose.ui.text.FontTestData.Companion.FONT_400_ITALIC
+import androidx.compose.ui.text.FontTestData.Companion.FONT_400_REGULAR
+import androidx.compose.ui.text.FontTestData.Companion.FONT_500_ITALIC
+import androidx.compose.ui.text.FontTestData.Companion.FONT_500_REGULAR
+import androidx.compose.ui.text.FontTestData.Companion.FONT_600_ITALIC
+import androidx.compose.ui.text.FontTestData.Companion.FONT_600_REGULAR
+import androidx.compose.ui.text.FontTestData.Companion.FONT_700_ITALIC
+import androidx.compose.ui.text.FontTestData.Companion.FONT_700_REGULAR
+import androidx.compose.ui.text.FontTestData.Companion.FONT_800_ITALIC
+import androidx.compose.ui.text.FontTestData.Companion.FONT_800_REGULAR
+import androidx.compose.ui.text.FontTestData.Companion.FONT_900_ITALIC
+import androidx.compose.ui.text.FontTestData.Companion.FONT_900_REGULAR
+import androidx.compose.ui.text.TestFontResourceLoader
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.font
+import androidx.compose.ui.text.font.fontFamily
+import androidx.compose.ui.text.font.FontMatcher
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.font.FontSynthesis
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.font.asFontFamily
+import androidx.compose.ui.text.matchers.assertThat
+import androidx.compose.ui.text.test.R
import com.google.common.truth.Truth.assertThat
import com.nhaarman.mockitokotlin2.any
import com.nhaarman.mockitokotlin2.eq
diff --git a/ui/ui-text-core/src/androidMain/AndroidManifest.xml b/ui/ui-text-core/src/androidMain/AndroidManifest.xml
index 3085d36..39e91c6 100644
--- a/ui/ui-text-core/src/androidMain/AndroidManifest.xml
+++ b/ui/ui-text-core/src/androidMain/AndroidManifest.xml
@@ -14,4 +14,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="androidx.ui.text.core" />
+<manifest package="androidx.compose.ui.text" />
diff --git a/ui/ui-text-core/src/androidMain/kotlin/androidx/ui/intl/AndroidLocaleDelegate.kt b/ui/ui-text-core/src/androidMain/kotlin/androidx/compose/ui/text/intl/AndroidLocaleDelegate.kt
similarity index 98%
rename from ui/ui-text-core/src/androidMain/kotlin/androidx/ui/intl/AndroidLocaleDelegate.kt
rename to ui/ui-text-core/src/androidMain/kotlin/androidx/compose/ui/text/intl/AndroidLocaleDelegate.kt
index 35e3ec3..a192a45d 100644
--- a/ui/ui-text-core/src/androidMain/kotlin/androidx/ui/intl/AndroidLocaleDelegate.kt
+++ b/ui/ui-text-core/src/androidMain/kotlin/androidx/compose/ui/text/intl/AndroidLocaleDelegate.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.intl
+package androidx.compose.ui.text.intl
import androidx.annotation.RequiresApi
import android.os.LocaleList as AndroidLocaleList
diff --git a/ui/ui-text-core/src/androidMain/kotlin/androidx/ui/intl/AndroidPlatformLocale.kt b/ui/ui-text-core/src/androidMain/kotlin/androidx/compose/ui/text/intl/AndroidPlatformLocale.kt
similarity index 95%
rename from ui/ui-text-core/src/androidMain/kotlin/androidx/ui/intl/AndroidPlatformLocale.kt
rename to ui/ui-text-core/src/androidMain/kotlin/androidx/compose/ui/text/intl/AndroidPlatformLocale.kt
index 340722c..3bb2d2a 100644
--- a/ui/ui-text-core/src/androidMain/kotlin/androidx/ui/intl/AndroidPlatformLocale.kt
+++ b/ui/ui-text-core/src/androidMain/kotlin/androidx/compose/ui/text/intl/AndroidPlatformLocale.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.intl
+package androidx.compose.ui.text.intl
import android.os.Build
diff --git a/ui/ui-text-core/src/androidMain/kotlin/androidx/ui/text/platform/AndroidDefaultTypeface.kt b/ui/ui-text-core/src/androidMain/kotlin/androidx/compose/ui/text/platform/AndroidDefaultTypeface.kt
similarity index 81%
rename from ui/ui-text-core/src/androidMain/kotlin/androidx/ui/text/platform/AndroidDefaultTypeface.kt
rename to ui/ui-text-core/src/androidMain/kotlin/androidx/compose/ui/text/platform/AndroidDefaultTypeface.kt
index 7c0bdf3..8951161 100644
--- a/ui/ui-text-core/src/androidMain/kotlin/androidx/ui/text/platform/AndroidDefaultTypeface.kt
+++ b/ui/ui-text-core/src/androidMain/kotlin/androidx/compose/ui/text/platform/AndroidDefaultTypeface.kt
@@ -14,15 +14,15 @@
* limitations under the License.
*/
-package androidx.ui.text.platform
+package androidx.compose.ui.text.platform
import android.graphics.Typeface
import android.os.Build
-import androidx.ui.text.font.DefaultFontFamily
-import androidx.ui.text.font.FontFamily
-import androidx.ui.text.font.FontStyle
-import androidx.ui.text.font.FontSynthesis
-import androidx.ui.text.font.FontWeight
+import androidx.compose.ui.text.font.DefaultFontFamily
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.font.FontSynthesis
+import androidx.compose.ui.text.font.FontWeight
/**
* An implementation of [AndroidTypeface] for [DefaultFontFamily]
diff --git a/ui/ui-text-core/src/androidMain/kotlin/androidx/ui/text/platform/AndroidFontListTypeface.kt b/ui/ui-text-core/src/androidMain/kotlin/androidx/compose/ui/text/platform/AndroidFontListTypeface.kt
similarity index 89%
rename from ui/ui-text-core/src/androidMain/kotlin/androidx/ui/text/platform/AndroidFontListTypeface.kt
rename to ui/ui-text-core/src/androidMain/kotlin/androidx/compose/ui/text/platform/AndroidFontListTypeface.kt
index bab7ef8..a62a522 100644
--- a/ui/ui-text-core/src/androidMain/kotlin/androidx/ui/text/platform/AndroidFontListTypeface.kt
+++ b/ui/ui-text-core/src/androidMain/kotlin/androidx/compose/ui/text/platform/AndroidFontListTypeface.kt
@@ -14,21 +14,21 @@
* limitations under the License.
*/
-package androidx.ui.text.platform
+package androidx.compose.ui.text.platform
import android.content.Context
import android.graphics.Typeface
import android.util.TypedValue
import androidx.collection.LruCache
import androidx.core.content.res.ResourcesCompat
-import androidx.ui.text.font.Font
-import androidx.ui.text.font.FontFamily
-import androidx.ui.text.font.FontListFontFamily
-import androidx.ui.text.font.FontMatcher
-import androidx.ui.text.font.FontStyle
-import androidx.ui.text.font.FontSynthesis
-import androidx.ui.text.font.FontWeight
-import androidx.ui.text.font.ResourceFont
+import androidx.compose.ui.text.font.Font
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontListFontFamily
+import androidx.compose.ui.text.font.FontMatcher
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.font.FontSynthesis
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.font.ResourceFont
import androidx.ui.util.fastForEach
/**
diff --git a/ui/ui-text-core/src/androidMain/kotlin/androidx/ui/text/platform/AndroidGenericFontFamilyTypeface.kt b/ui/ui-text-core/src/androidMain/kotlin/androidx/compose/ui/text/platform/AndroidGenericFontFamilyTypeface.kt
similarity index 89%
rename from ui/ui-text-core/src/androidMain/kotlin/androidx/ui/text/platform/AndroidGenericFontFamilyTypeface.kt
rename to ui/ui-text-core/src/androidMain/kotlin/androidx/compose/ui/text/platform/AndroidGenericFontFamilyTypeface.kt
index fe3909f..4ded9a9 100644
--- a/ui/ui-text-core/src/androidMain/kotlin/androidx/ui/text/platform/AndroidGenericFontFamilyTypeface.kt
+++ b/ui/ui-text-core/src/androidMain/kotlin/androidx/compose/ui/text/platform/AndroidGenericFontFamilyTypeface.kt
@@ -14,17 +14,17 @@
* limitations under the License.
*/
-package androidx.ui.text.platform
+package androidx.compose.ui.text.platform
import android.graphics.Typeface
import android.os.Build
import androidx.annotation.GuardedBy
import androidx.collection.SparseArrayCompat
-import androidx.ui.text.font.FontFamily
-import androidx.ui.text.font.FontStyle
-import androidx.ui.text.font.FontSynthesis
-import androidx.ui.text.font.FontWeight
-import androidx.ui.text.font.GenericFontFamily
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.font.FontSynthesis
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.font.GenericFontFamily
/**
* An implementation of [AndroidTypeface] for [GenericFontFamily]
diff --git a/ui/ui-text-core/src/androidMain/kotlin/androidx/ui/text/platform/AndroidParagraph.kt b/ui/ui-text-core/src/androidMain/kotlin/androidx/compose/ui/text/platform/AndroidParagraph.kt
similarity index 95%
rename from ui/ui-text-core/src/androidMain/kotlin/androidx/ui/text/platform/AndroidParagraph.kt
rename to ui/ui-text-core/src/androidMain/kotlin/androidx/compose/ui/text/platform/AndroidParagraph.kt
index c6dfc09..553e0d9 100644
--- a/ui/ui-text-core/src/androidMain/kotlin/androidx/ui/text/platform/AndroidParagraph.kt
+++ b/ui/ui-text-core/src/androidMain/kotlin/androidx/compose/ui/text/platform/AndroidParagraph.kt
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package androidx.ui.text.platform
+package androidx.compose.ui.text.platform
import android.text.Spanned
import android.text.TextPaint
@@ -23,15 +23,15 @@
import androidx.ui.graphics.Canvas
import androidx.ui.graphics.Path
import androidx.ui.graphics.asComposePath
-import androidx.ui.text.AnnotatedString
-import androidx.ui.text.Paragraph
-import androidx.ui.text.ParagraphConstraints
-import androidx.ui.text.ParagraphIntrinsics
-import androidx.ui.text.Placeholder
-import androidx.ui.text.SpanStyle
-import androidx.ui.text.TextRange
-import androidx.ui.text.TextStyle
-import androidx.ui.text.font.Font
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.Paragraph
+import androidx.compose.ui.text.ParagraphConstraints
+import androidx.compose.ui.text.ParagraphIntrinsics
+import androidx.compose.ui.text.Placeholder
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.TextRange
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.Font
import androidx.compose.ui.text.android.LayoutCompat.ALIGN_CENTER
import androidx.compose.ui.text.android.LayoutCompat.ALIGN_LEFT
import androidx.compose.ui.text.android.LayoutCompat.ALIGN_NORMAL
@@ -44,8 +44,8 @@
import androidx.compose.ui.text.android.TextLayout
import androidx.compose.ui.text.android.selection.WordBoundary
import androidx.compose.ui.text.android.style.PlaceholderSpan
-import androidx.ui.text.style.TextAlign
-import androidx.ui.text.style.ResolvedTextDirection
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.ResolvedTextDirection
import androidx.ui.unit.Density
import androidx.ui.geometry.Offset
import androidx.ui.util.annotation.VisibleForTesting
diff --git a/ui/ui-text-core/src/androidMain/kotlin/androidx/ui/text/platform/AndroidParagraphHelper.kt b/ui/ui-text-core/src/androidMain/kotlin/androidx/compose/ui/text/platform/AndroidParagraphHelper.kt
similarity index 77%
rename from ui/ui-text-core/src/androidMain/kotlin/androidx/ui/text/platform/AndroidParagraphHelper.kt
rename to ui/ui-text-core/src/androidMain/kotlin/androidx/compose/ui/text/platform/AndroidParagraphHelper.kt
index 32a5b42..0dabd95 100644
--- a/ui/ui-text-core/src/androidMain/kotlin/androidx/ui/text/platform/AndroidParagraphHelper.kt
+++ b/ui/ui-text-core/src/androidMain/kotlin/androidx/compose/ui/text/platform/AndroidParagraphHelper.kt
@@ -14,18 +14,18 @@
* limitations under the License.
*/
-package androidx.ui.text.platform
+package androidx.compose.ui.text.platform
import android.text.SpannableString
import androidx.compose.ui.text.android.InternalPlatformTextApi
-import androidx.ui.text.AnnotatedString
-import androidx.ui.text.Placeholder
-import androidx.ui.text.SpanStyle
-import androidx.ui.text.platform.extensions.setLineHeight
-import androidx.ui.text.platform.extensions.setPlaceholders
-import androidx.ui.text.platform.extensions.setSpanStyles
-import androidx.ui.text.platform.extensions.setTextIndent
-import androidx.ui.text.style.TextIndent
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.Placeholder
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.platform.extensions.setLineHeight
+import androidx.compose.ui.text.platform.extensions.setPlaceholders
+import androidx.compose.ui.text.platform.extensions.setSpanStyles
+import androidx.compose.ui.text.platform.extensions.setTextIndent
+import androidx.compose.ui.text.style.TextIndent
import androidx.ui.unit.Density
import androidx.ui.unit.TextUnit
diff --git a/ui/ui-text-core/src/androidMain/kotlin/androidx/ui/text/platform/AndroidParagraphIntrinsics.kt b/ui/ui-text-core/src/androidMain/kotlin/androidx/compose/ui/text/platform/AndroidParagraphIntrinsics.kt
similarity index 90%
rename from ui/ui-text-core/src/androidMain/kotlin/androidx/ui/text/platform/AndroidParagraphIntrinsics.kt
rename to ui/ui-text-core/src/androidMain/kotlin/androidx/compose/ui/text/platform/AndroidParagraphIntrinsics.kt
index f4b1eb7..c38778a 100644
--- a/ui/ui-text-core/src/androidMain/kotlin/androidx/ui/text/platform/AndroidParagraphIntrinsics.kt
+++ b/ui/ui-text-core/src/androidMain/kotlin/androidx/compose/ui/text/platform/AndroidParagraphIntrinsics.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.text.platform
+package androidx.compose.ui.text.platform
import android.graphics.Paint
import android.text.TextPaint
@@ -23,16 +23,16 @@
import androidx.compose.ui.text.android.LayoutIntrinsics
import androidx.core.text.TextUtilsCompat
import androidx.core.view.ViewCompat
-import androidx.ui.intl.AndroidLocale
-import androidx.ui.intl.LocaleList
-import androidx.ui.text.AnnotatedString
-import androidx.ui.text.ParagraphIntrinsics
-import androidx.ui.text.Placeholder
-import androidx.ui.text.SpanStyle
-import androidx.ui.text.TextStyle
-import androidx.ui.text.font.Font
-import androidx.ui.text.platform.extensions.applySpanStyle
-import androidx.ui.text.style.TextDirection
+import androidx.compose.ui.text.intl.AndroidLocale
+import androidx.compose.ui.text.intl.LocaleList
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.ParagraphIntrinsics
+import androidx.compose.ui.text.Placeholder
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.Font
+import androidx.compose.ui.text.platform.extensions.applySpanStyle
+import androidx.compose.ui.text.style.TextDirection
import androidx.ui.unit.Density
import java.util.Locale
diff --git a/ui/ui-text-core/src/androidMain/kotlin/androidx/ui/text/platform/AndroidStringDelegate.kt b/ui/ui-text-core/src/androidMain/kotlin/androidx/compose/ui/text/platform/AndroidStringDelegate.kt
similarity index 86%
rename from ui/ui-text-core/src/androidMain/kotlin/androidx/ui/text/platform/AndroidStringDelegate.kt
rename to ui/ui-text-core/src/androidMain/kotlin/androidx/compose/ui/text/platform/AndroidStringDelegate.kt
index 02469d3..d5522c5 100644
--- a/ui/ui-text-core/src/androidMain/kotlin/androidx/ui/text/platform/AndroidStringDelegate.kt
+++ b/ui/ui-text-core/src/androidMain/kotlin/androidx/compose/ui/text/platform/AndroidStringDelegate.kt
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package androidx.ui.text.platform
+package androidx.compose.ui.text.platform
-import androidx.ui.intl.AndroidLocale
-import androidx.ui.intl.PlatformLocale
-import androidx.ui.text.PlatformStringDelegate
+import androidx.compose.ui.text.intl.AndroidLocale
+import androidx.compose.ui.text.intl.PlatformLocale
+import androidx.compose.ui.text.PlatformStringDelegate
/**
* An Android implementation of StringDelegate
diff --git a/ui/ui-text-core/src/androidMain/kotlin/androidx/ui/text/platform/AndroidTypeface.kt b/ui/ui-text-core/src/androidMain/kotlin/androidx/compose/ui/text/platform/AndroidTypeface.kt
similarity index 84%
rename from ui/ui-text-core/src/androidMain/kotlin/androidx/ui/text/platform/AndroidTypeface.kt
rename to ui/ui-text-core/src/androidMain/kotlin/androidx/compose/ui/text/platform/AndroidTypeface.kt
index 359a6ae..f30da6d 100644
--- a/ui/ui-text-core/src/androidMain/kotlin/androidx/ui/text/platform/AndroidTypeface.kt
+++ b/ui/ui-text-core/src/androidMain/kotlin/androidx/compose/ui/text/platform/AndroidTypeface.kt
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-package androidx.ui.text.platform
+package androidx.compose.ui.text.platform
-import androidx.ui.text.Typeface
-import androidx.ui.text.font.FontStyle
-import androidx.ui.text.font.FontSynthesis
-import androidx.ui.text.font.FontWeight
+import androidx.compose.ui.text.Typeface
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.font.FontSynthesis
+import androidx.compose.ui.text.font.FontWeight
import android.graphics.Typeface as NativeTypeface
/**
diff --git a/ui/ui-text-core/src/androidMain/kotlin/androidx/ui/text/platform/TypefaceAdapter.kt b/ui/ui-text-core/src/androidMain/kotlin/androidx/compose/ui/text/platform/TypefaceAdapter.kt
similarity index 94%
rename from ui/ui-text-core/src/androidMain/kotlin/androidx/ui/text/platform/TypefaceAdapter.kt
rename to ui/ui-text-core/src/androidMain/kotlin/androidx/compose/ui/text/platform/TypefaceAdapter.kt
index 29c8247f0..a99c794 100644
--- a/ui/ui-text-core/src/androidMain/kotlin/androidx/ui/text/platform/TypefaceAdapter.kt
+++ b/ui/ui-text-core/src/androidMain/kotlin/androidx/compose/ui/text/platform/TypefaceAdapter.kt
@@ -14,23 +14,23 @@
* limitations under the License.
*/
-package androidx.ui.text.platform
+package androidx.compose.ui.text.platform
import android.content.Context
import android.graphics.Typeface
import android.os.Build
import androidx.collection.LruCache
-import androidx.ui.text.font.DefaultFontFamily
-import androidx.ui.text.font.Font
-import androidx.ui.text.font.FontFamily
-import androidx.ui.text.font.FontListFontFamily
-import androidx.ui.text.font.FontMatcher
-import androidx.ui.text.font.FontStyle
-import androidx.ui.text.font.FontSynthesis
-import androidx.ui.text.font.FontWeight
-import androidx.ui.text.font.GenericFontFamily
-import androidx.ui.text.font.LoadedFontFamily
-import androidx.ui.text.font.font
+import androidx.compose.ui.text.font.DefaultFontFamily
+import androidx.compose.ui.text.font.Font
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontListFontFamily
+import androidx.compose.ui.text.font.FontMatcher
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.font.FontSynthesis
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.font.GenericFontFamily
+import androidx.compose.ui.text.font.LoadedFontFamily
+import androidx.compose.ui.text.font.font
/**
* Creates a Typeface based on generic font family or a custom [FontFamily].
@@ -274,7 +274,7 @@
context: Context,
fontFamily: FontFamily,
necessaryStyles: List<Pair<FontWeight, FontStyle>>? = null
-): androidx.ui.text.Typeface {
+): androidx.compose.ui.text.Typeface {
return when (fontFamily) {
is FontListFontFamily -> AndroidFontListTypeface(fontFamily, context, necessaryStyles)
is GenericFontFamily -> AndroidGenericFontFamilyTypeface(fontFamily)
diff --git a/ui/ui-text-core/src/androidMain/kotlin/androidx/ui/text/platform/extensions/LocaleExtensions.kt b/ui/ui-text-core/src/androidMain/kotlin/androidx/compose/ui/text/platform/extensions/LocaleExtensions.kt
similarity index 82%
rename from ui/ui-text-core/src/androidMain/kotlin/androidx/ui/text/platform/extensions/LocaleExtensions.kt
rename to ui/ui-text-core/src/androidMain/kotlin/androidx/compose/ui/text/platform/extensions/LocaleExtensions.kt
index 061c10d..a1b62b4f 100644
--- a/ui/ui-text-core/src/androidMain/kotlin/androidx/ui/text/platform/extensions/LocaleExtensions.kt
+++ b/ui/ui-text-core/src/androidMain/kotlin/androidx/compose/ui/text/platform/extensions/LocaleExtensions.kt
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-package androidx.ui.text.platform.extensions
+package androidx.compose.ui.text.platform.extensions
import androidx.annotation.RequiresApi
-import androidx.ui.intl.AndroidLocale
-import androidx.ui.intl.Locale
-import androidx.ui.intl.LocaleList
+import androidx.compose.ui.text.intl.AndroidLocale
+import androidx.compose.ui.text.intl.Locale
+import androidx.compose.ui.text.intl.LocaleList
internal fun Locale.toJavaLocale(): java.util.Locale = (platformLocale as AndroidLocale).javaLocale
diff --git a/ui/ui-text-core/src/androidMain/kotlin/androidx/ui/text/platform/extensions/PlaceholderExtensions.kt b/ui/ui-text-core/src/androidMain/kotlin/androidx/compose/ui/text/platform/extensions/PlaceholderExtensions.kt
similarity index 93%
rename from ui/ui-text-core/src/androidMain/kotlin/androidx/ui/text/platform/extensions/PlaceholderExtensions.kt
rename to ui/ui-text-core/src/androidMain/kotlin/androidx/compose/ui/text/platform/extensions/PlaceholderExtensions.kt
index 8a829ce..191691c 100644
--- a/ui/ui-text-core/src/androidMain/kotlin/androidx/ui/text/platform/extensions/PlaceholderExtensions.kt
+++ b/ui/ui-text-core/src/androidMain/kotlin/androidx/compose/ui/text/platform/extensions/PlaceholderExtensions.kt
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-package androidx.ui.text.platform.extensions
+package androidx.compose.ui.text.platform.extensions
import android.text.Spannable
-import androidx.ui.text.AnnotatedString
-import androidx.ui.text.Placeholder
-import androidx.ui.text.PlaceholderVerticalAlign
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.Placeholder
+import androidx.compose.ui.text.PlaceholderVerticalAlign
import androidx.compose.ui.text.android.InternalPlatformTextApi
import androidx.compose.ui.text.android.style.PlaceholderSpan
import androidx.ui.unit.Density
diff --git a/ui/ui-text-core/src/androidMain/kotlin/androidx/ui/text/platform/extensions/SpannableExtensions.kt b/ui/ui-text-core/src/androidMain/kotlin/androidx/compose/ui/text/platform/extensions/SpannableExtensions.kt
similarity index 93%
rename from ui/ui-text-core/src/androidMain/kotlin/androidx/ui/text/platform/extensions/SpannableExtensions.kt
rename to ui/ui-text-core/src/androidMain/kotlin/androidx/compose/ui/text/platform/extensions/SpannableExtensions.kt
index 8fb5d96..a33f12c 100644
--- a/ui/ui-text-core/src/androidMain/kotlin/androidx/ui/text/platform/extensions/SpannableExtensions.kt
+++ b/ui/ui-text-core/src/androidMain/kotlin/androidx/compose/ui/text/platform/extensions/SpannableExtensions.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.text.platform.extensions
+package androidx.compose.ui.text.platform.extensions
import android.graphics.Typeface
import android.os.Build
@@ -34,16 +34,16 @@
import androidx.ui.graphics.Shadow
import androidx.ui.graphics.isSet
import androidx.ui.graphics.toArgb
-import androidx.ui.intl.Locale
-import androidx.ui.intl.LocaleList
-import androidx.ui.text.AnnotatedString
-import androidx.ui.text.SpanStyle
-import androidx.ui.text.font.FontFamily
-import androidx.ui.text.font.FontStyle
-import androidx.ui.text.font.FontSynthesis
-import androidx.ui.text.font.FontWeight
+import androidx.compose.ui.text.intl.Locale
+import androidx.compose.ui.text.intl.LocaleList
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.font.FontSynthesis
+import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.android.InternalPlatformTextApi
-import androidx.ui.text.platform.TypefaceAdapter
+import androidx.compose.ui.text.platform.TypefaceAdapter
import androidx.compose.ui.text.android.style.BaselineShiftSpan
import androidx.compose.ui.text.android.style.FontFeatureSpan
import androidx.compose.ui.text.android.style.FontSpan
@@ -53,10 +53,10 @@
import androidx.compose.ui.text.android.style.LineHeightSpan
import androidx.compose.ui.text.android.style.ShadowSpan
import androidx.compose.ui.text.android.style.SkewXSpan
-import androidx.ui.text.style.BaselineShift
-import androidx.ui.text.style.TextDecoration
-import androidx.ui.text.style.TextGeometricTransform
-import androidx.ui.text.style.TextIndent
+import androidx.compose.ui.text.style.BaselineShift
+import androidx.compose.ui.text.style.TextDecoration
+import androidx.compose.ui.text.style.TextGeometricTransform
+import androidx.compose.ui.text.style.TextIndent
import androidx.ui.unit.Density
import androidx.ui.unit.TextUnit
import androidx.ui.unit.TextUnitType
diff --git a/ui/ui-text-core/src/androidMain/kotlin/androidx/ui/text/platform/extensions/TextPaintExtensions.kt b/ui/ui-text-core/src/androidMain/kotlin/androidx/compose/ui/text/platform/extensions/TextPaintExtensions.kt
similarity index 88%
rename from ui/ui-text-core/src/androidMain/kotlin/androidx/ui/text/platform/extensions/TextPaintExtensions.kt
rename to ui/ui-text-core/src/androidMain/kotlin/androidx/compose/ui/text/platform/extensions/TextPaintExtensions.kt
index 0d7fb2c..f8578b9 100644
--- a/ui/ui-text-core/src/androidMain/kotlin/androidx/ui/text/platform/extensions/TextPaintExtensions.kt
+++ b/ui/ui-text-core/src/androidMain/kotlin/androidx/compose/ui/text/platform/extensions/TextPaintExtensions.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.text.platform.extensions
+package androidx.compose.ui.text.platform.extensions
import android.graphics.Typeface
import android.os.Build
@@ -23,17 +23,17 @@
import androidx.ui.graphics.Shadow
import androidx.ui.graphics.isSet
import androidx.ui.graphics.toArgb
-import androidx.ui.intl.Locale
-import androidx.ui.intl.LocaleList
-import androidx.ui.text.SpanStyle
-import androidx.ui.text.font.FontListFontFamily
-import androidx.ui.text.font.FontStyle
-import androidx.ui.text.font.FontSynthesis
-import androidx.ui.text.font.FontWeight
-import androidx.ui.text.platform.TypefaceAdapter
-import androidx.ui.text.style.BaselineShift
-import androidx.ui.text.style.TextDecoration
-import androidx.ui.text.style.TextGeometricTransform
+import androidx.compose.ui.text.intl.Locale
+import androidx.compose.ui.text.intl.LocaleList
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.font.FontListFontFamily
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.font.FontSynthesis
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.platform.TypefaceAdapter
+import androidx.compose.ui.text.style.BaselineShift
+import androidx.compose.ui.text.style.TextDecoration
+import androidx.compose.ui.text.style.TextGeometricTransform
import androidx.ui.unit.Density
import androidx.ui.unit.TextUnit
import androidx.ui.unit.TextUnitType
diff --git a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/AnnotatedString.kt b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/AnnotatedString.kt
similarity index 95%
rename from ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/AnnotatedString.kt
rename to ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/AnnotatedString.kt
index 9b9bfde..16e4427 100644
--- a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/AnnotatedString.kt
+++ b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/AnnotatedString.kt
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-package androidx.ui.text
+package androidx.compose.ui.text
import androidx.compose.Immutable
import androidx.compose.Stable
-import androidx.ui.intl.LocaleList
-import androidx.ui.text.AnnotatedString.Builder
-import androidx.ui.text.AnnotatedString.Range
+import androidx.compose.ui.text.intl.LocaleList
+import androidx.compose.ui.text.AnnotatedString.Builder
+import androidx.compose.ui.text.AnnotatedString.Range
import androidx.ui.util.fastForEach
/**
@@ -67,7 +67,7 @@
* between specified paragraph [Range]s, a default paragraph will be created in between.
*
* @throws IllegalArgumentException if [paragraphStyles] contains any two overlapping [Range]s.
- * @sample androidx.ui.text.samples.AnnotatedStringConstructorSample
+ * @sample androidx.compose.ui.text.samples.AnnotatedStringConstructorSample
*
* @see SpanStyle
* @see ParagraphStyle
@@ -149,7 +149,7 @@
* Builder class for AnnotatedString. Enables construction of an [AnnotatedString] using
* methods such as [append] and [addStyle].
*
- * @sample androidx.ui.text.samples.AnnotatedStringBuilderSample
+ * @sample androidx.compose.ui.text.samples.AnnotatedStringBuilderSample
*
* @param capacity initial capacity for the internal char buffer
*/
@@ -270,7 +270,7 @@
* @param start the inclusive starting offset of the range
* @param end the exclusive end offset of the range
* @see getStringAnnotations
- * @sample androidx.ui.text.samples.AnnotatedStringAddStringAnnotationSample
+ * @sample androidx.compose.ui.text.samples.AnnotatedStringAddStringAnnotationSample
*/
fun addStringAnnotation(scope: String, annotation: String, start: Int, end: Int) {
annotations.add(MutableRange(annotation, start, end, scope))
@@ -280,7 +280,7 @@
* Applies the given [SpanStyle] to any appended text until a corresponding [pop] is
* called.
*
- * @sample androidx.ui.text.samples.AnnotatedStringBuilderPushSample
+ * @sample androidx.compose.ui.text.samples.AnnotatedStringBuilderPushSample
*
* @param style SpanStyle to be applied
*/
@@ -296,7 +296,7 @@
* Applies the given [ParagraphStyle] to any appended text until a corresponding [pop]
* is called.
*
- * @sample androidx.ui.text.samples.AnnotatedStringBuilderPushParagraphStyleSample
+ * @sample androidx.compose.ui.text.samples.AnnotatedStringBuilderPushParagraphStyleSample
*
* @param style ParagraphStyle to be applied
*/
@@ -312,7 +312,7 @@
* Attach the given [annotation] to any appended text until a corresponding [pop]
* is called.
*
- * @sample androidx.ui.text.samples.AnnotatedStringBuilderPushStringAnnotationSample
+ * @sample androidx.compose.ui.text.samples.AnnotatedStringBuilderPushStringAnnotationSample
*
* @param tag the tag used to distinguish annotations
* @param annotation the string annotation attached on this AnnotatedString
@@ -581,7 +581,7 @@
/**
* Pushes [style] to the [AnnotatedString.Builder], executes [block] and then pops the [style].
*
- * @sample androidx.ui.text.samples.AnnotatedStringBuilderWithStyleSample
+ * @sample androidx.compose.ui.text.samples.AnnotatedStringBuilderWithStyleSample
*
* @param style [SpanStyle] to be applied
* @param block function to be executed
@@ -606,7 +606,7 @@
/**
* Pushes [style] to the [AnnotatedString.Builder], executes [block] and then pops the [style].
*
- * @sample androidx.ui.text.samples.AnnotatedStringBuilderWithStyleSample
+ * @sample androidx.compose.ui.text.samples.AnnotatedStringBuilderWithStyleSample
*
* @param style [SpanStyle] to be applied
* @param block function to be executed
@@ -700,7 +700,7 @@
* Build a new AnnotatedString by populating newly created [AnnotatedString.Builder] provided
* by [builder].
*
- * @sample androidx.ui.text.samples.AnnotatedStringBuilderLambdaSample
+ * @sample androidx.compose.ui.text.samples.AnnotatedStringBuilderLambdaSample
*
* @param builder lambda to modify [AnnotatedString.Builder]
*/
@@ -715,7 +715,7 @@
* Build a new AnnotatedString by populating newly created [AnnotatedString.Builder] provided
* by [builder].
*
- * @sample androidx.ui.text.samples.AnnotatedStringBuilderLambdaSample
+ * @sample androidx.compose.ui.text.samples.AnnotatedStringBuilderLambdaSample
*
* @param builder lambda to modify [AnnotatedString.Builder]
*/
diff --git a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/InternalTextApi.kt b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/InternalTextApi.kt
similarity index 96%
rename from ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/InternalTextApi.kt
rename to ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/InternalTextApi.kt
index 807eddc..e0b91a4 100644
--- a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/InternalTextApi.kt
+++ b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/InternalTextApi.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.text
+package androidx.compose.ui.text
@RequiresOptIn(
level = RequiresOptIn.Level.ERROR,
diff --git a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/MultiParagraph.kt b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/MultiParagraph.kt
similarity index 99%
rename from ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/MultiParagraph.kt
rename to ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/MultiParagraph.kt
index 9b30ec4..55a56d1 100644
--- a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/MultiParagraph.kt
+++ b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/MultiParagraph.kt
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-package androidx.ui.text
+package androidx.compose.ui.text
import androidx.ui.geometry.Rect
import androidx.ui.graphics.Canvas
import androidx.ui.graphics.Path
-import androidx.ui.text.font.Font
-import androidx.ui.text.style.ResolvedTextDirection
+import androidx.compose.ui.text.font.Font
+import androidx.compose.ui.text.style.ResolvedTextDirection
import androidx.ui.unit.Density
import androidx.ui.geometry.Offset
import androidx.ui.util.fastForEach
diff --git a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/MultiParagraphIntrinsics.kt b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/MultiParagraphIntrinsics.kt
similarity index 97%
rename from ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/MultiParagraphIntrinsics.kt
rename to ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/MultiParagraphIntrinsics.kt
index 5e08541..5e75b7f 100644
--- a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/MultiParagraphIntrinsics.kt
+++ b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/MultiParagraphIntrinsics.kt
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package androidx.ui.text
+package androidx.compose.ui.text
-import androidx.ui.text.font.Font
-import androidx.ui.text.style.TextDirection
+import androidx.compose.ui.text.font.Font
+import androidx.compose.ui.text.style.TextDirection
import androidx.ui.unit.Density
/**
diff --git a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/Paragraph.kt b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/Paragraph.kt
similarity index 96%
rename from ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/Paragraph.kt
rename to ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/Paragraph.kt
index f0bef7e..a035449 100644
--- a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/Paragraph.kt
+++ b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/Paragraph.kt
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package androidx.ui.text
+package androidx.compose.ui.text
import androidx.ui.geometry.Rect
import androidx.ui.graphics.Canvas
import androidx.ui.graphics.Path
-import androidx.ui.text.font.Font
-import androidx.ui.text.platform.ActualParagraph
-import androidx.ui.text.style.ResolvedTextDirection
+import androidx.compose.ui.text.font.Font
+import androidx.compose.ui.text.platform.ActualParagraph
+import androidx.compose.ui.text.style.ResolvedTextDirection
import androidx.ui.unit.Density
import androidx.ui.geometry.Offset
@@ -217,8 +217,8 @@
* Lays out a given [text] with the given constraints. A paragraph is a text that has a single
* [ParagraphStyle].
*
- * If the [style] does not contain any [androidx.ui.text.style.TextDirection],
- * [androidx.ui.text.style.TextDirection.Content] is used as the default value.
+ * If the [style] does not contain any [androidx.compose.ui.text.style.TextDirection],
+ * [androidx.compose.ui.text.style.TextDirection.Content] is used as the default value.
*
* @param text the text to be laid out
* @param style the [TextStyle] to be applied to the whole text
diff --git a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/ParagraphConstraints.kt b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/ParagraphConstraints.kt
similarity index 98%
rename from ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/ParagraphConstraints.kt
rename to ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/ParagraphConstraints.kt
index dec867f..dfbbf72 100644
--- a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/ParagraphConstraints.kt
+++ b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/ParagraphConstraints.kt
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package androidx.ui.text
+package androidx.compose.ui.text
/**
* Layout constraints for [Paragraph] objects.
diff --git a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/ParagraphIntrinsics.kt b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/ParagraphIntrinsics.kt
similarity index 83%
rename from ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/ParagraphIntrinsics.kt
rename to ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/ParagraphIntrinsics.kt
index f230fe0..5878b1d 100644
--- a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/ParagraphIntrinsics.kt
+++ b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/ParagraphIntrinsics.kt
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package androidx.ui.text
+package androidx.compose.ui.text
-import androidx.ui.text.font.Font
-import androidx.ui.text.platform.ActualParagraphIntrinsics
+import androidx.compose.ui.text.font.Font
+import androidx.compose.ui.text.platform.ActualParagraphIntrinsics
import androidx.ui.unit.Density
/**
@@ -39,8 +39,8 @@
/**
* Factory method to create a [ParagraphIntrinsics].
*
- * If the [style] does not contain any [androidx.ui.text.style.TextDirection],
- * [androidx.ui.text.style.TextDirection.Content] is used as the default value.
+ * If the [style] does not contain any [androidx.compose.ui.text.style.TextDirection],
+ * [androidx.compose.ui.text.style.TextDirection.Content] is used as the default value.
*
* @see ParagraphIntrinsics
*/
diff --git a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/ParagraphStyle.kt b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/ParagraphStyle.kt
similarity index 91%
rename from ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/ParagraphStyle.kt
rename to ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/ParagraphStyle.kt
index 8d9c6f9..f251871b 100644
--- a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/ParagraphStyle.kt
+++ b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/ParagraphStyle.kt
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package androidx.ui.text
+package androidx.compose.ui.text
import androidx.compose.Immutable
import androidx.compose.Stable
-import androidx.ui.text.style.TextAlign
-import androidx.ui.text.style.TextDirection
-import androidx.ui.text.style.TextIndent
-import androidx.ui.text.style.lerp
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextDirection
+import androidx.compose.ui.text.style.TextIndent
+import androidx.compose.ui.text.style.lerp
import androidx.ui.unit.TextUnit
/**
@@ -31,8 +31,8 @@
* 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.ui.text.samples.ParagraphStyleSample
- * @sample androidx.ui.text.samples.ParagraphStyleAnnotatedStringsSample
+ * @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:
diff --git a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/Placeholder.kt b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/Placeholder.kt
similarity index 98%
rename from ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/Placeholder.kt
rename to ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/Placeholder.kt
index d778c0b..b9112d2 100644
--- a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/Placeholder.kt
+++ b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/Placeholder.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.text
+package androidx.compose.ui.text
import androidx.compose.Immutable
import androidx.ui.unit.TextUnit
diff --git a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/SoftwareKeyboardController.kt b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/SoftwareKeyboardController.kt
similarity index 91%
rename from ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/SoftwareKeyboardController.kt
rename to ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/SoftwareKeyboardController.kt
index 71fa0c9..1594bd8 100644
--- a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/SoftwareKeyboardController.kt
+++ b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/SoftwareKeyboardController.kt
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package androidx.ui.text
+package androidx.compose.ui.text
import androidx.ui.geometry.Rect
-import androidx.ui.input.InputSessionToken
-import androidx.ui.input.TextInputService
+import androidx.compose.ui.text.input.InputSessionToken
+import androidx.compose.ui.text.input.TextInputService
/**
* Provide software keyboard control.
diff --git a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/SpanStyle.kt b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/SpanStyle.kt
similarity index 92%
rename from ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/SpanStyle.kt
rename to ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/SpanStyle.kt
index a3d9025..c959d7c 100644
--- a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/SpanStyle.kt
+++ b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/SpanStyle.kt
@@ -14,24 +14,24 @@
* limitations under the License.
*/
-package androidx.ui.text
+package androidx.compose.ui.text
import androidx.compose.Immutable
import androidx.compose.Stable
-import androidx.ui.intl.LocaleList
+import androidx.compose.ui.text.intl.LocaleList
import androidx.ui.graphics.Color
import androidx.ui.graphics.Shadow
import androidx.ui.graphics.lerp
import androidx.ui.graphics.useOrElse
-import androidx.ui.text.font.FontFamily
-import androidx.ui.text.font.FontStyle
-import androidx.ui.text.font.FontSynthesis
-import androidx.ui.text.font.FontWeight
-import androidx.ui.text.font.lerp
-import androidx.ui.text.style.BaselineShift
-import androidx.ui.text.style.TextDecoration
-import androidx.ui.text.style.TextGeometricTransform
-import androidx.ui.text.style.lerp
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.font.FontSynthesis
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.font.lerp
+import androidx.compose.ui.text.style.BaselineShift
+import androidx.compose.ui.text.style.TextDecoration
+import androidx.compose.ui.text.style.TextGeometricTransform
+import androidx.compose.ui.text.style.lerp
import androidx.ui.unit.TextUnit
import androidx.ui.unit.lerp
@@ -40,9 +40,9 @@
* in order to set paragraph level styling such as line height, or text alignment please see
* [ParagraphStyle].
*
- * @sample androidx.ui.text.samples.SpanStyleSample
+ * @sample androidx.compose.ui.text.samples.SpanStyleSample
*
- * @sample androidx.ui.text.samples.AnnotatedStringBuilderSample
+ * @sample androidx.compose.ui.text.samples.AnnotatedStringBuilderSample
*
* @param color The text color.
* @param fontSize The size of glyphs (in logical pixels) to use when painting the text. This
diff --git a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/String.kt b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/String.kt
similarity index 94%
rename from ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/String.kt
rename to ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/String.kt
index f31ae8e..8261b49 100644
--- a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/String.kt
+++ b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/String.kt
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-package androidx.ui.text
+package androidx.compose.ui.text
-import androidx.ui.intl.Locale
-import androidx.ui.intl.LocaleList
-import androidx.ui.intl.PlatformLocale
-import androidx.ui.text.platform.ActualStringDelegate
+import androidx.compose.ui.text.intl.Locale
+import androidx.compose.ui.text.intl.LocaleList
+import androidx.compose.ui.text.intl.PlatformLocale
+import androidx.compose.ui.text.platform.ActualStringDelegate
/**
* Interface for providing platform dependent string related operations.
diff --git a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/TextDelegate.kt b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/TextDelegate.kt
similarity index 97%
rename from ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/TextDelegate.kt
rename to ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/TextDelegate.kt
index f7ddaaa..abff943 100644
--- a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/TextDelegate.kt
+++ b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/TextDelegate.kt
@@ -14,17 +14,17 @@
* limitations under the License.
*/
-package androidx.ui.text
+package androidx.compose.ui.text
import androidx.ui.core.Constraints
import androidx.ui.core.LayoutDirection
import androidx.ui.core.constrain
import androidx.ui.graphics.Canvas
import androidx.ui.graphics.Paint
-import androidx.ui.text.TextDelegate.Companion.paint
-import androidx.ui.text.font.Font
-import androidx.ui.text.style.TextAlign
-import androidx.ui.text.style.TextOverflow
+import androidx.compose.ui.text.TextDelegate.Companion.paint
+import androidx.compose.ui.text.font.Font
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
import androidx.ui.unit.Density
import androidx.ui.unit.IntSize
import androidx.ui.util.annotation.VisibleForTesting
diff --git a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/TextLayoutHelper.kt b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/TextLayoutHelper.kt
similarity index 95%
rename from ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/TextLayoutHelper.kt
rename to ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/TextLayoutHelper.kt
index 8b60c0b..5dffdb5 100644
--- a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/TextLayoutHelper.kt
+++ b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/TextLayoutHelper.kt
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-package androidx.ui.text
+package androidx.compose.ui.text
import androidx.ui.core.Constraints
import androidx.ui.core.LayoutDirection
-import androidx.ui.text.font.Font
-import androidx.ui.text.style.TextOverflow
+import androidx.compose.ui.text.font.Font
+import androidx.compose.ui.text.style.TextOverflow
import androidx.ui.unit.Density
/**
diff --git a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/TextLayoutResult.kt b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/TextLayoutResult.kt
similarity index 97%
rename from ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/TextLayoutResult.kt
rename to ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/TextLayoutResult.kt
index f365beb..19fadc8 100644
--- a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/TextLayoutResult.kt
+++ b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/TextLayoutResult.kt
@@ -14,16 +14,16 @@
* limitations under the License.
*/
-package androidx.ui.text
+package androidx.compose.ui.text
import androidx.ui.core.Constraints
import androidx.ui.core.LayoutDirection
import androidx.ui.geometry.Offset
import androidx.ui.geometry.Rect
import androidx.ui.graphics.Path
-import androidx.ui.text.font.Font
-import androidx.ui.text.style.ResolvedTextDirection
-import androidx.ui.text.style.TextOverflow
+import androidx.compose.ui.text.font.Font
+import androidx.compose.ui.text.style.ResolvedTextDirection
+import androidx.compose.ui.text.style.TextOverflow
import androidx.ui.unit.Density
import androidx.ui.unit.IntSize
diff --git a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/TextPainter.kt b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/TextPainter.kt
similarity index 94%
rename from ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/TextPainter.kt
rename to ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/TextPainter.kt
index 2bedb69..ad8d976 100644
--- a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/TextPainter.kt
+++ b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/TextPainter.kt
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package androidx.ui.text
+package androidx.compose.ui.text
import androidx.ui.geometry.Rect
import androidx.ui.graphics.Canvas
-import androidx.ui.text.style.TextOverflow
+import androidx.compose.ui.text.style.TextOverflow
object TextPainter {
/**
diff --git a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/TextRange.kt b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/TextRange.kt
similarity index 98%
rename from ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/TextRange.kt
rename to ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/TextRange.kt
index ecb624c..95f1efe 100644
--- a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/TextRange.kt
+++ b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/TextRange.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.text
+package androidx.compose.ui.text
import androidx.compose.Immutable
import androidx.ui.util.annotation.IntRange
diff --git a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/TextStyle.kt b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/TextStyle.kt
similarity index 94%
rename from ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/TextStyle.kt
rename to ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/TextStyle.kt
index 445aa0c..21bf09cc 100644
--- a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/TextStyle.kt
+++ b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/TextStyle.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.text
+package androidx.compose.ui.text
import androidx.compose.Immutable
import androidx.compose.Stable
@@ -22,17 +22,17 @@
import androidx.ui.graphics.Color
import androidx.ui.graphics.Shadow
import androidx.ui.graphics.useOrElse
-import androidx.ui.intl.LocaleList
-import androidx.ui.text.font.FontFamily
-import androidx.ui.text.font.FontStyle
-import androidx.ui.text.font.FontSynthesis
-import androidx.ui.text.font.FontWeight
-import androidx.ui.text.style.BaselineShift
-import androidx.ui.text.style.TextAlign
-import androidx.ui.text.style.TextDecoration
-import androidx.ui.text.style.TextDirection
-import androidx.ui.text.style.TextGeometricTransform
-import androidx.ui.text.style.TextIndent
+import androidx.compose.ui.text.intl.LocaleList
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.font.FontSynthesis
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.BaselineShift
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextDecoration
+import androidx.compose.ui.text.style.TextDirection
+import androidx.compose.ui.text.style.TextGeometricTransform
+import androidx.compose.ui.text.style.TextIndent
import androidx.ui.unit.TextUnit
import androidx.ui.unit.sp
import androidx.ui.util.annotation.VisibleForTesting
@@ -49,7 +49,7 @@
/**
* Styling configuration for a `Text`.
*
- * @sample androidx.ui.text.samples.TextStyleSample
+ * @sample androidx.compose.ui.text.samples.TextStyleSample
*
* @param color The text color.
* @param fontSize The size of glyphs to use when painting the text. This
diff --git a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/Typeface.kt b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/Typeface.kt
similarity index 90%
rename from ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/Typeface.kt
rename to ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/Typeface.kt
index f4ab861..7834fce 100644
--- a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/Typeface.kt
+++ b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/Typeface.kt
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package androidx.ui.text
+package androidx.compose.ui.text
-import androidx.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontFamily
/**
* A class that can be used for changing the font used in text.
diff --git a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/font/Font.kt b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/font/Font.kt
similarity index 83%
rename from ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/font/Font.kt
rename to ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/font/Font.kt
index dbb7568..151b6a1 100644
--- a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/font/Font.kt
+++ b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/font/Font.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.text.font
+package androidx.compose.ui.text.font
import androidx.compose.Immutable
import androidx.compose.Stable
@@ -28,13 +28,13 @@
interface Font {
/**
* The weight of the font. The system uses this to match a font to a font request
- * that is given in a [androidx.ui.text.SpanStyle].
+ * that is given in a [androidx.compose.ui.text.SpanStyle].
*/
val weight: FontWeight
/**
* The style of the font, normal or italic. The system uses this to match a font to a
- * font request that is given in a [androidx.ui.text.SpanStyle].
+ * font request that is given in a [androidx.compose.ui.text.SpanStyle].
*/
val style: FontStyle
@@ -55,13 +55,13 @@
/**
* Defines a font to be used while rendering text with resource ID.
*
- * @sample androidx.ui.text.samples.CustomFontFamilySample
+ * @sample androidx.compose.ui.text.samples.CustomFontFamilySample
*
* @param resId The resource ID of the font file in font resources. i.e. "R.font.myfont".
* @param weight The weight of the font. The system uses this to match a font to a font request
- * that is given in a [androidx.ui.text.TextStyle].
+ * that is given in a [androidx.compose.ui.text.TextStyle].
* @param style The style of the font, normal or italic. The system uses this to match a font to a
- * font request that is given in a [androidx.ui.text.TextStyle].
+ * font request that is given in a [androidx.compose.ui.text.TextStyle].
*
* @see FontFamily
*/
@@ -76,9 +76,9 @@
*
* @param resId The resource ID of the font file in font resources. i.e. "R.font.myfont".
* @param weight The weight of the font. The system uses this to match a font to a font request
- * that is given in a [androidx.ui.text.SpanStyle].
+ * that is given in a [androidx.compose.ui.text.SpanStyle].
* @param style The style of the font, normal or italic. The system uses this to match a font to a
- * font request that is given in a [androidx.ui.text.SpanStyle].
+ * font request that is given in a [androidx.compose.ui.text.SpanStyle].
*
* @see FontFamily
*/
diff --git a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/font/FontFamily.kt b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/font/FontFamily.kt
similarity index 88%
rename from ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/font/FontFamily.kt
rename to ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/font/FontFamily.kt
index 1a9a765..1e6ca56 100644
--- a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/font/FontFamily.kt
+++ b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/font/FontFamily.kt
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package androidx.ui.text.font
+package androidx.compose.ui.text.font
import androidx.compose.Immutable
import androidx.compose.Stable
-import androidx.ui.text.Typeface
+import androidx.compose.ui.text.Typeface
/**
* The base class of the font families.
@@ -37,7 +37,7 @@
/**
* Font family with low contrast and plain stroke endings.
*
- * @sample androidx.ui.text.samples.FontFamilySansSerifSample
+ * @sample androidx.compose.ui.text.samples.FontFamilySansSerifSample
*
* @see [CSS sans-serif](https://www.w3.org/TR/css-fonts-3/#sans-serif)
*/
@@ -46,7 +46,7 @@
/**
* The formal text style for scripts.
*
- * @sample androidx.ui.text.samples.FontFamilySerifSample
+ * @sample androidx.compose.ui.text.samples.FontFamilySerifSample
*
* @see [CSS serif](https://www.w3.org/TR/css-fonts-3/#serif)
*/
@@ -55,7 +55,7 @@
/**
* Font family where glyphs have the same fixed width.
*
- * @sample androidx.ui.text.samples.FontFamilyMonospaceSample
+ * @sample androidx.compose.ui.text.samples.FontFamilyMonospaceSample
*
* @see [CSS monospace](https://www.w3.org/TR/css-fonts-3/#monospace)
*/
@@ -67,7 +67,7 @@
* If the device doesn't support this font family, the system will fallback to the
* default font.
*
- * @sample androidx.ui.text.samples.FontFamilyCursiveSample
+ * @sample androidx.compose.ui.text.samples.FontFamilyCursiveSample
*
* @see [CSS cursive](https://www.w3.org/TR/css-fonts-3/#cursive)
*/
@@ -88,8 +88,8 @@
/**
* Defines a font family with list of [Font].
*
- * @sample androidx.ui.text.samples.FontFamilySansSerifSample
- * @sample androidx.ui.text.samples.CustomFontFamilySample
+ * @sample androidx.compose.ui.text.samples.FontFamilySansSerifSample
+ * @sample androidx.compose.ui.text.samples.CustomFontFamilySample
*/
@Immutable
data class FontListFontFamily(val fonts: List<Font>) : FileBasedFontFamily(), List<Font> by fonts {
diff --git a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/font/FontMatcher.kt b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/font/FontMatcher.kt
similarity index 98%
rename from ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/font/FontMatcher.kt
rename to ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/font/FontMatcher.kt
index 452bda3..41851e0 100644
--- a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/font/FontMatcher.kt
+++ b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/font/FontMatcher.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.text.font
+package androidx.compose.ui.text.font
/**
* Given a [FontFamily], [FontWeight] and [FontStyle], matches the best font in the [FontFamily]
diff --git a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/font/FontStyle.kt b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/font/FontStyle.kt
similarity index 95%
rename from ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/font/FontStyle.kt
rename to ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/font/FontStyle.kt
index 0a5dda8..c7726bb 100644
--- a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/font/FontStyle.kt
+++ b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/font/FontStyle.kt
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package androidx.ui.text.font
+package androidx.compose.ui.text.font
/**
* Defines whether the font is [Italic] or [Normal].
diff --git a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/font/FontSynthesis.kt b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/font/FontSynthesis.kt
similarity index 95%
rename from ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/font/FontSynthesis.kt
rename to ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/font/FontSynthesis.kt
index 73bc506..a4f63c6 100644
--- a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/font/FontSynthesis.kt
+++ b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/font/FontSynthesis.kt
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package androidx.ui.text.font
+package androidx.compose.ui.text.font
/**
* Possible options for font synthesis.
@@ -31,7 +31,7 @@
* `FontSynthesis` works the same way as the [CSS font-synthesis](https://www.w3
* .org/TR/css-fonts-4/#font-synthesis) property.
*
- * @sample androidx.ui.text.samples.FontFamilySynthesisSample
+ * @sample androidx.compose.ui.text.samples.FontFamilySynthesisSample
**/
enum class FontSynthesis {
/**
diff --git a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/font/FontWeight.kt b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/font/FontWeight.kt
similarity index 98%
rename from ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/font/FontWeight.kt
rename to ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/font/FontWeight.kt
index 72bce00..092fddf 100644
--- a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/font/FontWeight.kt
+++ b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/font/FontWeight.kt
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package androidx.ui.text.font
+package androidx.compose.ui.text.font
import androidx.compose.Immutable
import androidx.compose.Stable
diff --git a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/input/EditOperation.kt b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/input/EditOperation.kt
similarity index 99%
rename from ui/ui-text-core/src/commonMain/kotlin/androidx/ui/input/EditOperation.kt
rename to ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/input/EditOperation.kt
index a11a949..5a2bec4 100644
--- a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/input/EditOperation.kt
+++ b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/input/EditOperation.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.input
+package androidx.compose.ui.text.input
import androidx.ui.util.isSurrogatePair
import androidx.ui.util.findFollowingBreak
diff --git a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/input/EditProcessor.kt b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/input/EditProcessor.kt
similarity index 95%
rename from ui/ui-text-core/src/commonMain/kotlin/androidx/ui/input/EditProcessor.kt
rename to ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/input/EditProcessor.kt
index fc485f2..b1cd851 100644
--- a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/input/EditProcessor.kt
+++ b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/input/EditProcessor.kt
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package androidx.ui.input
+package androidx.compose.ui.text.input
-import androidx.ui.text.InternalTextApi
+import androidx.compose.ui.text.InternalTextApi
import androidx.ui.util.annotation.VisibleForTesting
-import androidx.ui.text.TextRange
+import androidx.compose.ui.text.TextRange
/**
* The core editing implementation
diff --git a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/input/EditingBuffer.kt b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/input/EditingBuffer.kt
similarity index 98%
rename from ui/ui-text-core/src/commonMain/kotlin/androidx/ui/input/EditingBuffer.kt
rename to ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/input/EditingBuffer.kt
index fc44c74..5c8384e 100644
--- a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/input/EditingBuffer.kt
+++ b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/input/EditingBuffer.kt
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package androidx.ui.input
+package androidx.compose.ui.text.input
-import androidx.ui.text.InternalTextApi
-import androidx.ui.text.TextRange
+import androidx.compose.ui.text.InternalTextApi
+import androidx.compose.ui.text.TextRange
/**
* The editing buffer
diff --git a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/input/GapBuffer.kt b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/input/GapBuffer.kt
similarity index 98%
rename from ui/ui-text-core/src/commonMain/kotlin/androidx/ui/input/GapBuffer.kt
rename to ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/input/GapBuffer.kt
index 8e83bbc..cdd1313 100644
--- a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/input/GapBuffer.kt
+++ b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/input/GapBuffer.kt
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package androidx.ui.input
+package androidx.compose.ui.text.input
-import androidx.ui.text.InternalTextApi
+import androidx.compose.ui.text.InternalTextApi
private fun String.toCharArray(
destination: CharArray,
diff --git a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/input/ImeAction.kt b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/input/ImeAction.kt
similarity index 98%
rename from ui/ui-text-core/src/commonMain/kotlin/androidx/ui/input/ImeAction.kt
rename to ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/input/ImeAction.kt
index 1f19c4e..530be56 100644
--- a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/input/ImeAction.kt
+++ b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/input/ImeAction.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.input
+package androidx.compose.ui.text.input
/**
* Enums used for indicating IME action.
diff --git a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/input/InputEventListener.kt b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/input/InputEventListener.kt
similarity index 96%
rename from ui/ui-text-core/src/commonMain/kotlin/androidx/ui/input/InputEventListener.kt
rename to ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/input/InputEventListener.kt
index b43beb1..3ce0b3e 100644
--- a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/input/InputEventListener.kt
+++ b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/input/InputEventListener.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.input
+package androidx.compose.ui.text.input
/**
* An interface of listening IME events.
diff --git a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/input/KeyboardType.kt b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/input/KeyboardType.kt
similarity index 97%
rename from ui/ui-text-core/src/commonMain/kotlin/androidx/ui/input/KeyboardType.kt
rename to ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/input/KeyboardType.kt
index ee7f088..1978a21 100644
--- a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/input/KeyboardType.kt
+++ b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/input/KeyboardType.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.input
+package androidx.compose.ui.text.input
/**
* Enums used for indicating keyboard types
diff --git a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/input/TextFieldValue.kt b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/input/TextFieldValue.kt
similarity index 94%
rename from ui/ui-text-core/src/commonMain/kotlin/androidx/ui/input/TextFieldValue.kt
rename to ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/input/TextFieldValue.kt
index 472d244..68611b4 100644
--- a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/input/TextFieldValue.kt
+++ b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/input/TextFieldValue.kt
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package androidx.ui.input
+package androidx.compose.ui.text.input
import androidx.compose.Immutable
import androidx.compose.Stable
import androidx.compose.runtime.savedinstancestate.Saver
import androidx.compose.runtime.savedinstancestate.listSaver
-import androidx.ui.text.TextRange
-import androidx.ui.text.substring
+import androidx.compose.ui.text.TextRange
+import androidx.compose.ui.text.substring
import kotlin.math.max
import kotlin.math.min
@@ -34,8 +34,8 @@
*/
@Immutable
@Deprecated(
- "Please use androidx.ui.input.TextFieldValue instead",
- ReplaceWith("TextFieldValue", "androidx.ui.input.TextFieldValue")
+ "Please use androidx.compose.ui.text.input.TextFieldValue instead",
+ ReplaceWith("TextFieldValue", "androidx.compose.ui.text.input.TextFieldValue")
)
data class EditorValue(
/**
diff --git a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/input/TextInputService.kt b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/input/TextInputService.kt
similarity index 98%
rename from ui/ui-text-core/src/commonMain/kotlin/androidx/ui/input/TextInputService.kt
rename to ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/input/TextInputService.kt
index 886fce3..3a2253c 100644
--- a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/input/TextInputService.kt
+++ b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/input/TextInputService.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.input
+package androidx.compose.ui.text.input
import androidx.ui.geometry.Rect
diff --git a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/input/VisualTransformation.kt b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/input/VisualTransformation.kt
similarity index 95%
rename from ui/ui-text-core/src/commonMain/kotlin/androidx/ui/input/VisualTransformation.kt
rename to ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/input/VisualTransformation.kt
index 4ea3255..830a58c 100644
--- a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/input/VisualTransformation.kt
+++ b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/input/VisualTransformation.kt
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package androidx.ui.input
+package androidx.compose.ui.text.input
import androidx.compose.Immutable
import androidx.compose.Stable
-import androidx.ui.text.AnnotatedString
+import androidx.compose.ui.text.AnnotatedString
/**
* The map interface used for bidirectional offset mapping from original to transformed text.
@@ -95,13 +95,13 @@
* original text : thisispassword
* transformed text: **************
*
- * @sample androidx.ui.text.samples.passwordFilter
+ * @sample androidx.compose.ui.text.samples.passwordFilter
*
* Example: Credit Card Visual Output (inserting hyphens each 4 digits)
* original text : 1234567890123456
* transformed text: 1234-5678-9012-3456
*
- * @sample androidx.ui.text.samples.creditCardFilter
+ * @sample androidx.compose.ui.text.samples.creditCardFilter
*
* @param text The original text
* @return the pair of filtered text and offset translator.
diff --git a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/intl/Locale.kt b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/intl/Locale.kt
similarity index 95%
rename from ui/ui-text-core/src/commonMain/kotlin/androidx/ui/intl/Locale.kt
rename to ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/intl/Locale.kt
index d32e2bc..aa304dd 100644
--- a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/intl/Locale.kt
+++ b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/intl/Locale.kt
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package androidx.ui.intl
+package androidx.compose.ui.text.intl
import androidx.compose.Immutable
-import androidx.ui.text.SpanStyle
-import androidx.ui.text.TextStyle
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.TextStyle
/**
* A `Locale` object represents a specific geographical, political, or cultural region. An
diff --git a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/intl/LocaleList.kt b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/intl/LocaleList.kt
similarity index 93%
rename from ui/ui-text-core/src/commonMain/kotlin/androidx/ui/intl/LocaleList.kt
rename to ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/intl/LocaleList.kt
index dc300f8..2d163a9 100644
--- a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/intl/LocaleList.kt
+++ b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/intl/LocaleList.kt
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package androidx.ui.intl
+package androidx.compose.ui.text.intl
import androidx.compose.Immutable
-import androidx.ui.text.SpanStyle
-import androidx.ui.text.TextStyle
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.TextStyle
/**
* Defines a list of [Locale] objects.
diff --git a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/intl/PlatformLocale.kt b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/intl/PlatformLocale.kt
similarity index 97%
rename from ui/ui-text-core/src/commonMain/kotlin/androidx/ui/intl/PlatformLocale.kt
rename to ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/intl/PlatformLocale.kt
index d934ca9..0c99171 100644
--- a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/intl/PlatformLocale.kt
+++ b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/intl/PlatformLocale.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.intl
+package androidx.compose.ui.text.intl
/**
* Interface for providing platform dependent locale object.
diff --git a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/platform/PlatformParagraph.kt b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/platform/PlatformParagraph.kt
similarity index 79%
rename from ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/platform/PlatformParagraph.kt
rename to ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/platform/PlatformParagraph.kt
index 92761f5..b7b46b5 100644
--- a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/platform/PlatformParagraph.kt
+++ b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/platform/PlatformParagraph.kt
@@ -13,16 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package androidx.ui.text.platform
+package androidx.compose.ui.text.platform
-import androidx.ui.text.font.Font
-import androidx.ui.text.AnnotatedString
-import androidx.ui.text.Paragraph
-import androidx.ui.text.ParagraphIntrinsics
-import androidx.ui.text.ParagraphConstraints
-import androidx.ui.text.Placeholder
-import androidx.ui.text.SpanStyle
-import androidx.ui.text.TextStyle
+import androidx.compose.ui.text.font.Font
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.Paragraph
+import androidx.compose.ui.text.ParagraphIntrinsics
+import androidx.compose.ui.text.ParagraphConstraints
+import androidx.compose.ui.text.Placeholder
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.TextStyle
import androidx.ui.unit.Density
// TODO(b/157854677): remove after fixing.
diff --git a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/platform/PlatformString.kt b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/platform/PlatformString.kt
similarity index 87%
rename from ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/platform/PlatformString.kt
rename to ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/platform/PlatformString.kt
index 6fe3c71..95f3d64 100644
--- a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/platform/PlatformString.kt
+++ b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/platform/PlatformString.kt
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-package androidx.ui.text.platform
+package androidx.compose.ui.text.platform
-import androidx.ui.text.PlatformStringDelegate
+import androidx.compose.ui.text.PlatformStringDelegate
internal expect fun ActualStringDelegate(): PlatformStringDelegate
\ No newline at end of file
diff --git a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/style/BaselineShift.kt b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/style/BaselineShift.kt
similarity index 90%
rename from ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/style/BaselineShift.kt
rename to ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/style/BaselineShift.kt
index d6d4cb3..ea69620 100644
--- a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/style/BaselineShift.kt
+++ b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/style/BaselineShift.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.text.style
+package androidx.compose.ui.text.style
import androidx.compose.Immutable
import androidx.compose.Stable
@@ -23,8 +23,8 @@
/**
* The amount by which the text is shifted up or down from current the baseline.
* @constructor
- * @sample androidx.ui.text.samples.BaselineShiftSample
- * @sample androidx.ui.text.samples.BaselineShiftAnnotatedStringSample
+ * @sample androidx.compose.ui.text.samples.BaselineShiftSample
+ * @sample androidx.compose.ui.text.samples.BaselineShiftAnnotatedStringSample
*
* @param multiplier shift the baseline by multiplier * (baseline - ascent)
*/
diff --git a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/style/ResolvedTextDirection.kt b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/style/ResolvedTextDirection.kt
similarity index 83%
rename from ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/style/ResolvedTextDirection.kt
rename to ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/style/ResolvedTextDirection.kt
index 18da04c..19f57ab 100644
--- a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/style/ResolvedTextDirection.kt
+++ b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/style/ResolvedTextDirection.kt
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package androidx.ui.text.style
+package androidx.compose.ui.text.style
/**
* Describes the directionality of a text.
*
* @see TextDirection
- * @see androidx.ui.text.Paragraph.getParagraphDirection
- * @see androidx.ui.text.Paragraph.getBidiRunDirection
+ * @see androidx.compose.ui.text.Paragraph.getParagraphDirection
+ * @see androidx.compose.ui.text.Paragraph.getBidiRunDirection
*/
enum class ResolvedTextDirection {
/**
diff --git a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/style/TextAlign.kt b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/style/TextAlign.kt
similarity index 97%
rename from ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/style/TextAlign.kt
rename to ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/style/TextAlign.kt
index e34472b..1d46a83 100644
--- a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/style/TextAlign.kt
+++ b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/style/TextAlign.kt
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package androidx.ui.text.style
+package androidx.compose.ui.text.style
/**
* Defines how to align text horizontally. `TextAlign` controls how text aligns in the space it
diff --git a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/style/TextDecoration.kt b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/style/TextDecoration.kt
similarity index 87%
rename from ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/style/TextDecoration.kt
rename to ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/style/TextDecoration.kt
index c23d546..b0fb6b6 100644
--- a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/style/TextDecoration.kt
+++ b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/style/TextDecoration.kt
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package androidx.ui.text.style
+package androidx.compose.ui.text.style
import androidx.compose.Immutable
import androidx.compose.Stable
@@ -31,7 +31,7 @@
/**
* Draws a horizontal line below the text.
*
- * @sample androidx.ui.text.samples.TextDecorationUnderlineSample
+ * @sample androidx.compose.ui.text.samples.TextDecorationUnderlineSample
*/
@Stable
val Underline: TextDecoration = TextDecoration(0x1)
@@ -39,7 +39,7 @@
/**
* Draws a horizontal line over the text.
*
- * @sample androidx.ui.text.samples.TextDecorationLineThroughSample
+ * @sample androidx.compose.ui.text.samples.TextDecorationLineThroughSample
*/
@Stable
val LineThrough: TextDecoration = TextDecoration(0x2)
@@ -47,7 +47,7 @@
/**
* Creates a decoration that includes all the given decorations.
*
- * @sample androidx.ui.text.samples.TextDecorationCombinedSample
+ * @sample androidx.compose.ui.text.samples.TextDecorationCombinedSample
*
* @param decorations The decorations to be added
*/
@@ -62,7 +62,7 @@
/**
* Creates a decoration that includes both of the TextDecorations.
*
- * @sample androidx.ui.text.samples.TextDecorationCombinedSample
+ * @sample androidx.compose.ui.text.samples.TextDecorationCombinedSample
*/
operator fun plus(decoration: TextDecoration): TextDecoration {
return TextDecoration(this.mask or decoration.mask)
diff --git a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/style/TextDirection.kt b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/style/TextDirection.kt
similarity index 93%
rename from ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/style/TextDirection.kt
rename to ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/style/TextDirection.kt
index 7cd98be..41b0cea 100644
--- a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/style/TextDirection.kt
+++ b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/style/TextDirection.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.text.style
+package androidx.compose.ui.text.style
/**
* Defines the algorithm to be used while determining the text direction.
@@ -37,7 +37,7 @@
* character in the text according to the Unicode Bidirectional Algorithm.
* * If no strong directional character is present, then [androidx.ui.core.LayoutDirection]
* is used to resolve the final TextDirection.
- * * if used while creating a Paragraph object, [androidx.ui.intl.LocaleList] will
+ * * if used while creating a Paragraph object, [androidx.compose.ui.text.intl.LocaleList] will
* be used to resolve the direction as a fallback instead of [androidx.ui.core.LayoutDirection].
*/
Content,
diff --git a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/style/TextGeometricTransform.kt b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/style/TextGeometricTransform.kt
similarity index 97%
rename from ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/style/TextGeometricTransform.kt
rename to ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/style/TextGeometricTransform.kt
index 2acfb4c..af9b0a4 100644
--- a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/style/TextGeometricTransform.kt
+++ b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/style/TextGeometricTransform.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.text.style
+package androidx.compose.ui.text.style
import androidx.compose.Immutable
import androidx.compose.Stable
diff --git a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/style/TextIndent.kt b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/style/TextIndent.kt
similarity index 95%
rename from ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/style/TextIndent.kt
rename to ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/style/TextIndent.kt
index d54b399..9299bac 100644
--- a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/style/TextIndent.kt
+++ b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/style/TextIndent.kt
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-package androidx.ui.text.style
+package androidx.compose.ui.text.style
import androidx.compose.Immutable
import androidx.compose.Stable
import androidx.ui.unit.TextUnit
import androidx.ui.unit.sp
-import androidx.ui.text.lerpTextUnitInheritable
+import androidx.compose.ui.text.lerpTextUnitInheritable
/**
* Specify the indentation of a paragraph.
diff --git a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/style/TextOverflow.kt b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/style/TextOverflow.kt
similarity index 95%
rename from ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/style/TextOverflow.kt
rename to ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/style/TextOverflow.kt
index dae6a02..8061c84 100644
--- a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/text/style/TextOverflow.kt
+++ b/ui/ui-text-core/src/commonMain/kotlin/androidx/compose/ui/text/style/TextOverflow.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.text.style
+package androidx.compose.ui.text.style
/** How overflowing text should be handled. */
enum class TextOverflow {
diff --git a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/input/OWNERS b/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/input/OWNERS
deleted file mode 100644
index 2552593..0000000
--- a/ui/ui-text-core/src/commonMain/kotlin/androidx/ui/input/OWNERS
+++ /dev/null
@@ -1,4 +0,0 @@
-haoyuchang@google.com
-nona@google.com
-qqd@google.com
-siyamed@google.com
diff --git a/ui/ui-text-core/src/jvmMain/kotlin/androidx/ui/text/JvmAnnotatedString.kt b/ui/ui-text-core/src/jvmMain/kotlin/androidx/compose/ui/text/JvmAnnotatedString.kt
similarity index 96%
rename from ui/ui-text-core/src/jvmMain/kotlin/androidx/ui/text/JvmAnnotatedString.kt
rename to ui/ui-text-core/src/jvmMain/kotlin/androidx/compose/ui/text/JvmAnnotatedString.kt
index 531a2f7..4cf0652 100644
--- a/ui/ui-text-core/src/jvmMain/kotlin/androidx/ui/text/JvmAnnotatedString.kt
+++ b/ui/ui-text-core/src/jvmMain/kotlin/androidx/compose/ui/text/JvmAnnotatedString.kt
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package androidx.ui.text
+package androidx.compose.ui.text
-import androidx.ui.text.AnnotatedString.Range
+import androidx.compose.ui.text.AnnotatedString.Range
import java.util.SortedSet
diff --git a/ui/ui-text-core/src/test/java/androidx/ui/text/AnnotatedStringBuilderTest.kt b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/AnnotatedStringBuilderTest.kt
similarity index 99%
rename from ui/ui-text-core/src/test/java/androidx/ui/text/AnnotatedStringBuilderTest.kt
rename to ui/ui-text-core/src/test/java/androidx/compose/ui/text/AnnotatedStringBuilderTest.kt
index 77464dd..a4a812f 100644
--- a/ui/ui-text-core/src/test/java/androidx/ui/text/AnnotatedStringBuilderTest.kt
+++ b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/AnnotatedStringBuilderTest.kt
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-package androidx.ui.text
+package androidx.compose.ui.text
import androidx.ui.graphics.Color
-import androidx.ui.text.font.FontStyle
-import androidx.ui.text.font.FontWeight
-import androidx.ui.text.style.TextAlign
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
import androidx.ui.unit.TextUnit
import androidx.ui.unit.em
import androidx.ui.unit.sp
diff --git a/ui/ui-text-core/src/test/java/androidx/ui/text/AnnotatedStringTest.kt b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/AnnotatedStringTest.kt
similarity index 98%
rename from ui/ui-text-core/src/test/java/androidx/ui/text/AnnotatedStringTest.kt
rename to ui/ui-text-core/src/test/java/androidx/compose/ui/text/AnnotatedStringTest.kt
index d5d7154..3cf0129 100644
--- a/ui/ui-text-core/src/test/java/androidx/ui/text/AnnotatedStringTest.kt
+++ b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/AnnotatedStringTest.kt
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package androidx.ui.text
+package androidx.compose.ui.text
import androidx.ui.graphics.Color
-import androidx.ui.text.AnnotatedString.Range
-import androidx.ui.text.style.TextAlign
+import androidx.compose.ui.text.AnnotatedString.Range
+import androidx.compose.ui.text.style.TextAlign
import androidx.ui.unit.sp
import com.google.common.truth.Truth.assertThat
import org.junit.Test
diff --git a/ui/ui-text-core/src/test/java/androidx/ui/text/AnnotatedStringTransformTest.kt b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/AnnotatedStringTransformTest.kt
similarity index 98%
rename from ui/ui-text-core/src/test/java/androidx/ui/text/AnnotatedStringTransformTest.kt
rename to ui/ui-text-core/src/test/java/androidx/compose/ui/text/AnnotatedStringTransformTest.kt
index e56d966..e040811 100644
--- a/ui/ui-text-core/src/test/java/androidx/ui/text/AnnotatedStringTransformTest.kt
+++ b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/AnnotatedStringTransformTest.kt
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package androidx.ui.text
+package androidx.compose.ui.text
-import androidx.ui.intl.LocaleList
+import androidx.compose.ui.text.intl.LocaleList
import androidx.ui.unit.sp
import org.junit.Assert.assertEquals
import org.junit.Test
diff --git a/ui/ui-text-core/src/test/java/androidx/ui/text/MultiParagraphTest.kt b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/MultiParagraphTest.kt
similarity index 98%
rename from ui/ui-text-core/src/test/java/androidx/ui/text/MultiParagraphTest.kt
rename to ui/ui-text-core/src/test/java/androidx/compose/ui/text/MultiParagraphTest.kt
index a2dff3c..bf1b5e1 100644
--- a/ui/ui-text-core/src/test/java/androidx/ui/text/MultiParagraphTest.kt
+++ b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/MultiParagraphTest.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.text
+package androidx.compose.ui.text
import com.google.common.truth.Truth.assertThat
import com.nhaarman.mockitokotlin2.mock
diff --git a/ui/ui-text-core/src/test/java/androidx/ui/text/ParagraphConstraintsTest.kt b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/ParagraphConstraintsTest.kt
similarity index 96%
rename from ui/ui-text-core/src/test/java/androidx/ui/text/ParagraphConstraintsTest.kt
rename to ui/ui-text-core/src/test/java/androidx/compose/ui/text/ParagraphConstraintsTest.kt
index 05e4206..a1d78da 100644
--- a/ui/ui-text-core/src/test/java/androidx/ui/text/ParagraphConstraintsTest.kt
+++ b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/ParagraphConstraintsTest.kt
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package androidx.ui.text
+package androidx.compose.ui.text
import com.google.common.truth.Truth.assertThat
import org.junit.Test
diff --git a/ui/ui-text-core/src/test/java/androidx/ui/text/ParagraphStyleTest.kt b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/ParagraphStyleTest.kt
similarity index 97%
rename from ui/ui-text-core/src/test/java/androidx/ui/text/ParagraphStyleTest.kt
rename to ui/ui-text-core/src/test/java/androidx/compose/ui/text/ParagraphStyleTest.kt
index 50e3d23..abc5710 100644
--- a/ui/ui-text-core/src/test/java/androidx/ui/text/ParagraphStyleTest.kt
+++ b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/ParagraphStyleTest.kt
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-package androidx.ui.text
+package androidx.compose.ui.text
-import androidx.ui.text.style.TextAlign
-import androidx.ui.text.style.TextDirection
-import androidx.ui.text.style.TextIndent
-import androidx.ui.text.style.lerp
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextDirection
+import androidx.compose.ui.text.style.TextIndent
+import androidx.compose.ui.text.style.lerp
import androidx.ui.unit.TextUnit
import androidx.ui.unit.lerp
import androidx.ui.unit.sp
diff --git a/ui/ui-text-core/src/test/java/androidx/ui/text/PlaceholderTest.kt b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/PlaceholderTest.kt
similarity index 97%
rename from ui/ui-text-core/src/test/java/androidx/ui/text/PlaceholderTest.kt
rename to ui/ui-text-core/src/test/java/androidx/compose/ui/text/PlaceholderTest.kt
index c1ba745..0c30a03 100644
--- a/ui/ui-text-core/src/test/java/androidx/ui/text/PlaceholderTest.kt
+++ b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/PlaceholderTest.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.text
+package androidx.compose.ui.text
import androidx.ui.unit.TextUnit
import androidx.ui.unit.em
diff --git a/ui/ui-text-core/src/test/java/androidx/ui/text/SpanStyleTest.kt b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/SpanStyleTest.kt
similarity index 97%
rename from ui/ui-text-core/src/test/java/androidx/ui/text/SpanStyleTest.kt
rename to ui/ui-text-core/src/test/java/androidx/compose/ui/text/SpanStyleTest.kt
index 68cd687..8818192 100644
--- a/ui/ui-text-core/src/test/java/androidx/ui/text/SpanStyleTest.kt
+++ b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/SpanStyleTest.kt
@@ -14,20 +14,20 @@
* limitations under the License.
*/
-package androidx.ui.text
+package androidx.compose.ui.text
-import androidx.ui.intl.LocaleList
+import androidx.compose.ui.text.intl.LocaleList
import androidx.ui.graphics.Color
import androidx.ui.graphics.lerp
-import androidx.ui.text.font.FontFamily
-import androidx.ui.text.font.FontStyle
-import androidx.ui.text.font.FontSynthesis
-import androidx.ui.text.font.FontWeight
-import androidx.ui.text.font.lerp
-import androidx.ui.text.style.BaselineShift
-import androidx.ui.text.style.TextDecoration
-import androidx.ui.text.style.TextGeometricTransform
-import androidx.ui.text.style.lerp
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.font.FontSynthesis
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.font.lerp
+import androidx.compose.ui.text.style.BaselineShift
+import androidx.compose.ui.text.style.TextDecoration
+import androidx.compose.ui.text.style.TextGeometricTransform
+import androidx.compose.ui.text.style.lerp
import androidx.ui.unit.TextUnit
import androidx.ui.unit.em
import androidx.ui.unit.sp
diff --git a/ui/ui-text-core/src/test/java/androidx/ui/text/TextDelegateTest.kt b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/TextDelegateTest.kt
similarity index 96%
rename from ui/ui-text-core/src/test/java/androidx/ui/text/TextDelegateTest.kt
rename to ui/ui-text-core/src/test/java/androidx/compose/ui/text/TextDelegateTest.kt
index 5a983a8..e8a55ad 100644
--- a/ui/ui-text-core/src/test/java/androidx/ui/text/TextDelegateTest.kt
+++ b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/TextDelegateTest.kt
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-package androidx.ui.text
+package androidx.compose.ui.text
import androidx.ui.core.LayoutDirection
-import androidx.ui.text.font.Font
-import androidx.ui.text.style.TextDirection
-import androidx.ui.text.style.TextOverflow
+import androidx.compose.ui.text.font.Font
+import androidx.compose.ui.text.style.TextDirection
+import androidx.compose.ui.text.style.TextOverflow
import androidx.ui.unit.Density
import com.google.common.truth.Truth.assertThat
import com.nhaarman.mockitokotlin2.mock
diff --git a/ui/ui-text-core/src/test/java/androidx/ui/text/TextInputServiceTest.kt b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/TextInputServiceTest.kt
similarity index 95%
rename from ui/ui-text-core/src/test/java/androidx/ui/text/TextInputServiceTest.kt
rename to ui/ui-text-core/src/test/java/androidx/compose/ui/text/TextInputServiceTest.kt
index 3aa49e2..1c674611 100644
--- a/ui/ui-text-core/src/test/java/androidx/ui/text/TextInputServiceTest.kt
+++ b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/TextInputServiceTest.kt
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package androidx.ui.text
+package androidx.compose.ui.text
import androidx.ui.geometry.Rect
-import androidx.ui.input.ImeAction
-import androidx.ui.input.TextFieldValue
-import androidx.ui.input.KeyboardType
-import androidx.ui.input.PlatformTextInputService
-import androidx.ui.input.TextInputService
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.text.input.PlatformTextInputService
+import androidx.compose.ui.text.input.TextInputService
import com.google.common.truth.Truth.assertThat
import com.nhaarman.mockitokotlin2.any
import com.nhaarman.mockitokotlin2.eq
diff --git a/ui/ui-text-core/src/test/java/androidx/ui/text/TextLayoutHelperTest.kt b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/TextLayoutHelperTest.kt
similarity index 98%
rename from ui/ui-text-core/src/test/java/androidx/ui/text/TextLayoutHelperTest.kt
rename to ui/ui-text-core/src/test/java/androidx/compose/ui/text/TextLayoutHelperTest.kt
index 3fe5bbd..501a6a9 100644
--- a/ui/ui-text-core/src/test/java/androidx/ui/text/TextLayoutHelperTest.kt
+++ b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/TextLayoutHelperTest.kt
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-package androidx.ui.text
+package androidx.compose.ui.text
import androidx.ui.core.Constraints
import androidx.ui.core.LayoutDirection
-import androidx.ui.text.font.Font
-import androidx.ui.text.style.TextOverflow
+import androidx.compose.ui.text.font.Font
+import androidx.compose.ui.text.style.TextOverflow
import androidx.ui.unit.Density
import androidx.ui.unit.IntSize
import androidx.ui.unit.em
diff --git a/ui/ui-text-core/src/test/java/androidx/ui/text/TextRangeTest.kt b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/TextRangeTest.kt
similarity index 99%
rename from ui/ui-text-core/src/test/java/androidx/ui/text/TextRangeTest.kt
rename to ui/ui-text-core/src/test/java/androidx/compose/ui/text/TextRangeTest.kt
index cb4d375..819402c 100644
--- a/ui/ui-text-core/src/test/java/androidx/ui/text/TextRangeTest.kt
+++ b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/TextRangeTest.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.text
+package androidx.compose.ui.text
import com.google.common.truth.Truth.assertThat
import org.junit.Test
diff --git a/ui/ui-text-core/src/test/java/androidx/ui/text/TextSpanParagraphStyleTest.kt b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/TextSpanParagraphStyleTest.kt
similarity index 98%
rename from ui/ui-text-core/src/test/java/androidx/ui/text/TextSpanParagraphStyleTest.kt
rename to ui/ui-text-core/src/test/java/androidx/compose/ui/text/TextSpanParagraphStyleTest.kt
index 05c2508..da681f7 100644
--- a/ui/ui-text-core/src/test/java/androidx/ui/text/TextSpanParagraphStyleTest.kt
+++ b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/TextSpanParagraphStyleTest.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.text
+package androidx.compose.ui.text
import com.google.common.truth.Truth.assertThat
import org.junit.Test
diff --git a/ui/ui-text-core/src/test/java/androidx/ui/text/TextStyleResolveDefaultsTest.kt b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/TextStyleResolveDefaultsTest.kt
similarity index 94%
rename from ui/ui-text-core/src/test/java/androidx/ui/text/TextStyleResolveDefaultsTest.kt
rename to ui/ui-text-core/src/test/java/androidx/compose/ui/text/TextStyleResolveDefaultsTest.kt
index 293bf5c..98199ed 100644
--- a/ui/ui-text-core/src/test/java/androidx/ui/text/TextStyleResolveDefaultsTest.kt
+++ b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/TextStyleResolveDefaultsTest.kt
@@ -14,22 +14,22 @@
* limitations under the License.
*/
-package androidx.ui.text
+package androidx.compose.ui.text
-import androidx.ui.intl.LocaleList
+import androidx.compose.ui.text.intl.LocaleList
import androidx.ui.core.LayoutDirection
import androidx.ui.graphics.Color
import androidx.ui.graphics.Shadow
-import androidx.ui.text.font.FontFamily
-import androidx.ui.text.font.FontStyle
-import androidx.ui.text.font.FontSynthesis
-import androidx.ui.text.font.FontWeight
-import androidx.ui.text.style.BaselineShift
-import androidx.ui.text.style.TextAlign
-import androidx.ui.text.style.TextDecoration
-import androidx.ui.text.style.TextDirection
-import androidx.ui.text.style.TextGeometricTransform
-import androidx.ui.text.style.TextIndent
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.font.FontSynthesis
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.BaselineShift
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextDecoration
+import androidx.compose.ui.text.style.TextDirection
+import androidx.compose.ui.text.style.TextGeometricTransform
+import androidx.compose.ui.text.style.TextIndent
import androidx.ui.unit.TextUnit
import androidx.ui.unit.em
import androidx.ui.unit.sp
diff --git a/ui/ui-text-core/src/test/java/androidx/ui/text/TextStyleTest.kt b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/TextStyleTest.kt
similarity index 97%
rename from ui/ui-text-core/src/test/java/androidx/ui/text/TextStyleTest.kt
rename to ui/ui-text-core/src/test/java/androidx/compose/ui/text/TextStyleTest.kt
index 63fbc12..72e6b20e 100644
--- a/ui/ui-text-core/src/test/java/androidx/ui/text/TextStyleTest.kt
+++ b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/TextStyleTest.kt
@@ -14,25 +14,25 @@
* limitations under the License.
*/
-package androidx.ui.text
+package androidx.compose.ui.text
-import androidx.ui.intl.LocaleList
+import androidx.compose.ui.text.intl.LocaleList
import androidx.ui.geometry.Offset
import androidx.ui.graphics.Color
import androidx.ui.graphics.Shadow
import androidx.ui.graphics.lerp
-import androidx.ui.text.font.FontFamily
-import androidx.ui.text.font.FontStyle
-import androidx.ui.text.font.FontSynthesis
-import androidx.ui.text.font.FontWeight
-import androidx.ui.text.font.lerp
-import androidx.ui.text.style.BaselineShift
-import androidx.ui.text.style.TextAlign
-import androidx.ui.text.style.TextDecoration
-import androidx.ui.text.style.TextDirection
-import androidx.ui.text.style.TextGeometricTransform
-import androidx.ui.text.style.TextIndent
-import androidx.ui.text.style.lerp
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.font.FontSynthesis
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.font.lerp
+import androidx.compose.ui.text.style.BaselineShift
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextDecoration
+import androidx.compose.ui.text.style.TextDirection
+import androidx.compose.ui.text.style.TextGeometricTransform
+import androidx.compose.ui.text.style.TextIndent
+import androidx.compose.ui.text.style.lerp
import androidx.ui.unit.TextUnit
import androidx.ui.unit.em
import androidx.ui.unit.sp
diff --git a/ui/ui-text-core/src/test/java/androidx/ui/text/font/FontFamilyTest.kt b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/font/FontFamilyTest.kt
similarity index 98%
rename from ui/ui-text-core/src/test/java/androidx/ui/text/font/FontFamilyTest.kt
rename to ui/ui-text-core/src/test/java/androidx/compose/ui/text/font/FontFamilyTest.kt
index 67b8850..b00f106 100644
--- a/ui/ui-text-core/src/test/java/androidx/ui/text/font/FontFamilyTest.kt
+++ b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/font/FontFamilyTest.kt
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package androidx.ui.text.font
+package androidx.compose.ui.text.font
import com.google.common.truth.Truth.assertThat
import org.junit.Test
diff --git a/ui/ui-text-core/src/test/java/androidx/ui/text/font/FontMatcherTest.kt b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/font/FontMatcherTest.kt
similarity index 90%
rename from ui/ui-text-core/src/test/java/androidx/ui/text/font/FontMatcherTest.kt
rename to ui/ui-text-core/src/test/java/androidx/compose/ui/text/font/FontMatcherTest.kt
index 6dc13a4..5733506 100644
--- a/ui/ui-text-core/src/test/java/androidx/ui/text/font/FontMatcherTest.kt
+++ b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/font/FontMatcherTest.kt
@@ -14,23 +14,23 @@
* limitations under the License.
*/
-package androidx.ui.text.font
+package androidx.compose.ui.text.font
-import androidx.ui.text.font.FontTestData.Companion.FONT_100_ITALIC
-import androidx.ui.text.font.FontTestData.Companion.FONT_100_REGULAR
-import androidx.ui.text.font.FontTestData.Companion.FONT_200_ITALIC
-import androidx.ui.text.font.FontTestData.Companion.FONT_200_REGULAR
-import androidx.ui.text.font.FontTestData.Companion.FONT_300_ITALIC
-import androidx.ui.text.font.FontTestData.Companion.FONT_300_REGULAR
-import androidx.ui.text.font.FontTestData.Companion.FONT_400_ITALIC
-import androidx.ui.text.font.FontTestData.Companion.FONT_400_REGULAR
-import androidx.ui.text.font.FontTestData.Companion.FONT_500_ITALIC
-import androidx.ui.text.font.FontTestData.Companion.FONT_500_REGULAR
-import androidx.ui.text.font.FontTestData.Companion.FONT_600_ITALIC
-import androidx.ui.text.font.FontTestData.Companion.FONT_600_REGULAR
-import androidx.ui.text.font.FontTestData.Companion.FONT_700_REGULAR
-import androidx.ui.text.font.FontTestData.Companion.FONT_800_ITALIC
-import androidx.ui.text.font.FontTestData.Companion.FONT_800_REGULAR
+import androidx.compose.ui.text.font.FontTestData.Companion.FONT_100_ITALIC
+import androidx.compose.ui.text.font.FontTestData.Companion.FONT_100_REGULAR
+import androidx.compose.ui.text.font.FontTestData.Companion.FONT_200_ITALIC
+import androidx.compose.ui.text.font.FontTestData.Companion.FONT_200_REGULAR
+import androidx.compose.ui.text.font.FontTestData.Companion.FONT_300_ITALIC
+import androidx.compose.ui.text.font.FontTestData.Companion.FONT_300_REGULAR
+import androidx.compose.ui.text.font.FontTestData.Companion.FONT_400_ITALIC
+import androidx.compose.ui.text.font.FontTestData.Companion.FONT_400_REGULAR
+import androidx.compose.ui.text.font.FontTestData.Companion.FONT_500_ITALIC
+import androidx.compose.ui.text.font.FontTestData.Companion.FONT_500_REGULAR
+import androidx.compose.ui.text.font.FontTestData.Companion.FONT_600_ITALIC
+import androidx.compose.ui.text.font.FontTestData.Companion.FONT_600_REGULAR
+import androidx.compose.ui.text.font.FontTestData.Companion.FONT_700_REGULAR
+import androidx.compose.ui.text.font.FontTestData.Companion.FONT_800_ITALIC
+import androidx.compose.ui.text.font.FontTestData.Companion.FONT_800_REGULAR
import com.google.common.truth.Truth.assertThat
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/ui/ui-text-core/src/test/java/androidx/ui/text/font/FontTest.kt b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/font/FontTest.kt
similarity index 98%
rename from ui/ui-text-core/src/test/java/androidx/ui/text/font/FontTest.kt
rename to ui/ui-text-core/src/test/java/androidx/compose/ui/text/font/FontTest.kt
index d9c6a70..c1601f5 100644
--- a/ui/ui-text-core/src/test/java/androidx/ui/text/font/FontTest.kt
+++ b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/font/FontTest.kt
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package androidx.ui.text.font
+package androidx.compose.ui.text.font
import com.google.common.truth.Truth.assertThat
import org.junit.Test
diff --git a/ui/ui-text-core/src/test/java/androidx/ui/text/font/FontTestData.kt b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/font/FontTestData.kt
similarity index 98%
rename from ui/ui-text-core/src/test/java/androidx/ui/text/font/FontTestData.kt
rename to ui/ui-text-core/src/test/java/androidx/compose/ui/text/font/FontTestData.kt
index 6a8e978..b763b1f 100644
--- a/ui/ui-text-core/src/test/java/androidx/ui/text/font/FontTestData.kt
+++ b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/font/FontTestData.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.text.font
+package androidx.compose.ui.text.font
class FontTestData {
companion object {
diff --git a/ui/ui-text-core/src/test/java/androidx/ui/text/font/FontWeightTest.kt b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/font/FontWeightTest.kt
similarity index 98%
rename from ui/ui-text-core/src/test/java/androidx/ui/text/font/FontWeightTest.kt
rename to ui/ui-text-core/src/test/java/androidx/compose/ui/text/font/FontWeightTest.kt
index 831fe5d..e309ddb 100644
--- a/ui/ui-text-core/src/test/java/androidx/ui/text/font/FontWeightTest.kt
+++ b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/font/FontWeightTest.kt
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package androidx.ui.text.font
+package androidx.compose.ui.text.font
import com.google.common.truth.Truth.assertThat
import org.junit.Test
diff --git a/ui/ui-text-core/src/test/java/androidx/ui/text/font/LoadedFontFamilyTest.kt b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/font/LoadedFontFamilyTest.kt
similarity index 93%
rename from ui/ui-text-core/src/test/java/androidx/ui/text/font/LoadedFontFamilyTest.kt
rename to ui/ui-text-core/src/test/java/androidx/compose/ui/text/font/LoadedFontFamilyTest.kt
index 457ef95..dfc3c0c 100644
--- a/ui/ui-text-core/src/test/java/androidx/ui/text/font/LoadedFontFamilyTest.kt
+++ b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/font/LoadedFontFamilyTest.kt
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package androidx.ui.text.font
+package androidx.compose.ui.text.font
-import androidx.ui.text.Typeface
+import androidx.compose.ui.text.Typeface
import com.google.common.truth.Truth.assertThat
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/ui/ui-text-core/src/test/java/androidx/ui/input/CommitTextEditOpTest.kt b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/input/CommitTextEditOpTest.kt
similarity index 98%
rename from ui/ui-text-core/src/test/java/androidx/ui/input/CommitTextEditOpTest.kt
rename to ui/ui-text-core/src/test/java/androidx/compose/ui/text/input/CommitTextEditOpTest.kt
index e9b20fd..554dac7 100644
--- a/ui/ui-text-core/src/test/java/androidx/ui/input/CommitTextEditOpTest.kt
+++ b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/input/CommitTextEditOpTest.kt
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package androidx.ui.input
+package androidx.compose.ui.text.input
import androidx.test.filters.SmallTest
-import androidx.ui.text.TextRange
+import androidx.compose.ui.text.TextRange
import org.junit.Assert.assertEquals
import org.junit.Assert.assertFalse
import org.junit.Test
diff --git a/ui/ui-text-core/src/test/java/androidx/ui/input/DeleteSurroundingTextEditOpTest.kt b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/input/DeleteSurroundingTextEditOpTest.kt
similarity index 98%
rename from ui/ui-text-core/src/test/java/androidx/ui/input/DeleteSurroundingTextEditOpTest.kt
rename to ui/ui-text-core/src/test/java/androidx/compose/ui/text/input/DeleteSurroundingTextEditOpTest.kt
index 40840aa..770665a 100644
--- a/ui/ui-text-core/src/test/java/androidx/ui/input/DeleteSurroundingTextEditOpTest.kt
+++ b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/input/DeleteSurroundingTextEditOpTest.kt
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package androidx.ui.input
+package androidx.compose.ui.text.input
import androidx.test.filters.SmallTest
-import androidx.ui.text.TextRange
+import androidx.compose.ui.text.TextRange
import org.junit.Assert.assertEquals
import org.junit.Assert.assertFalse
import org.junit.Test
diff --git a/ui/ui-text-core/src/test/java/androidx/ui/input/DeleteSurroundingTextInCodePointsEditOpTest.kt b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/input/DeleteSurroundingTextInCodePointsEditOpTest.kt
similarity index 98%
rename from ui/ui-text-core/src/test/java/androidx/ui/input/DeleteSurroundingTextInCodePointsEditOpTest.kt
rename to ui/ui-text-core/src/test/java/androidx/compose/ui/text/input/DeleteSurroundingTextInCodePointsEditOpTest.kt
index 1699039a..6a0ef8d 100644
--- a/ui/ui-text-core/src/test/java/androidx/ui/input/DeleteSurroundingTextInCodePointsEditOpTest.kt
+++ b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/input/DeleteSurroundingTextInCodePointsEditOpTest.kt
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package androidx.ui.input
+package androidx.compose.ui.text.input
import androidx.test.filters.SmallTest
-import androidx.ui.text.TextRange
+import androidx.compose.ui.text.TextRange
import org.junit.Assert.assertEquals
import org.junit.Assert.assertFalse
import org.junit.Test
diff --git a/ui/ui-text-core/src/test/java/androidx/ui/input/EditProcessorTest.kt b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/input/EditProcessorTest.kt
similarity index 94%
rename from ui/ui-text-core/src/test/java/androidx/ui/input/EditProcessorTest.kt
rename to ui/ui-text-core/src/test/java/androidx/compose/ui/text/input/EditProcessorTest.kt
index 877e6b3..dc3e3cd 100644
--- a/ui/ui-text-core/src/test/java/androidx/ui/input/EditProcessorTest.kt
+++ b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/input/EditProcessorTest.kt
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package androidx.ui.input
+package androidx.compose.ui.text.input
import androidx.test.filters.SmallTest
-import androidx.ui.text.InternalTextApi
-import androidx.ui.text.TextRange
+import androidx.compose.ui.text.InternalTextApi
+import androidx.compose.ui.text.TextRange
import com.nhaarman.mockitokotlin2.any
import com.nhaarman.mockitokotlin2.argumentCaptor
import com.nhaarman.mockitokotlin2.eq
diff --git a/ui/ui-text-core/src/test/java/androidx/ui/input/EditingBufferTest.kt b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/input/EditingBufferTest.kt
similarity index 99%
rename from ui/ui-text-core/src/test/java/androidx/ui/input/EditingBufferTest.kt
rename to ui/ui-text-core/src/test/java/androidx/compose/ui/text/input/EditingBufferTest.kt
index 28f5bd4..c3cff1c 100644
--- a/ui/ui-text-core/src/test/java/androidx/ui/input/EditingBufferTest.kt
+++ b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/input/EditingBufferTest.kt
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package androidx.ui.input
+package androidx.compose.ui.text.input
import androidx.test.filters.SmallTest
-import androidx.ui.text.TextRange
+import androidx.compose.ui.text.TextRange
import org.junit.Assert.assertEquals
import org.junit.Assert.assertFalse
import org.junit.Assert.assertTrue
diff --git a/ui/ui-text-core/src/test/java/androidx/ui/input/FinishComposingTextEditOpTest.kt b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/input/FinishComposingTextEditOpTest.kt
similarity index 94%
rename from ui/ui-text-core/src/test/java/androidx/ui/input/FinishComposingTextEditOpTest.kt
rename to ui/ui-text-core/src/test/java/androidx/compose/ui/text/input/FinishComposingTextEditOpTest.kt
index 9115bac..aa83b85 100644
--- a/ui/ui-text-core/src/test/java/androidx/ui/input/FinishComposingTextEditOpTest.kt
+++ b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/input/FinishComposingTextEditOpTest.kt
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package androidx.ui.input
+package androidx.compose.ui.text.input
import androidx.test.filters.SmallTest
-import androidx.ui.text.TextRange
+import androidx.compose.ui.text.TextRange
import org.junit.Assert.assertEquals
import org.junit.Assert.assertFalse
import org.junit.Test
diff --git a/ui/ui-text-core/src/test/java/androidx/ui/input/GapBufferTest.kt b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/input/GapBufferTest.kt
similarity index 99%
rename from ui/ui-text-core/src/test/java/androidx/ui/input/GapBufferTest.kt
rename to ui/ui-text-core/src/test/java/androidx/compose/ui/text/input/GapBufferTest.kt
index 826bbda..5856efb 100644
--- a/ui/ui-text-core/src/test/java/androidx/ui/input/GapBufferTest.kt
+++ b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/input/GapBufferTest.kt
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package androidx.ui.input
+package androidx.compose.ui.text.input
import androidx.test.filters.SmallTest
-import androidx.ui.text.InternalTextApi
+import androidx.compose.ui.text.InternalTextApi
import org.junit.Assert.assertEquals
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/ui/ui-text-core/src/test/java/androidx/ui/input/PasswordVisualTransformationTest.kt b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/input/PasswordVisualTransformationTest.kt
similarity index 94%
rename from ui/ui-text-core/src/test/java/androidx/ui/input/PasswordVisualTransformationTest.kt
rename to ui/ui-text-core/src/test/java/androidx/compose/ui/text/input/PasswordVisualTransformationTest.kt
index 0b95106..6f062f3 100644
--- a/ui/ui-text-core/src/test/java/androidx/ui/input/PasswordVisualTransformationTest.kt
+++ b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/input/PasswordVisualTransformationTest.kt
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package androidx.ui.input
+package androidx.compose.ui.text.input
-import androidx.ui.text.AnnotatedString
+import androidx.compose.ui.text.AnnotatedString
import org.junit.Assert.assertEquals
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/ui/ui-text-core/src/test/java/androidx/ui/input/SetComposingRegionEditOpTest.kt b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/input/SetComposingRegionEditOpTest.kt
similarity index 97%
rename from ui/ui-text-core/src/test/java/androidx/ui/input/SetComposingRegionEditOpTest.kt
rename to ui/ui-text-core/src/test/java/androidx/compose/ui/text/input/SetComposingRegionEditOpTest.kt
index 549f084..ca05b07 100644
--- a/ui/ui-text-core/src/test/java/androidx/ui/input/SetComposingRegionEditOpTest.kt
+++ b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/input/SetComposingRegionEditOpTest.kt
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package androidx.ui.input
+package androidx.compose.ui.text.input
import androidx.test.filters.SmallTest
-import androidx.ui.text.TextRange
+import androidx.compose.ui.text.TextRange
import org.junit.Assert.assertEquals
import org.junit.Assert.assertFalse
import org.junit.Assert.assertTrue
diff --git a/ui/ui-text-core/src/test/java/androidx/ui/input/SetComposingTextEditOpTest.kt b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/input/SetComposingTextEditOpTest.kt
similarity index 98%
rename from ui/ui-text-core/src/test/java/androidx/ui/input/SetComposingTextEditOpTest.kt
rename to ui/ui-text-core/src/test/java/androidx/compose/ui/text/input/SetComposingTextEditOpTest.kt
index b992af58..33bb6b3 100644
--- a/ui/ui-text-core/src/test/java/androidx/ui/input/SetComposingTextEditOpTest.kt
+++ b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/input/SetComposingTextEditOpTest.kt
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package androidx.ui.input
+package androidx.compose.ui.text.input
import androidx.test.filters.SmallTest
-import androidx.ui.text.TextRange
+import androidx.compose.ui.text.TextRange
import org.junit.Assert.assertEquals
import org.junit.Assert.assertFalse
import org.junit.Assert.assertTrue
diff --git a/ui/ui-text-core/src/test/java/androidx/ui/input/SetSelectionEditOpTest.kt b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/input/SetSelectionEditOpTest.kt
similarity index 97%
rename from ui/ui-text-core/src/test/java/androidx/ui/input/SetSelectionEditOpTest.kt
rename to ui/ui-text-core/src/test/java/androidx/compose/ui/text/input/SetSelectionEditOpTest.kt
index c696ac5..71fafd5 100644
--- a/ui/ui-text-core/src/test/java/androidx/ui/input/SetSelectionEditOpTest.kt
+++ b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/input/SetSelectionEditOpTest.kt
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package androidx.ui.input
+package androidx.compose.ui.text.input
import androidx.test.filters.SmallTest
-import androidx.ui.text.TextRange
+import androidx.compose.ui.text.TextRange
import org.junit.Assert.assertEquals
import org.junit.Assert.assertFalse
import org.junit.Assert.assertTrue
diff --git a/ui/ui-text-core/src/test/java/androidx/ui/input/TextFieldValueTest.kt b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/input/TextFieldValueTest.kt
similarity index 96%
rename from ui/ui-text-core/src/test/java/androidx/ui/input/TextFieldValueTest.kt
rename to ui/ui-text-core/src/test/java/androidx/compose/ui/text/input/TextFieldValueTest.kt
index eece874..aba0417 100644
--- a/ui/ui-text-core/src/test/java/androidx/ui/input/TextFieldValueTest.kt
+++ b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/input/TextFieldValueTest.kt
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package androidx.ui.input
+package androidx.compose.ui.text.input
import androidx.test.filters.SmallTest
-import androidx.ui.text.TextRange
+import androidx.compose.ui.text.TextRange
import com.google.common.truth.Truth.assertThat
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/ui/ui-text-core/src/test/java/androidx/ui/text/style/BaselineShiftTest.kt b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/style/BaselineShiftTest.kt
similarity index 96%
rename from ui/ui-text-core/src/test/java/androidx/ui/text/style/BaselineShiftTest.kt
rename to ui/ui-text-core/src/test/java/androidx/compose/ui/text/style/BaselineShiftTest.kt
index 8933082..f29101d 100644
--- a/ui/ui-text-core/src/test/java/androidx/ui/text/style/BaselineShiftTest.kt
+++ b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/style/BaselineShiftTest.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.text.style
+package androidx.compose.ui.text.style
import com.google.common.truth.Truth.assertThat
import org.junit.Test
diff --git a/ui/ui-text-core/src/test/java/androidx/ui/text/style/TextDecorationTest.kt b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/style/TextDecorationTest.kt
similarity index 98%
rename from ui/ui-text-core/src/test/java/androidx/ui/text/style/TextDecorationTest.kt
rename to ui/ui-text-core/src/test/java/androidx/compose/ui/text/style/TextDecorationTest.kt
index be049d9..6fcbdb0 100644
--- a/ui/ui-text-core/src/test/java/androidx/ui/text/style/TextDecorationTest.kt
+++ b/ui/ui-text-core/src/test/java/androidx/compose/ui/text/style/TextDecorationTest.kt
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package androidx.ui.text.style
+package androidx.compose.ui.text.style
import com.google.common.truth.Truth.assertThat
import org.junit.Test
diff --git a/ui/ui-text/api/0.1.0-dev16.txt b/ui/ui-text/api/0.1.0-dev16.txt
index 866fea2..a8b583f 100644
--- a/ui/ui-text/api/0.1.0-dev16.txt
+++ b/ui/ui-text/api/0.1.0-dev16.txt
@@ -2,43 +2,43 @@
package androidx.compose.foundation.text {
public final class CoreTextFieldKt {
- method @Deprecated @androidx.compose.Composable public static void CoreTextField(androidx.ui.input.EditorValue value, androidx.ui.core.Modifier modifier, kotlin.jvm.functions.Function1<? super androidx.ui.input.EditorValue,kotlin.Unit> onValueChange, androidx.ui.text.TextStyle textStyle = TextStyle.Default, androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.ui.input.ImeAction,kotlin.Unit> androidx.ui.input.VisualTransformation visualTransformation = VisualTransformation.None, kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> >
- method @androidx.compose.Composable public static void CoreTextField(androidx.ui.input.TextFieldValue value, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.input.TextFieldValue,kotlin.Unit> onValueChange, androidx.ui.text.TextStyle textStyle = TextStyle.Default, androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function1<? super androidx.ui.input.ImeAction,kotlin.Unit> kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> androidx.ui.input.VisualTransformation visualTransformation = VisualTransformation.None, kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> >
+ method @Deprecated @androidx.compose.Composable public static void CoreTextField(androidx.compose.ui.text.input.EditorValue value, androidx.ui.core.Modifier modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.EditorValue,kotlin.Unit> onValueChange, androidx.compose.ui.text.TextStyle textStyle = TextStyle.Default, androidx.compose.ui.text.input.KeyboardType keyboardType = KeyboardType.Text, androidx.compose.ui.text.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.ImeAction,kotlin.Unit> androidx.compose.ui.text.input.VisualTransformation visualTransformation = VisualTransformation.None, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> >
+ method @androidx.compose.Composable public static void CoreTextField(androidx.compose.ui.text.input.TextFieldValue value, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.TextFieldValue,kotlin.Unit> onValueChange, androidx.compose.ui.text.TextStyle textStyle = TextStyle.Default, androidx.compose.ui.text.input.KeyboardType keyboardType = KeyboardType.Text, androidx.compose.ui.text.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.ImeAction,kotlin.Unit> kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> androidx.compose.ui.text.input.VisualTransformation visualTransformation = VisualTransformation.None, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> >
}
public final class CoreTextKt {
- method @androidx.compose.Composable public static void CoreText(androidx.ui.text.AnnotatedString text, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.text.TextStyle style, boolean softWrap, androidx.ui.text.style.TextOverflow overflow, int maxLines, java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent, kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout);
+ method @androidx.compose.Composable public static void CoreText(androidx.compose.ui.text.AnnotatedString text, androidx.ui.core.Modifier modifier = Modifier, androidx.compose.ui.text.TextStyle style, boolean softWrap, androidx.compose.ui.text.style.TextOverflow overflow, int maxLines, java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout);
method public static androidx.ui.core.HorizontalAlignmentLine getFirstBaseline();
method public static androidx.ui.core.HorizontalAlignmentLine getLastBaseline();
}
public final class InlineTextContent {
- ctor public InlineTextContent(androidx.ui.text.Placeholder placeholder, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> children);
- method public androidx.ui.text.Placeholder component1();
+ ctor public InlineTextContent(androidx.compose.ui.text.Placeholder placeholder, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> children);
+ method public androidx.compose.ui.text.Placeholder component1();
method public kotlin.jvm.functions.Function1<java.lang.String,kotlin.Unit> component2();
- method public androidx.compose.foundation.text.InlineTextContent copy(androidx.ui.text.Placeholder placeholder, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> children);
+ method public androidx.compose.foundation.text.InlineTextContent copy(androidx.compose.ui.text.Placeholder placeholder, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> children);
method public kotlin.jvm.functions.Function1<java.lang.String,kotlin.Unit> getChildren();
- method public androidx.ui.text.Placeholder getPlaceholder();
+ method public androidx.compose.ui.text.Placeholder getPlaceholder();
}
public final class InlineTextContentKt {
- method public static void appendInlineContent(androidx.ui.text.AnnotatedString.Builder, String id, String alternateText = "\ufffd");
+ method public static void appendInlineContent(androidx.compose.ui.text.AnnotatedString.Builder, String id, String alternateText = "\ufffd");
}
public final class TextFieldDelegateKt {
}
public final class TextSemanticsProperties {
- method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.input.ImeAction> getImeAction();
+ method public androidx.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.input.ImeAction> getImeAction();
method public androidx.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getSupportsInputMethods();
- property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.input.ImeAction> ImeAction;
+ property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.input.ImeAction> ImeAction;
property public final androidx.ui.semantics.SemanticsPropertyKey<kotlin.Unit> SupportsInputMethods;
field public static final androidx.compose.foundation.text.TextSemanticsProperties INSTANCE;
}
public final class TextSemanticsPropertiesKt {
- method public static androidx.ui.input.ImeAction getImeAction(androidx.ui.semantics.SemanticsPropertyReceiver);
- method public static void setImeAction(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.ui.input.ImeAction p);
+ method public static androidx.compose.ui.text.input.ImeAction getImeAction(androidx.ui.semantics.SemanticsPropertyReceiver);
+ method public static void setImeAction(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.text.input.ImeAction p);
method public static void supportsInputMethods(androidx.ui.semantics.SemanticsPropertyReceiver);
}
diff --git a/ui/ui-text/api/current.txt b/ui/ui-text/api/current.txt
index 866fea2..a8b583f 100644
--- a/ui/ui-text/api/current.txt
+++ b/ui/ui-text/api/current.txt
@@ -2,43 +2,43 @@
package androidx.compose.foundation.text {
public final class CoreTextFieldKt {
- method @Deprecated @androidx.compose.Composable public static void CoreTextField(androidx.ui.input.EditorValue value, androidx.ui.core.Modifier modifier, kotlin.jvm.functions.Function1<? super androidx.ui.input.EditorValue,kotlin.Unit> onValueChange, androidx.ui.text.TextStyle textStyle = TextStyle.Default, androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.ui.input.ImeAction,kotlin.Unit> androidx.ui.input.VisualTransformation visualTransformation = VisualTransformation.None, kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> >
- method @androidx.compose.Composable public static void CoreTextField(androidx.ui.input.TextFieldValue value, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.input.TextFieldValue,kotlin.Unit> onValueChange, androidx.ui.text.TextStyle textStyle = TextStyle.Default, androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function1<? super androidx.ui.input.ImeAction,kotlin.Unit> kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> androidx.ui.input.VisualTransformation visualTransformation = VisualTransformation.None, kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> >
+ method @Deprecated @androidx.compose.Composable public static void CoreTextField(androidx.compose.ui.text.input.EditorValue value, androidx.ui.core.Modifier modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.EditorValue,kotlin.Unit> onValueChange, androidx.compose.ui.text.TextStyle textStyle = TextStyle.Default, androidx.compose.ui.text.input.KeyboardType keyboardType = KeyboardType.Text, androidx.compose.ui.text.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.ImeAction,kotlin.Unit> androidx.compose.ui.text.input.VisualTransformation visualTransformation = VisualTransformation.None, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> >
+ method @androidx.compose.Composable public static void CoreTextField(androidx.compose.ui.text.input.TextFieldValue value, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.TextFieldValue,kotlin.Unit> onValueChange, androidx.compose.ui.text.TextStyle textStyle = TextStyle.Default, androidx.compose.ui.text.input.KeyboardType keyboardType = KeyboardType.Text, androidx.compose.ui.text.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.ImeAction,kotlin.Unit> kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> androidx.compose.ui.text.input.VisualTransformation visualTransformation = VisualTransformation.None, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> >
}
public final class CoreTextKt {
- method @androidx.compose.Composable public static void CoreText(androidx.ui.text.AnnotatedString text, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.text.TextStyle style, boolean softWrap, androidx.ui.text.style.TextOverflow overflow, int maxLines, java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent, kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout);
+ method @androidx.compose.Composable public static void CoreText(androidx.compose.ui.text.AnnotatedString text, androidx.ui.core.Modifier modifier = Modifier, androidx.compose.ui.text.TextStyle style, boolean softWrap, androidx.compose.ui.text.style.TextOverflow overflow, int maxLines, java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout);
method public static androidx.ui.core.HorizontalAlignmentLine getFirstBaseline();
method public static androidx.ui.core.HorizontalAlignmentLine getLastBaseline();
}
public final class InlineTextContent {
- ctor public InlineTextContent(androidx.ui.text.Placeholder placeholder, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> children);
- method public androidx.ui.text.Placeholder component1();
+ ctor public InlineTextContent(androidx.compose.ui.text.Placeholder placeholder, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> children);
+ method public androidx.compose.ui.text.Placeholder component1();
method public kotlin.jvm.functions.Function1<java.lang.String,kotlin.Unit> component2();
- method public androidx.compose.foundation.text.InlineTextContent copy(androidx.ui.text.Placeholder placeholder, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> children);
+ method public androidx.compose.foundation.text.InlineTextContent copy(androidx.compose.ui.text.Placeholder placeholder, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> children);
method public kotlin.jvm.functions.Function1<java.lang.String,kotlin.Unit> getChildren();
- method public androidx.ui.text.Placeholder getPlaceholder();
+ method public androidx.compose.ui.text.Placeholder getPlaceholder();
}
public final class InlineTextContentKt {
- method public static void appendInlineContent(androidx.ui.text.AnnotatedString.Builder, String id, String alternateText = "\ufffd");
+ method public static void appendInlineContent(androidx.compose.ui.text.AnnotatedString.Builder, String id, String alternateText = "\ufffd");
}
public final class TextFieldDelegateKt {
}
public final class TextSemanticsProperties {
- method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.input.ImeAction> getImeAction();
+ method public androidx.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.input.ImeAction> getImeAction();
method public androidx.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getSupportsInputMethods();
- property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.input.ImeAction> ImeAction;
+ property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.input.ImeAction> ImeAction;
property public final androidx.ui.semantics.SemanticsPropertyKey<kotlin.Unit> SupportsInputMethods;
field public static final androidx.compose.foundation.text.TextSemanticsProperties INSTANCE;
}
public final class TextSemanticsPropertiesKt {
- method public static androidx.ui.input.ImeAction getImeAction(androidx.ui.semantics.SemanticsPropertyReceiver);
- method public static void setImeAction(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.ui.input.ImeAction p);
+ method public static androidx.compose.ui.text.input.ImeAction getImeAction(androidx.ui.semantics.SemanticsPropertyReceiver);
+ method public static void setImeAction(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.text.input.ImeAction p);
method public static void supportsInputMethods(androidx.ui.semantics.SemanticsPropertyReceiver);
}
diff --git a/ui/ui-text/api/public_plus_experimental_0.1.0-dev16.txt b/ui/ui-text/api/public_plus_experimental_0.1.0-dev16.txt
index 866fea2..a8b583f 100644
--- a/ui/ui-text/api/public_plus_experimental_0.1.0-dev16.txt
+++ b/ui/ui-text/api/public_plus_experimental_0.1.0-dev16.txt
@@ -2,43 +2,43 @@
package androidx.compose.foundation.text {
public final class CoreTextFieldKt {
- method @Deprecated @androidx.compose.Composable public static void CoreTextField(androidx.ui.input.EditorValue value, androidx.ui.core.Modifier modifier, kotlin.jvm.functions.Function1<? super androidx.ui.input.EditorValue,kotlin.Unit> onValueChange, androidx.ui.text.TextStyle textStyle = TextStyle.Default, androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.ui.input.ImeAction,kotlin.Unit> androidx.ui.input.VisualTransformation visualTransformation = VisualTransformation.None, kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> >
- method @androidx.compose.Composable public static void CoreTextField(androidx.ui.input.TextFieldValue value, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.input.TextFieldValue,kotlin.Unit> onValueChange, androidx.ui.text.TextStyle textStyle = TextStyle.Default, androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function1<? super androidx.ui.input.ImeAction,kotlin.Unit> kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> androidx.ui.input.VisualTransformation visualTransformation = VisualTransformation.None, kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> >
+ method @Deprecated @androidx.compose.Composable public static void CoreTextField(androidx.compose.ui.text.input.EditorValue value, androidx.ui.core.Modifier modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.EditorValue,kotlin.Unit> onValueChange, androidx.compose.ui.text.TextStyle textStyle = TextStyle.Default, androidx.compose.ui.text.input.KeyboardType keyboardType = KeyboardType.Text, androidx.compose.ui.text.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.ImeAction,kotlin.Unit> androidx.compose.ui.text.input.VisualTransformation visualTransformation = VisualTransformation.None, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> >
+ method @androidx.compose.Composable public static void CoreTextField(androidx.compose.ui.text.input.TextFieldValue value, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.TextFieldValue,kotlin.Unit> onValueChange, androidx.compose.ui.text.TextStyle textStyle = TextStyle.Default, androidx.compose.ui.text.input.KeyboardType keyboardType = KeyboardType.Text, androidx.compose.ui.text.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.ImeAction,kotlin.Unit> kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> androidx.compose.ui.text.input.VisualTransformation visualTransformation = VisualTransformation.None, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> >
}
public final class CoreTextKt {
- method @androidx.compose.Composable public static void CoreText(androidx.ui.text.AnnotatedString text, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.text.TextStyle style, boolean softWrap, androidx.ui.text.style.TextOverflow overflow, int maxLines, java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent, kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout);
+ method @androidx.compose.Composable public static void CoreText(androidx.compose.ui.text.AnnotatedString text, androidx.ui.core.Modifier modifier = Modifier, androidx.compose.ui.text.TextStyle style, boolean softWrap, androidx.compose.ui.text.style.TextOverflow overflow, int maxLines, java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout);
method public static androidx.ui.core.HorizontalAlignmentLine getFirstBaseline();
method public static androidx.ui.core.HorizontalAlignmentLine getLastBaseline();
}
public final class InlineTextContent {
- ctor public InlineTextContent(androidx.ui.text.Placeholder placeholder, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> children);
- method public androidx.ui.text.Placeholder component1();
+ ctor public InlineTextContent(androidx.compose.ui.text.Placeholder placeholder, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> children);
+ method public androidx.compose.ui.text.Placeholder component1();
method public kotlin.jvm.functions.Function1<java.lang.String,kotlin.Unit> component2();
- method public androidx.compose.foundation.text.InlineTextContent copy(androidx.ui.text.Placeholder placeholder, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> children);
+ method public androidx.compose.foundation.text.InlineTextContent copy(androidx.compose.ui.text.Placeholder placeholder, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> children);
method public kotlin.jvm.functions.Function1<java.lang.String,kotlin.Unit> getChildren();
- method public androidx.ui.text.Placeholder getPlaceholder();
+ method public androidx.compose.ui.text.Placeholder getPlaceholder();
}
public final class InlineTextContentKt {
- method public static void appendInlineContent(androidx.ui.text.AnnotatedString.Builder, String id, String alternateText = "\ufffd");
+ method public static void appendInlineContent(androidx.compose.ui.text.AnnotatedString.Builder, String id, String alternateText = "\ufffd");
}
public final class TextFieldDelegateKt {
}
public final class TextSemanticsProperties {
- method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.input.ImeAction> getImeAction();
+ method public androidx.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.input.ImeAction> getImeAction();
method public androidx.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getSupportsInputMethods();
- property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.input.ImeAction> ImeAction;
+ property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.input.ImeAction> ImeAction;
property public final androidx.ui.semantics.SemanticsPropertyKey<kotlin.Unit> SupportsInputMethods;
field public static final androidx.compose.foundation.text.TextSemanticsProperties INSTANCE;
}
public final class TextSemanticsPropertiesKt {
- method public static androidx.ui.input.ImeAction getImeAction(androidx.ui.semantics.SemanticsPropertyReceiver);
- method public static void setImeAction(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.ui.input.ImeAction p);
+ method public static androidx.compose.ui.text.input.ImeAction getImeAction(androidx.ui.semantics.SemanticsPropertyReceiver);
+ method public static void setImeAction(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.text.input.ImeAction p);
method public static void supportsInputMethods(androidx.ui.semantics.SemanticsPropertyReceiver);
}
diff --git a/ui/ui-text/api/public_plus_experimental_current.txt b/ui/ui-text/api/public_plus_experimental_current.txt
index 866fea2..a8b583f 100644
--- a/ui/ui-text/api/public_plus_experimental_current.txt
+++ b/ui/ui-text/api/public_plus_experimental_current.txt
@@ -2,43 +2,43 @@
package androidx.compose.foundation.text {
public final class CoreTextFieldKt {
- method @Deprecated @androidx.compose.Composable public static void CoreTextField(androidx.ui.input.EditorValue value, androidx.ui.core.Modifier modifier, kotlin.jvm.functions.Function1<? super androidx.ui.input.EditorValue,kotlin.Unit> onValueChange, androidx.ui.text.TextStyle textStyle = TextStyle.Default, androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.ui.input.ImeAction,kotlin.Unit> androidx.ui.input.VisualTransformation visualTransformation = VisualTransformation.None, kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> >
- method @androidx.compose.Composable public static void CoreTextField(androidx.ui.input.TextFieldValue value, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.input.TextFieldValue,kotlin.Unit> onValueChange, androidx.ui.text.TextStyle textStyle = TextStyle.Default, androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function1<? super androidx.ui.input.ImeAction,kotlin.Unit> kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> androidx.ui.input.VisualTransformation visualTransformation = VisualTransformation.None, kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> >
+ method @Deprecated @androidx.compose.Composable public static void CoreTextField(androidx.compose.ui.text.input.EditorValue value, androidx.ui.core.Modifier modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.EditorValue,kotlin.Unit> onValueChange, androidx.compose.ui.text.TextStyle textStyle = TextStyle.Default, androidx.compose.ui.text.input.KeyboardType keyboardType = KeyboardType.Text, androidx.compose.ui.text.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.ImeAction,kotlin.Unit> androidx.compose.ui.text.input.VisualTransformation visualTransformation = VisualTransformation.None, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> >
+ method @androidx.compose.Composable public static void CoreTextField(androidx.compose.ui.text.input.TextFieldValue value, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.TextFieldValue,kotlin.Unit> onValueChange, androidx.compose.ui.text.TextStyle textStyle = TextStyle.Default, androidx.compose.ui.text.input.KeyboardType keyboardType = KeyboardType.Text, androidx.compose.ui.text.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.ImeAction,kotlin.Unit> kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> androidx.compose.ui.text.input.VisualTransformation visualTransformation = VisualTransformation.None, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> >
}
public final class CoreTextKt {
- method @androidx.compose.Composable public static void CoreText(androidx.ui.text.AnnotatedString text, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.text.TextStyle style, boolean softWrap, androidx.ui.text.style.TextOverflow overflow, int maxLines, java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent, kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout);
+ method @androidx.compose.Composable public static void CoreText(androidx.compose.ui.text.AnnotatedString text, androidx.ui.core.Modifier modifier = Modifier, androidx.compose.ui.text.TextStyle style, boolean softWrap, androidx.compose.ui.text.style.TextOverflow overflow, int maxLines, java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout);
method public static androidx.ui.core.HorizontalAlignmentLine getFirstBaseline();
method public static androidx.ui.core.HorizontalAlignmentLine getLastBaseline();
}
public final class InlineTextContent {
- ctor public InlineTextContent(androidx.ui.text.Placeholder placeholder, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> children);
- method public androidx.ui.text.Placeholder component1();
+ ctor public InlineTextContent(androidx.compose.ui.text.Placeholder placeholder, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> children);
+ method public androidx.compose.ui.text.Placeholder component1();
method public kotlin.jvm.functions.Function1<java.lang.String,kotlin.Unit> component2();
- method public androidx.compose.foundation.text.InlineTextContent copy(androidx.ui.text.Placeholder placeholder, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> children);
+ method public androidx.compose.foundation.text.InlineTextContent copy(androidx.compose.ui.text.Placeholder placeholder, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> children);
method public kotlin.jvm.functions.Function1<java.lang.String,kotlin.Unit> getChildren();
- method public androidx.ui.text.Placeholder getPlaceholder();
+ method public androidx.compose.ui.text.Placeholder getPlaceholder();
}
public final class InlineTextContentKt {
- method public static void appendInlineContent(androidx.ui.text.AnnotatedString.Builder, String id, String alternateText = "\ufffd");
+ method public static void appendInlineContent(androidx.compose.ui.text.AnnotatedString.Builder, String id, String alternateText = "\ufffd");
}
public final class TextFieldDelegateKt {
}
public final class TextSemanticsProperties {
- method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.input.ImeAction> getImeAction();
+ method public androidx.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.input.ImeAction> getImeAction();
method public androidx.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getSupportsInputMethods();
- property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.input.ImeAction> ImeAction;
+ property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.input.ImeAction> ImeAction;
property public final androidx.ui.semantics.SemanticsPropertyKey<kotlin.Unit> SupportsInputMethods;
field public static final androidx.compose.foundation.text.TextSemanticsProperties INSTANCE;
}
public final class TextSemanticsPropertiesKt {
- method public static androidx.ui.input.ImeAction getImeAction(androidx.ui.semantics.SemanticsPropertyReceiver);
- method public static void setImeAction(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.ui.input.ImeAction p);
+ method public static androidx.compose.ui.text.input.ImeAction getImeAction(androidx.ui.semantics.SemanticsPropertyReceiver);
+ method public static void setImeAction(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.text.input.ImeAction p);
method public static void supportsInputMethods(androidx.ui.semantics.SemanticsPropertyReceiver);
}
diff --git a/ui/ui-text/api/restricted_0.1.0-dev16.txt b/ui/ui-text/api/restricted_0.1.0-dev16.txt
index 866fea2..a8b583f 100644
--- a/ui/ui-text/api/restricted_0.1.0-dev16.txt
+++ b/ui/ui-text/api/restricted_0.1.0-dev16.txt
@@ -2,43 +2,43 @@
package androidx.compose.foundation.text {
public final class CoreTextFieldKt {
- method @Deprecated @androidx.compose.Composable public static void CoreTextField(androidx.ui.input.EditorValue value, androidx.ui.core.Modifier modifier, kotlin.jvm.functions.Function1<? super androidx.ui.input.EditorValue,kotlin.Unit> onValueChange, androidx.ui.text.TextStyle textStyle = TextStyle.Default, androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.ui.input.ImeAction,kotlin.Unit> androidx.ui.input.VisualTransformation visualTransformation = VisualTransformation.None, kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> >
- method @androidx.compose.Composable public static void CoreTextField(androidx.ui.input.TextFieldValue value, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.input.TextFieldValue,kotlin.Unit> onValueChange, androidx.ui.text.TextStyle textStyle = TextStyle.Default, androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function1<? super androidx.ui.input.ImeAction,kotlin.Unit> kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> androidx.ui.input.VisualTransformation visualTransformation = VisualTransformation.None, kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> >
+ method @Deprecated @androidx.compose.Composable public static void CoreTextField(androidx.compose.ui.text.input.EditorValue value, androidx.ui.core.Modifier modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.EditorValue,kotlin.Unit> onValueChange, androidx.compose.ui.text.TextStyle textStyle = TextStyle.Default, androidx.compose.ui.text.input.KeyboardType keyboardType = KeyboardType.Text, androidx.compose.ui.text.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.ImeAction,kotlin.Unit> androidx.compose.ui.text.input.VisualTransformation visualTransformation = VisualTransformation.None, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> >
+ method @androidx.compose.Composable public static void CoreTextField(androidx.compose.ui.text.input.TextFieldValue value, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.TextFieldValue,kotlin.Unit> onValueChange, androidx.compose.ui.text.TextStyle textStyle = TextStyle.Default, androidx.compose.ui.text.input.KeyboardType keyboardType = KeyboardType.Text, androidx.compose.ui.text.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.ImeAction,kotlin.Unit> kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> androidx.compose.ui.text.input.VisualTransformation visualTransformation = VisualTransformation.None, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> >
}
public final class CoreTextKt {
- method @androidx.compose.Composable public static void CoreText(androidx.ui.text.AnnotatedString text, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.text.TextStyle style, boolean softWrap, androidx.ui.text.style.TextOverflow overflow, int maxLines, java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent, kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout);
+ method @androidx.compose.Composable public static void CoreText(androidx.compose.ui.text.AnnotatedString text, androidx.ui.core.Modifier modifier = Modifier, androidx.compose.ui.text.TextStyle style, boolean softWrap, androidx.compose.ui.text.style.TextOverflow overflow, int maxLines, java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout);
method public static androidx.ui.core.HorizontalAlignmentLine getFirstBaseline();
method public static androidx.ui.core.HorizontalAlignmentLine getLastBaseline();
}
public final class InlineTextContent {
- ctor public InlineTextContent(androidx.ui.text.Placeholder placeholder, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> children);
- method public androidx.ui.text.Placeholder component1();
+ ctor public InlineTextContent(androidx.compose.ui.text.Placeholder placeholder, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> children);
+ method public androidx.compose.ui.text.Placeholder component1();
method public kotlin.jvm.functions.Function1<java.lang.String,kotlin.Unit> component2();
- method public androidx.compose.foundation.text.InlineTextContent copy(androidx.ui.text.Placeholder placeholder, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> children);
+ method public androidx.compose.foundation.text.InlineTextContent copy(androidx.compose.ui.text.Placeholder placeholder, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> children);
method public kotlin.jvm.functions.Function1<java.lang.String,kotlin.Unit> getChildren();
- method public androidx.ui.text.Placeholder getPlaceholder();
+ method public androidx.compose.ui.text.Placeholder getPlaceholder();
}
public final class InlineTextContentKt {
- method public static void appendInlineContent(androidx.ui.text.AnnotatedString.Builder, String id, String alternateText = "\ufffd");
+ method public static void appendInlineContent(androidx.compose.ui.text.AnnotatedString.Builder, String id, String alternateText = "\ufffd");
}
public final class TextFieldDelegateKt {
}
public final class TextSemanticsProperties {
- method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.input.ImeAction> getImeAction();
+ method public androidx.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.input.ImeAction> getImeAction();
method public androidx.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getSupportsInputMethods();
- property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.input.ImeAction> ImeAction;
+ property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.input.ImeAction> ImeAction;
property public final androidx.ui.semantics.SemanticsPropertyKey<kotlin.Unit> SupportsInputMethods;
field public static final androidx.compose.foundation.text.TextSemanticsProperties INSTANCE;
}
public final class TextSemanticsPropertiesKt {
- method public static androidx.ui.input.ImeAction getImeAction(androidx.ui.semantics.SemanticsPropertyReceiver);
- method public static void setImeAction(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.ui.input.ImeAction p);
+ method public static androidx.compose.ui.text.input.ImeAction getImeAction(androidx.ui.semantics.SemanticsPropertyReceiver);
+ method public static void setImeAction(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.text.input.ImeAction p);
method public static void supportsInputMethods(androidx.ui.semantics.SemanticsPropertyReceiver);
}
diff --git a/ui/ui-text/api/restricted_current.txt b/ui/ui-text/api/restricted_current.txt
index 866fea2..a8b583f 100644
--- a/ui/ui-text/api/restricted_current.txt
+++ b/ui/ui-text/api/restricted_current.txt
@@ -2,43 +2,43 @@
package androidx.compose.foundation.text {
public final class CoreTextFieldKt {
- method @Deprecated @androidx.compose.Composable public static void CoreTextField(androidx.ui.input.EditorValue value, androidx.ui.core.Modifier modifier, kotlin.jvm.functions.Function1<? super androidx.ui.input.EditorValue,kotlin.Unit> onValueChange, androidx.ui.text.TextStyle textStyle = TextStyle.Default, androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.ui.input.ImeAction,kotlin.Unit> androidx.ui.input.VisualTransformation visualTransformation = VisualTransformation.None, kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> >
- method @androidx.compose.Composable public static void CoreTextField(androidx.ui.input.TextFieldValue value, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.input.TextFieldValue,kotlin.Unit> onValueChange, androidx.ui.text.TextStyle textStyle = TextStyle.Default, androidx.ui.input.KeyboardType keyboardType = KeyboardType.Text, androidx.ui.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function1<? super androidx.ui.input.ImeAction,kotlin.Unit> kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> androidx.ui.input.VisualTransformation visualTransformation = VisualTransformation.None, kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.ui.text.SoftwareKeyboardController,kotlin.Unit> >
+ method @Deprecated @androidx.compose.Composable public static void CoreTextField(androidx.compose.ui.text.input.EditorValue value, androidx.ui.core.Modifier modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.EditorValue,kotlin.Unit> onValueChange, androidx.compose.ui.text.TextStyle textStyle = TextStyle.Default, androidx.compose.ui.text.input.KeyboardType keyboardType = KeyboardType.Text, androidx.compose.ui.text.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.ImeAction,kotlin.Unit> androidx.compose.ui.text.input.VisualTransformation visualTransformation = VisualTransformation.None, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> >
+ method @androidx.compose.Composable public static void CoreTextField(androidx.compose.ui.text.input.TextFieldValue value, androidx.ui.core.Modifier modifier = Modifier, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.TextFieldValue,kotlin.Unit> onValueChange, androidx.compose.ui.text.TextStyle textStyle = TextStyle.Default, androidx.compose.ui.text.input.KeyboardType keyboardType = KeyboardType.Text, androidx.compose.ui.text.input.ImeAction imeAction = ImeAction.Unspecified, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.input.ImeAction,kotlin.Unit> kotlin.jvm.functions.Function1<? super java.lang.Boolean,kotlin.Unit> androidx.compose.ui.text.input.VisualTransformation visualTransformation = VisualTransformation.None, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.SoftwareKeyboardController,kotlin.Unit> >
}
public final class CoreTextKt {
- method @androidx.compose.Composable public static void CoreText(androidx.ui.text.AnnotatedString text, androidx.ui.core.Modifier modifier = Modifier, androidx.ui.text.TextStyle style, boolean softWrap, androidx.ui.text.style.TextOverflow overflow, int maxLines, java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent, kotlin.jvm.functions.Function1<? super androidx.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout);
+ method @androidx.compose.Composable public static void CoreText(androidx.compose.ui.text.AnnotatedString text, androidx.ui.core.Modifier modifier = Modifier, androidx.compose.ui.text.TextStyle style, boolean softWrap, androidx.compose.ui.text.style.TextOverflow overflow, int maxLines, java.util.Map<java.lang.String,androidx.compose.foundation.text.InlineTextContent> inlineContent, kotlin.jvm.functions.Function1<? super androidx.compose.ui.text.TextLayoutResult,kotlin.Unit> onTextLayout);
method public static androidx.ui.core.HorizontalAlignmentLine getFirstBaseline();
method public static androidx.ui.core.HorizontalAlignmentLine getLastBaseline();
}
public final class InlineTextContent {
- ctor public InlineTextContent(androidx.ui.text.Placeholder placeholder, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> children);
- method public androidx.ui.text.Placeholder component1();
+ ctor public InlineTextContent(androidx.compose.ui.text.Placeholder placeholder, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> children);
+ method public androidx.compose.ui.text.Placeholder component1();
method public kotlin.jvm.functions.Function1<java.lang.String,kotlin.Unit> component2();
- method public androidx.compose.foundation.text.InlineTextContent copy(androidx.ui.text.Placeholder placeholder, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> children);
+ method public androidx.compose.foundation.text.InlineTextContent copy(androidx.compose.ui.text.Placeholder placeholder, kotlin.jvm.functions.Function1<? super java.lang.String,kotlin.Unit> children);
method public kotlin.jvm.functions.Function1<java.lang.String,kotlin.Unit> getChildren();
- method public androidx.ui.text.Placeholder getPlaceholder();
+ method public androidx.compose.ui.text.Placeholder getPlaceholder();
}
public final class InlineTextContentKt {
- method public static void appendInlineContent(androidx.ui.text.AnnotatedString.Builder, String id, String alternateText = "\ufffd");
+ method public static void appendInlineContent(androidx.compose.ui.text.AnnotatedString.Builder, String id, String alternateText = "\ufffd");
}
public final class TextFieldDelegateKt {
}
public final class TextSemanticsProperties {
- method public androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.input.ImeAction> getImeAction();
+ method public androidx.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.input.ImeAction> getImeAction();
method public androidx.ui.semantics.SemanticsPropertyKey<kotlin.Unit> getSupportsInputMethods();
- property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.input.ImeAction> ImeAction;
+ property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.compose.ui.text.input.ImeAction> ImeAction;
property public final androidx.ui.semantics.SemanticsPropertyKey<kotlin.Unit> SupportsInputMethods;
field public static final androidx.compose.foundation.text.TextSemanticsProperties INSTANCE;
}
public final class TextSemanticsPropertiesKt {
- method public static androidx.ui.input.ImeAction getImeAction(androidx.ui.semantics.SemanticsPropertyReceiver);
- method public static void setImeAction(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.ui.input.ImeAction p);
+ method public static androidx.compose.ui.text.input.ImeAction getImeAction(androidx.ui.semantics.SemanticsPropertyReceiver);
+ method public static void setImeAction(androidx.ui.semantics.SemanticsPropertyReceiver, androidx.compose.ui.text.input.ImeAction p);
method public static void supportsInputMethods(androidx.ui.semantics.SemanticsPropertyReceiver);
}
diff --git a/ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/compose/foundation/text/demos/ComposeInputField.kt b/ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/compose/foundation/text/demos/ComposeInputField.kt
index 3273555..cd80fd3 100644
--- a/ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/compose/foundation/text/demos/ComposeInputField.kt
+++ b/ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/compose/foundation/text/demos/ComposeInputField.kt
@@ -23,11 +23,11 @@
import androidx.compose.key
import androidx.compose.runtime.savedinstancestate.savedInstanceState
import androidx.compose.state
-import androidx.ui.input.ImeAction
-import androidx.ui.input.KeyboardType
-import androidx.ui.input.TextFieldValue
-import androidx.ui.text.SoftwareKeyboardController
-import androidx.ui.text.TextStyle
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.text.SoftwareKeyboardController
+import androidx.compose.ui.text.TextStyle
private val KEYBOARD_TYPES = listOf(
Pair(KeyboardType.Text, "Text"),
diff --git a/ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/compose/foundation/text/demos/ComposeInputFieldFocusTransition.kt b/ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/compose/foundation/text/demos/ComposeInputFieldFocusTransition.kt
index 7d035dc..07b95db 100644
--- a/ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/compose/foundation/text/demos/ComposeInputFieldFocusTransition.kt
+++ b/ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/compose/foundation/text/demos/ComposeInputFieldFocusTransition.kt
@@ -24,9 +24,9 @@
import androidx.compose.state
import androidx.ui.core.focus.FocusModifier
import androidx.ui.graphics.Color
-import androidx.ui.input.ImeAction
-import androidx.ui.input.TextFieldValue
-import androidx.ui.text.TextStyle
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.text.TextStyle
import androidx.ui.unit.sp
@Composable
diff --git a/ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/compose/foundation/text/demos/ComposeInputFieldTrickyUseCase.kt b/ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/compose/foundation/text/demos/ComposeInputFieldTrickyUseCase.kt
index f9310d7..43e5d69 100644
--- a/ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/compose/foundation/text/demos/ComposeInputFieldTrickyUseCase.kt
+++ b/ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/compose/foundation/text/demos/ComposeInputFieldTrickyUseCase.kt
@@ -21,9 +21,9 @@
import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.ScrollableColumn
import androidx.compose.runtime.savedinstancestate.savedInstanceState
-import androidx.ui.input.KeyboardType
-import androidx.ui.input.TextFieldValue
-import androidx.ui.text.TextStyle
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.text.TextStyle
import androidx.ui.unit.sp
@Composable
diff --git a/ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/compose/foundation/text/demos/ComposeMultiParagraph.kt b/ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/compose/foundation/text/demos/ComposeMultiParagraph.kt
index b20bf12..cdf1fb5 100644
--- a/ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/compose/foundation/text/demos/ComposeMultiParagraph.kt
+++ b/ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/compose/foundation/text/demos/ComposeMultiParagraph.kt
@@ -19,13 +19,13 @@
import androidx.compose.Composable
import androidx.compose.foundation.ScrollableColumn
import androidx.compose.foundation.Text
-import androidx.ui.text.AnnotatedString
-import androidx.ui.text.ParagraphStyle
-import androidx.ui.text.TextStyle
-import androidx.ui.text.annotatedString
-import androidx.ui.text.style.TextAlign
-import androidx.ui.text.style.TextIndent
-import androidx.ui.text.withStyle
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.ParagraphStyle
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.annotatedString
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextIndent
+import androidx.compose.ui.text.withStyle
import androidx.ui.unit.sp
val lorem = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas fermentum non" +
diff --git a/ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/compose/foundation/text/demos/ComposeText.kt b/ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/compose/foundation/text/demos/ComposeText.kt
index ebfed32..3e2188a 100644
--- a/ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/compose/foundation/text/demos/ComposeText.kt
+++ b/ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/compose/foundation/text/demos/ComposeText.kt
@@ -27,26 +27,26 @@
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.ui.intl.LocaleList
-import androidx.ui.text.SpanStyle
-import androidx.ui.text.TextStyle
-import androidx.ui.text.annotatedString
-import androidx.ui.text.font.FontFamily
-import androidx.ui.text.font.FontStyle
-import androidx.ui.text.font.FontWeight
-import androidx.ui.text.samples.BaselineShiftSample
-import androidx.ui.text.samples.FontFamilyCursiveSample
-import androidx.ui.text.samples.FontFamilyMonospaceSample
-import androidx.ui.text.samples.FontFamilySansSerifSample
-import androidx.ui.text.samples.FontFamilySerifSample
-import androidx.ui.text.samples.ParagraphStyleAnnotatedStringsSample
-import androidx.ui.text.samples.ParagraphStyleSample
-import androidx.ui.text.samples.TextDecorationCombinedSample
-import androidx.ui.text.samples.TextDecorationLineThroughSample
-import androidx.ui.text.samples.TextDecorationUnderlineSample
-import androidx.ui.text.samples.TextStyleSample
-import androidx.ui.text.style.TextAlign
-import androidx.ui.text.withStyle
+import androidx.compose.ui.text.intl.LocaleList
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.annotatedString
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.samples.BaselineShiftSample
+import androidx.compose.ui.text.samples.FontFamilyCursiveSample
+import androidx.compose.ui.text.samples.FontFamilyMonospaceSample
+import androidx.compose.ui.text.samples.FontFamilySansSerifSample
+import androidx.compose.ui.text.samples.FontFamilySerifSample
+import androidx.compose.ui.text.samples.ParagraphStyleAnnotatedStringsSample
+import androidx.compose.ui.text.samples.ParagraphStyleSample
+import androidx.compose.ui.text.samples.TextDecorationCombinedSample
+import androidx.compose.ui.text.samples.TextDecorationLineThroughSample
+import androidx.compose.ui.text.samples.TextDecorationUnderlineSample
+import androidx.compose.ui.text.samples.TextStyleSample
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.withStyle
import androidx.ui.unit.em
import androidx.ui.unit.sp
diff --git a/ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/compose/foundation/text/demos/ComposeTextSelection.kt b/ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/compose/foundation/text/demos/ComposeTextSelection.kt
index 6bf44b0..47a4126 100644
--- a/ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/compose/foundation/text/demos/ComposeTextSelection.kt
+++ b/ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/compose/foundation/text/demos/ComposeTextSelection.kt
@@ -24,17 +24,17 @@
import androidx.compose.foundation.ScrollableColumn
import androidx.compose.foundation.Text
import androidx.ui.graphics.Color
-import androidx.ui.intl.LocaleList
+import androidx.compose.ui.text.intl.LocaleList
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.ui.text.SpanStyle
-import androidx.ui.text.TextStyle
-import androidx.ui.text.annotatedString
-import androidx.ui.text.font.FontStyle
-import androidx.ui.text.font.FontWeight
-import androidx.ui.text.withStyle
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.annotatedString
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.withStyle
@Composable
fun TextSelectionDemo() {
diff --git a/ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/compose/foundation/text/demos/ComposeTextSelectionSample.kt b/ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/compose/foundation/text/demos/ComposeTextSelectionSample.kt
index 2241a56..1b06f51 100644
--- a/ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/compose/foundation/text/demos/ComposeTextSelectionSample.kt
+++ b/ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/compose/foundation/text/demos/ComposeTextSelectionSample.kt
@@ -29,10 +29,10 @@
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.preferredSize
-import androidx.ui.text.SpanStyle
-import androidx.ui.text.TextStyle
-import androidx.ui.text.annotatedString
-import androidx.ui.text.withStyle
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.annotatedString
+import androidx.compose.ui.text.withStyle
import androidx.ui.unit.dp
import androidx.ui.unit.sp
diff --git a/ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/compose/foundation/text/demos/ComposeVariousInputField.kt b/ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/compose/foundation/text/demos/ComposeVariousInputField.kt
index 097a6d2..7126593 100644
--- a/ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/compose/foundation/text/demos/ComposeVariousInputField.kt
+++ b/ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/compose/foundation/text/demos/ComposeVariousInputField.kt
@@ -32,20 +32,20 @@
import androidx.compose.foundation.background
import androidx.ui.geometry.Rect
import androidx.ui.graphics.Color
-import androidx.ui.input.ImeAction
-import androidx.ui.input.KeyboardType
-import androidx.ui.input.OffsetMap
-import androidx.ui.input.PasswordVisualTransformation
-import androidx.ui.input.TextFieldValue
-import androidx.ui.input.TransformedText
-import androidx.ui.input.VisualTransformation
-import androidx.ui.intl.LocaleList
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.text.input.OffsetMap
+import androidx.compose.ui.text.input.PasswordVisualTransformation
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.text.input.TransformedText
+import androidx.compose.ui.text.input.VisualTransformation
+import androidx.compose.ui.text.intl.LocaleList
import androidx.compose.runtime.savedinstancestate.savedInstanceState
-import androidx.ui.text.AnnotatedString
-import androidx.ui.text.TextLayoutResult
-import androidx.ui.text.TextRange
-import androidx.ui.text.TextStyle
-import androidx.ui.text.toUpperCase
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.TextLayoutResult
+import androidx.compose.ui.text.TextRange
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.toUpperCase
import kotlin.math.roundToInt
/**
diff --git a/ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/compose/foundation/text/demos/InteractiveText.kt b/ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/compose/foundation/text/demos/InteractiveText.kt
index f2b1f0a..654fe7b 100644
--- a/ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/compose/foundation/text/demos/InteractiveText.kt
+++ b/ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/compose/foundation/text/demos/InteractiveText.kt
@@ -21,7 +21,7 @@
import androidx.compose.foundation.ClickableText
import androidx.compose.foundation.ScrollableColumn
import androidx.compose.foundation.Text
-import androidx.ui.text.AnnotatedString
+import androidx.compose.ui.text.AnnotatedString
@Composable
fun InteractiveTextDemo() {
diff --git a/ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/compose/foundation/text/demos/TailFollowingTextField.kt b/ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/compose/foundation/text/demos/TailFollowingTextField.kt
index 2d2eae0..e83fe78 100644
--- a/ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/compose/foundation/text/demos/TailFollowingTextField.kt
+++ b/ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/compose/foundation/text/demos/TailFollowingTextField.kt
@@ -31,8 +31,8 @@
import androidx.ui.core.clipToBounds
import androidx.ui.core.constrainWidth
import androidx.ui.graphics.Color
-import androidx.ui.input.TextFieldValue
-import androidx.ui.text.TextStyle
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.text.TextStyle
import androidx.ui.unit.dp
import kotlin.math.min
diff --git a/ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/compose/foundation/text/demos/TextFieldWIthScroller.kt b/ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/compose/foundation/text/demos/TextFieldWIthScroller.kt
index 733faf4..819fd48 100644
--- a/ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/compose/foundation/text/demos/TextFieldWIthScroller.kt
+++ b/ui/ui-text/integration-tests/ui-text-compose-demos/src/main/java/androidx/compose/foundation/text/demos/TextFieldWIthScroller.kt
@@ -20,7 +20,7 @@
import androidx.compose.state
import androidx.ui.core.Modifier
import androidx.compose.foundation.ScrollableColumn
-import androidx.ui.input.TextFieldValue
+import androidx.compose.ui.text.input.TextFieldValue
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.BaseTextField
import androidx.compose.foundation.ExperimentalFoundationApi
diff --git a/ui/ui-text/samples/src/main/java/androidx/compose/foundation/text/samples/CoreTextFieldSample.kt b/ui/ui-text/samples/src/main/java/androidx/compose/foundation/text/samples/CoreTextFieldSample.kt
index ab6821c..ccc5b2c 100644
--- a/ui/ui-text/samples/src/main/java/androidx/compose/foundation/text/samples/CoreTextFieldSample.kt
+++ b/ui/ui-text/samples/src/main/java/androidx/compose/foundation/text/samples/CoreTextFieldSample.kt
@@ -20,7 +20,7 @@
import androidx.compose.Composable
import androidx.compose.getValue
import androidx.compose.setValue
-import androidx.ui.input.TextFieldValue
+import androidx.compose.ui.text.input.TextFieldValue
import androidx.compose.runtime.savedinstancestate.savedInstanceState
import androidx.compose.foundation.text.CoreTextField
diff --git a/ui/ui-text/samples/src/main/java/androidx/compose/foundation/text/samples/InlineTextContentSample.kt b/ui/ui-text/samples/src/main/java/androidx/compose/foundation/text/samples/InlineTextContentSample.kt
index 590834c..d56eb3f 100644
--- a/ui/ui-text/samples/src/main/java/androidx/compose/foundation/text/samples/InlineTextContentSample.kt
+++ b/ui/ui-text/samples/src/main/java/androidx/compose/foundation/text/samples/InlineTextContentSample.kt
@@ -25,9 +25,9 @@
import androidx.ui.graphics.Color
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.text.InlineTextContent
-import androidx.ui.text.Placeholder
-import androidx.ui.text.PlaceholderVerticalAlign
-import androidx.ui.text.annotatedString
+import androidx.compose.ui.text.Placeholder
+import androidx.compose.ui.text.PlaceholderVerticalAlign
+import androidx.compose.ui.text.annotatedString
import androidx.compose.foundation.text.appendInlineContent
import androidx.ui.unit.em
diff --git a/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/foundation/text/TextFieldDelegateIntegrationTest.kt b/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/foundation/text/TextFieldDelegateIntegrationTest.kt
index 1c4bf81..ae0bbe9 100644
--- a/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/foundation/text/TextFieldDelegateIntegrationTest.kt
+++ b/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/foundation/text/TextFieldDelegateIntegrationTest.kt
@@ -26,17 +26,17 @@
import androidx.ui.graphics.Canvas
import androidx.ui.graphics.Color
import androidx.ui.graphics.Paint
-import androidx.ui.input.TextFieldValue
-import androidx.ui.input.OffsetMap
-import androidx.ui.text.AnnotatedString
-import androidx.ui.text.InternalTextApi
-import androidx.ui.text.TextDelegate
-import androidx.ui.text.TextLayoutResult
-import androidx.ui.text.TextPainter
-import androidx.ui.text.TextRange
-import androidx.ui.text.TextStyle
-import androidx.ui.text.font.Font
-import androidx.ui.text.font.ResourceFont
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.text.input.OffsetMap
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.InternalTextApi
+import androidx.compose.ui.text.TextDelegate
+import androidx.compose.ui.text.TextLayoutResult
+import androidx.compose.ui.text.TextPainter
+import androidx.compose.ui.text.TextRange
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.Font
+import androidx.compose.ui.text.font.ResourceFont
import androidx.ui.unit.Density
import com.google.common.truth.Truth.assertThat
import org.junit.Test
diff --git a/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/foundation/text/TextLayoutTest.kt b/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/foundation/text/TextLayoutTest.kt
index 9246e31..c0843b2 100644
--- a/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/foundation/text/TextLayoutTest.kt
+++ b/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/foundation/text/TextLayoutTest.kt
@@ -26,15 +26,15 @@
import androidx.ui.core.Ref
import androidx.ui.core.onPositioned
import androidx.ui.core.setContent
-import androidx.ui.text.AnnotatedString
-import androidx.ui.text.TextLayoutResult
-import androidx.ui.text.TextStyle
-import androidx.ui.text.font.FontStyle
-import androidx.ui.text.font.FontWeight
-import androidx.ui.text.font.asFontFamily
-import androidx.ui.text.font.font
-import androidx.ui.text.font.test.R
-import androidx.ui.text.style.TextOverflow
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.TextLayoutResult
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.font.asFontFamily
+import androidx.compose.ui.text.font.font
+import androidx.compose.ui.text.font.test.R
+import androidx.compose.ui.text.style.TextOverflow
import androidx.ui.unit.Density
import androidx.ui.unit.IntSize
import com.google.common.truth.Truth.assertThat
diff --git a/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/foundation/text/selection/MultiWidgetSelectionDelegateTest.kt b/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/foundation/text/selection/MultiWidgetSelectionDelegateTest.kt
index c65365f1..cb6060d 100644
--- a/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/foundation/text/selection/MultiWidgetSelectionDelegateTest.kt
+++ b/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/foundation/text/selection/MultiWidgetSelectionDelegateTest.kt
@@ -28,22 +28,22 @@
import androidx.ui.core.selection.Selectable
import androidx.ui.core.selection.Selection
import androidx.ui.test.android.AndroidComposeTestRule
-import androidx.ui.text.AnnotatedString
-import androidx.ui.text.SpanStyle
-import androidx.ui.text.TextDelegate
-import androidx.ui.text.TextLayoutResult
-import androidx.ui.text.TextStyle
-import androidx.ui.text.font.Font
-import androidx.ui.text.font.FontStyle
-import androidx.ui.text.font.FontWeight
-import androidx.ui.text.font.ResourceFont
-import androidx.ui.text.font.asFontFamily
-import androidx.ui.text.font.font
-import androidx.ui.text.font.test.R
-import androidx.ui.text.style.ResolvedTextDirection
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.TextDelegate
+import androidx.compose.ui.text.TextLayoutResult
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.Font
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.font.ResourceFont
+import androidx.compose.ui.text.font.asFontFamily
+import androidx.compose.ui.text.font.font
+import androidx.compose.ui.text.font.test.R
+import androidx.compose.ui.text.style.ResolvedTextDirection
import androidx.ui.unit.Density
import androidx.ui.geometry.Offset
-import androidx.ui.text.InternalTextApi
+import androidx.compose.ui.text.InternalTextApi
import androidx.ui.unit.TextUnit
import androidx.ui.unit.sp
import com.google.common.truth.Truth.assertThat
diff --git a/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/foundation/text/selection/SelectionContainerTest.kt b/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/foundation/text/selection/SelectionContainerTest.kt
index 18e4609..290a4ff 100644
--- a/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/foundation/text/selection/SelectionContainerTest.kt
+++ b/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/foundation/text/selection/SelectionContainerTest.kt
@@ -33,15 +33,15 @@
import androidx.compose.foundation.layout.fillMaxSize
import androidx.ui.test.android.AndroidComposeTestRule
import androidx.ui.test.runOnIdle
-import androidx.ui.text.AnnotatedString
+import androidx.compose.ui.text.AnnotatedString
import androidx.compose.foundation.text.CoreText
-import androidx.ui.text.TextStyle
-import androidx.ui.text.font.FontStyle
-import androidx.ui.text.font.FontWeight
-import androidx.ui.text.font.ResourceFont
-import androidx.ui.text.font.asFontFamily
-import androidx.ui.text.font.test.R
-import androidx.ui.text.style.TextOverflow
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.font.ResourceFont
+import androidx.compose.ui.text.font.asFontFamily
+import androidx.compose.ui.text.font.test.R
+import androidx.compose.ui.text.style.TextOverflow
import androidx.ui.unit.sp
import com.google.common.truth.Truth.assertThat
import com.nhaarman.mockitokotlin2.mock
diff --git a/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/foundation/text/selection/TextFieldSelectionDelegateTest.kt b/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/foundation/text/selection/TextFieldSelectionDelegateTest.kt
index cfda12a..3962959 100644
--- a/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/foundation/text/selection/TextFieldSelectionDelegateTest.kt
+++ b/ui/ui-text/src/androidAndroidTest/kotlin/androidx/compose/foundation/text/selection/TextFieldSelectionDelegateTest.kt
@@ -22,14 +22,14 @@
import androidx.ui.core.Constraints
import androidx.ui.core.LayoutDirection
import androidx.ui.test.android.AndroidComposeTestRule
-import androidx.ui.text.AnnotatedString
-import androidx.ui.text.InternalTextApi
-import androidx.ui.text.SpanStyle
-import androidx.ui.text.TextDelegate
-import androidx.ui.text.TextLayoutResult
-import androidx.ui.text.TextRange
-import androidx.ui.text.TextStyle
-import androidx.ui.text.font.asFontFamily
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.InternalTextApi
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.TextDelegate
+import androidx.compose.ui.text.TextLayoutResult
+import androidx.compose.ui.text.TextRange
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.asFontFamily
import androidx.ui.unit.Density
import androidx.ui.unit.TextUnit
import androidx.ui.unit.sp
diff --git a/ui/ui-text/src/commonMain/kotlin/androidx/compose/foundation/text/CoreText.kt b/ui/ui-text/src/commonMain/kotlin/androidx/compose/foundation/text/CoreText.kt
index f18233b..8175c15 100644
--- a/ui/ui-text/src/commonMain/kotlin/androidx/compose/foundation/text/CoreText.kt
+++ b/ui/ui-text/src/commonMain/kotlin/androidx/compose/foundation/text/CoreText.kt
@@ -42,19 +42,19 @@
import androidx.ui.graphics.drawscope.drawCanvas
import androidx.ui.graphics.Paint
import androidx.ui.semantics.getTextLayoutResult
-import androidx.ui.text.font.Font
+import androidx.compose.ui.text.font.Font
import androidx.compose.foundation.text.selection.MultiWidgetSelectionDelegate
-import androidx.ui.text.AnnotatedString
-import androidx.ui.text.InternalTextApi
-import androidx.ui.text.Placeholder
-import androidx.ui.text.TextDelegate
-import androidx.ui.text.TextLayoutResult
-import androidx.ui.text.TextRange
-import androidx.ui.text.TextStyle
-import androidx.ui.text.length
-import androidx.ui.text.style.TextAlign
-import androidx.ui.text.style.TextOverflow
-import androidx.ui.text.subSequence
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.InternalTextApi
+import androidx.compose.ui.text.Placeholder
+import androidx.compose.ui.text.TextDelegate
+import androidx.compose.ui.text.TextLayoutResult
+import androidx.compose.ui.text.TextRange
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.length
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.text.subSequence
import androidx.ui.unit.Density
import androidx.ui.util.fastForEach
import kotlin.math.floor
diff --git a/ui/ui-text/src/commonMain/kotlin/androidx/compose/foundation/text/CoreTextField.kt b/ui/ui-text/src/commonMain/kotlin/androidx/compose/foundation/text/CoreTextField.kt
index 1312fb0..11766d1 100644
--- a/ui/ui-text/src/commonMain/kotlin/androidx/compose/foundation/text/CoreTextField.kt
+++ b/ui/ui-text/src/commonMain/kotlin/androidx/compose/foundation/text/CoreTextField.kt
@@ -50,12 +50,12 @@
import androidx.ui.core.semantics.semantics
import androidx.ui.geometry.Offset
import androidx.ui.graphics.drawscope.drawCanvas
-import androidx.ui.input.EditProcessor
-import androidx.ui.input.TextFieldValue
-import androidx.ui.input.ImeAction
-import androidx.ui.input.KeyboardType
-import androidx.ui.input.NO_SESSION
-import androidx.ui.input.VisualTransformation
+import androidx.compose.ui.text.input.EditProcessor
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.text.input.NO_SESSION
+import androidx.compose.ui.text.input.VisualTransformation
import androidx.ui.semantics.onClick
import androidx.compose.foundation.text.selection.SelectionHandle
import androidx.compose.foundation.text.selection.TextFieldSelectionManager
@@ -66,24 +66,24 @@
import androidx.ui.semantics.setText
import androidx.ui.semantics.text
import androidx.ui.semantics.textSelectionRange
-import androidx.ui.text.AnnotatedString
-import androidx.ui.text.InternalTextApi
-import androidx.ui.text.SoftwareKeyboardController
-import androidx.ui.text.TextDelegate
-import androidx.ui.text.TextLayoutResult
-import androidx.ui.text.TextRange
-import androidx.ui.text.TextStyle
-import androidx.ui.text.constrain
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.InternalTextApi
+import androidx.compose.ui.text.SoftwareKeyboardController
+import androidx.compose.ui.text.TextDelegate
+import androidx.compose.ui.text.TextLayoutResult
+import androidx.compose.ui.text.TextRange
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.constrain
import kotlin.math.roundToInt
@Suppress("DEPRECATION")
@Composable
-@Deprecated("Use the Composable with androidx.ui.input.TextFieldValue instead.")
+@Deprecated("Use the Composable with androidx.compose.ui.text.input.TextFieldValue instead.")
@OptIn(InternalTextApi::class)
fun CoreTextField(
- value: androidx.ui.input.EditorValue,
+ value: androidx.compose.ui.text.input.EditorValue,
modifier: Modifier,
- onValueChange: (androidx.ui.input.EditorValue) -> Unit,
+ onValueChange: (androidx.compose.ui.text.input.EditorValue) -> Unit,
textStyle: TextStyle = TextStyle.Default,
keyboardType: KeyboardType = KeyboardType.Text,
imeAction: ImeAction = ImeAction.Unspecified,
@@ -108,7 +108,7 @@
val onValueChangeWrapper: (TextFieldValue) -> Unit = {
fullModel.value = it
onValueChange(
- androidx.ui.input.EditorValue(
+ androidx.compose.ui.text.input.EditorValue(
it.text,
it.selection,
it.composition
@@ -152,7 +152,7 @@
* [TextFieldValue] may result in a context reset and end up with input session restart. Such
* a scenario would cause glitches in the UI or text input experience for users.
*
- * @param value The [androidx.ui.input.TextFieldValue] to be shown in the [CoreTextField].
+ * @param value The [androidx.compose.ui.text.input.TextFieldValue] to be shown in the [CoreTextField].
* @param onValueChange Called when the input service updates the values in [TextFieldValue].
* @param modifier optional [Modifier] for this text field.
* @param textStyle Style configuration that applies at character level such as color, font etc.
diff --git a/ui/ui-text/src/commonMain/kotlin/androidx/compose/foundation/text/InlineTextContent.kt b/ui/ui-text/src/commonMain/kotlin/androidx/compose/foundation/text/InlineTextContent.kt
index fd64102..343f014 100644
--- a/ui/ui-text/src/commonMain/kotlin/androidx/compose/foundation/text/InlineTextContent.kt
+++ b/ui/ui-text/src/commonMain/kotlin/androidx/compose/foundation/text/InlineTextContent.kt
@@ -17,8 +17,8 @@
package androidx.compose.foundation.text
import androidx.compose.Composable
-import androidx.ui.text.AnnotatedString
-import androidx.ui.text.Placeholder
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.Placeholder
/** The annotation tag used by inline content. */
internal const val INLINE_CONTENT_TAG = "androidx.compose.foundation.text.inlineContent"
diff --git a/ui/ui-text/src/commonMain/kotlin/androidx/compose/foundation/text/TextFieldDelegate.kt b/ui/ui-text/src/commonMain/kotlin/androidx/compose/foundation/text/TextFieldDelegate.kt
index 5d744420..c5bf1e7 100644
--- a/ui/ui-text/src/commonMain/kotlin/androidx/compose/foundation/text/TextFieldDelegate.kt
+++ b/ui/ui-text/src/commonMain/kotlin/androidx/compose/foundation/text/TextFieldDelegate.kt
@@ -25,30 +25,30 @@
import androidx.ui.graphics.Canvas
import androidx.ui.graphics.Color
import androidx.ui.graphics.Paint
-import androidx.ui.input.EditOperation
-import androidx.ui.input.EditProcessor
-import androidx.ui.input.TextFieldValue
-import androidx.ui.input.FinishComposingTextEditOp
-import androidx.ui.input.INVALID_SESSION
-import androidx.ui.input.ImeAction
-import androidx.ui.input.InputSessionToken
-import androidx.ui.input.KeyboardType
-import androidx.ui.input.OffsetMap
-import androidx.ui.input.SetSelectionEditOp
-import androidx.ui.input.TextInputService
-import androidx.ui.input.TransformedText
-import androidx.ui.text.AnnotatedString
-import androidx.ui.text.InternalTextApi
-import androidx.ui.text.Paragraph
-import androidx.ui.text.ParagraphConstraints
-import androidx.ui.text.SpanStyle
-import androidx.ui.text.TextDelegate
-import androidx.ui.text.TextLayoutResult
-import androidx.ui.text.TextPainter
-import androidx.ui.text.TextRange
-import androidx.ui.text.TextStyle
-import androidx.ui.text.font.Font
-import androidx.ui.text.style.TextDecoration
+import androidx.compose.ui.text.input.EditOperation
+import androidx.compose.ui.text.input.EditProcessor
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.text.input.FinishComposingTextEditOp
+import androidx.compose.ui.text.input.INVALID_SESSION
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.InputSessionToken
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.text.input.OffsetMap
+import androidx.compose.ui.text.input.SetSelectionEditOp
+import androidx.compose.ui.text.input.TextInputService
+import androidx.compose.ui.text.input.TransformedText
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.InternalTextApi
+import androidx.compose.ui.text.Paragraph
+import androidx.compose.ui.text.ParagraphConstraints
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.TextDelegate
+import androidx.compose.ui.text.TextLayoutResult
+import androidx.compose.ui.text.TextPainter
+import androidx.compose.ui.text.TextRange
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.Font
+import androidx.compose.ui.text.style.TextDecoration
import androidx.ui.unit.Density
import kotlin.jvm.JvmStatic
import kotlin.math.ceil
diff --git a/ui/ui-text/src/commonMain/kotlin/androidx/compose/foundation/text/TextSemanticsProperties.kt b/ui/ui-text/src/commonMain/kotlin/androidx/compose/foundation/text/TextSemanticsProperties.kt
index 038a9d4..8a071d5 100644
--- a/ui/ui-text/src/commonMain/kotlin/androidx/compose/foundation/text/TextSemanticsProperties.kt
+++ b/ui/ui-text/src/commonMain/kotlin/androidx/compose/foundation/text/TextSemanticsProperties.kt
@@ -16,7 +16,7 @@
package androidx.compose.foundation.text
-import androidx.ui.input.ImeAction
+import androidx.compose.ui.text.input.ImeAction
import androidx.ui.semantics.SemanticsPropertyKey
import androidx.ui.semantics.SemanticsPropertyReceiver
diff --git a/ui/ui-text/src/commonMain/kotlin/androidx/compose/foundation/text/selection/MultiWidgetSelectionDelegate.kt b/ui/ui-text/src/commonMain/kotlin/androidx/compose/foundation/text/selection/MultiWidgetSelectionDelegate.kt
index e40fbc3..89102a4 100644
--- a/ui/ui-text/src/commonMain/kotlin/androidx/compose/foundation/text/selection/MultiWidgetSelectionDelegate.kt
+++ b/ui/ui-text/src/commonMain/kotlin/androidx/compose/foundation/text/selection/MultiWidgetSelectionDelegate.kt
@@ -21,9 +21,9 @@
import androidx.ui.core.selection.Selection
import androidx.ui.geometry.Offset
import androidx.ui.geometry.Rect
-import androidx.ui.text.AnnotatedString
-import androidx.ui.text.TextLayoutResult
-import androidx.ui.text.TextRange
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.TextLayoutResult
+import androidx.compose.ui.text.TextRange
import kotlin.math.max
internal class MultiWidgetSelectionDelegate(
diff --git a/ui/ui-text/src/commonMain/kotlin/androidx/compose/foundation/text/selection/TextFieldSelectionDelegate.kt b/ui/ui-text/src/commonMain/kotlin/androidx/compose/foundation/text/selection/TextFieldSelectionDelegate.kt
index 812d574..34dc847 100644
--- a/ui/ui-text/src/commonMain/kotlin/androidx/compose/foundation/text/selection/TextFieldSelectionDelegate.kt
+++ b/ui/ui-text/src/commonMain/kotlin/androidx/compose/foundation/text/selection/TextFieldSelectionDelegate.kt
@@ -16,8 +16,8 @@
package androidx.compose.foundation.text.selection
-import androidx.ui.text.TextLayoutResult
-import androidx.ui.text.TextRange
+import androidx.compose.ui.text.TextLayoutResult
+import androidx.compose.ui.text.TextRange
/**
* Return selection information for TextField.
diff --git a/ui/ui-text/src/commonMain/kotlin/androidx/compose/foundation/text/selection/TextFieldSelectionManager.kt b/ui/ui-text/src/commonMain/kotlin/androidx/compose/foundation/text/selection/TextFieldSelectionManager.kt
index 3cf0da9..54927d2 100644
--- a/ui/ui-text/src/commonMain/kotlin/androidx/compose/foundation/text/selection/TextFieldSelectionManager.kt
+++ b/ui/ui-text/src/commonMain/kotlin/androidx/compose/foundation/text/selection/TextFieldSelectionManager.kt
@@ -31,16 +31,16 @@
import androidx.ui.core.texttoolbar.TextToolbarStatus
import androidx.ui.geometry.Offset
import androidx.ui.geometry.Rect
-import androidx.ui.input.OffsetMap
-import androidx.ui.input.TextFieldValue
-import androidx.ui.input.getSelectedText
-import androidx.ui.input.getTextAfterSelection
-import androidx.ui.input.getTextBeforeSelection
-import androidx.ui.text.AnnotatedString
-import androidx.ui.text.InternalTextApi
+import androidx.compose.ui.text.input.OffsetMap
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.text.input.getSelectedText
+import androidx.compose.ui.text.input.getTextAfterSelection
+import androidx.compose.ui.text.input.getTextBeforeSelection
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.InternalTextApi
import androidx.compose.foundation.text.TextFieldState
-import androidx.ui.text.TextRange
-import androidx.ui.text.style.ResolvedTextDirection
+import androidx.compose.ui.text.TextRange
+import androidx.compose.ui.text.style.ResolvedTextDirection
import androidx.ui.unit.dp
import kotlin.math.max
import kotlin.math.min
diff --git a/ui/ui-text/src/commonMain/kotlin/androidx/compose/foundation/text/selection/TextSelectionDelegate.kt b/ui/ui-text/src/commonMain/kotlin/androidx/compose/foundation/text/selection/TextSelectionDelegate.kt
index ccf4e38..1baaef9 100644
--- a/ui/ui-text/src/commonMain/kotlin/androidx/compose/foundation/text/selection/TextSelectionDelegate.kt
+++ b/ui/ui-text/src/commonMain/kotlin/androidx/compose/foundation/text/selection/TextSelectionDelegate.kt
@@ -17,8 +17,8 @@
package androidx.compose.foundation.text.selection
import androidx.ui.geometry.Rect
-import androidx.ui.text.TextLayoutResult
-import androidx.ui.text.TextRange
+import androidx.compose.ui.text.TextLayoutResult
+import androidx.compose.ui.text.TextRange
import androidx.ui.geometry.Offset
import kotlin.math.max
diff --git a/ui/ui-text/src/test/kotlin/androidx/compose/foundation/text/TextFieldDelegateTest.kt b/ui/ui-text/src/test/kotlin/androidx/compose/foundation/text/TextFieldDelegateTest.kt
index 29f16b3..e190488 100644
--- a/ui/ui-text/src/test/kotlin/androidx/compose/foundation/text/TextFieldDelegateTest.kt
+++ b/ui/ui-text/src/test/kotlin/androidx/compose/foundation/text/TextFieldDelegateTest.kt
@@ -23,27 +23,27 @@
import androidx.ui.geometry.Rect
import androidx.ui.graphics.Canvas
import androidx.ui.graphics.Color
-import androidx.ui.input.CommitTextEditOp
-import androidx.ui.input.EditOperation
-import androidx.ui.input.EditProcessor
-import androidx.ui.input.TextFieldValue
-import androidx.ui.input.FinishComposingTextEditOp
-import androidx.ui.input.ImeAction
-import androidx.ui.input.KeyboardType
-import androidx.ui.input.OffsetMap
-import androidx.ui.input.SetSelectionEditOp
-import androidx.ui.input.TextInputService
-import androidx.ui.input.TransformedText
-import androidx.ui.input.VisualTransformation
-import androidx.ui.text.AnnotatedString
-import androidx.ui.text.InternalTextApi
-import androidx.ui.text.MultiParagraphIntrinsics
-import androidx.ui.text.SpanStyle
-import androidx.ui.text.TextDelegate
-import androidx.ui.text.TextLayoutResult
-import androidx.ui.text.TextRange
-import androidx.ui.text.TextStyle
-import androidx.ui.text.style.TextDecoration
+import androidx.compose.ui.text.input.CommitTextEditOp
+import androidx.compose.ui.text.input.EditOperation
+import androidx.compose.ui.text.input.EditProcessor
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.text.input.FinishComposingTextEditOp
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.text.input.OffsetMap
+import androidx.compose.ui.text.input.SetSelectionEditOp
+import androidx.compose.ui.text.input.TextInputService
+import androidx.compose.ui.text.input.TransformedText
+import androidx.compose.ui.text.input.VisualTransformation
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.InternalTextApi
+import androidx.compose.ui.text.MultiParagraphIntrinsics
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.TextDelegate
+import androidx.compose.ui.text.TextLayoutResult
+import androidx.compose.ui.text.TextRange
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.style.TextDecoration
import androidx.ui.unit.Density
import androidx.ui.unit.IntSize
import com.google.common.truth.Truth.assertThat
diff --git a/ui/ui-text/src/test/kotlin/androidx/compose/foundation/text/selection/TextFieldSelectionManagerTest.kt b/ui/ui-text/src/test/kotlin/androidx/compose/foundation/text/selection/TextFieldSelectionManagerTest.kt
index 8655c01..372dc4c 100644
--- a/ui/ui-text/src/test/kotlin/androidx/compose/foundation/text/selection/TextFieldSelectionManagerTest.kt
+++ b/ui/ui-text/src/test/kotlin/androidx/compose/foundation/text/selection/TextFieldSelectionManagerTest.kt
@@ -25,15 +25,15 @@
import androidx.ui.core.texttoolbar.TextToolbar
import androidx.ui.geometry.Rect
import androidx.ui.geometry.Offset
-import androidx.ui.input.OffsetMap
-import androidx.ui.input.TextFieldValue
-import androidx.ui.text.AnnotatedString
+import androidx.compose.ui.text.input.OffsetMap
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.text.AnnotatedString
import androidx.compose.foundation.text.TextFieldState
-import androidx.ui.text.TextLayoutInput
-import androidx.ui.text.TextRange
-import androidx.ui.text.TextStyle
-import androidx.ui.text.style.ResolvedTextDirection
-import androidx.ui.text.style.TextOverflow
+import androidx.compose.ui.text.TextLayoutInput
+import androidx.compose.ui.text.TextRange
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.style.ResolvedTextDirection
+import androidx.compose.ui.text.style.TextOverflow
import androidx.ui.unit.Density
import com.google.common.truth.Truth.assertThat
import com.nhaarman.mockitokotlin2.any
diff --git a/ui/ui-tooling/src/androidTest/java/androidx/ui/tooling/inspector/ParameterFactoryTest.kt b/ui/ui-tooling/src/androidTest/java/androidx/ui/tooling/inspector/ParameterFactoryTest.kt
index 0c750e1..211f482a 100644
--- a/ui/ui-tooling/src/androidTest/java/androidx/ui/tooling/inspector/ParameterFactoryTest.kt
+++ b/ui/ui-tooling/src/androidTest/java/androidx/ui/tooling/inspector/ParameterFactoryTest.kt
@@ -32,22 +32,22 @@
import androidx.ui.graphics.SolidColor
import androidx.ui.graphics.colorspace.ColorModel
import androidx.ui.graphics.toArgb
-import androidx.ui.intl.Locale
-import androidx.ui.intl.LocaleList
+import androidx.compose.ui.text.intl.Locale
+import androidx.compose.ui.text.intl.LocaleList
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.CrossAxisAlignment
import androidx.compose.foundation.layout.InnerPadding
-import androidx.ui.text.AnnotatedString
-import androidx.ui.text.TextStyle
-import androidx.ui.text.font.FontFamily
-import androidx.ui.text.font.FontListFontFamily
-import androidx.ui.text.font.FontStyle
-import androidx.ui.text.font.FontWeight
-import androidx.ui.text.font.ResourceFont
-import androidx.ui.text.style.BaselineShift
-import androidx.ui.text.style.TextDecoration
-import androidx.ui.text.style.TextGeometricTransform
-import androidx.ui.text.style.TextIndent
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontListFontFamily
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.font.ResourceFont
+import androidx.compose.ui.text.style.BaselineShift
+import androidx.compose.ui.text.style.TextDecoration
+import androidx.compose.ui.text.style.TextGeometricTransform
+import androidx.compose.ui.text.style.TextIndent
import androidx.ui.unit.Density
import androidx.ui.unit.Dp
import androidx.ui.unit.TextUnit
diff --git a/ui/ui-tooling/src/main/java/androidx/ui/tooling/inspector/ParameterFactory.kt b/ui/ui-tooling/src/main/java/androidx/ui/tooling/inspector/ParameterFactory.kt
index 6ee0daa..2061da2 100644
--- a/ui/ui-tooling/src/main/java/androidx/ui/tooling/inspector/ParameterFactory.kt
+++ b/ui/ui-tooling/src/main/java/androidx/ui/tooling/inspector/ParameterFactory.kt
@@ -29,22 +29,22 @@
import androidx.ui.graphics.Shape
import androidx.ui.graphics.SolidColor
import androidx.ui.graphics.toArgb
-import androidx.ui.intl.Locale
-import androidx.ui.intl.LocaleList
+import androidx.compose.ui.text.intl.Locale
+import androidx.compose.ui.text.intl.LocaleList
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.CrossAxisAlignment
import androidx.compose.foundation.layout.InnerPadding
-import androidx.ui.text.AnnotatedString
-import androidx.ui.text.TextStyle
-import androidx.ui.text.font.FontFamily
-import androidx.ui.text.font.FontListFontFamily
-import androidx.ui.text.font.FontStyle
-import androidx.ui.text.font.FontWeight
-import androidx.ui.text.font.ResourceFont
-import androidx.ui.text.style.BaselineShift
-import androidx.ui.text.style.TextDecoration
-import androidx.ui.text.style.TextGeometricTransform
-import androidx.ui.text.style.TextIndent
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontListFontFamily
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.font.ResourceFont
+import androidx.compose.ui.text.style.BaselineShift
+import androidx.compose.ui.text.style.TextDecoration
+import androidx.compose.ui.text.style.TextGeometricTransform
+import androidx.compose.ui.text.style.TextIndent
import androidx.ui.tooling.inspector.ParameterType.DimensionDp
import androidx.ui.unit.Density
import androidx.ui.unit.Dp
diff --git a/ui/ui-tooling/src/main/java/androidx/ui/tooling/preview/LayoutlibFontResourceLoader.kt b/ui/ui-tooling/src/main/java/androidx/ui/tooling/preview/LayoutlibFontResourceLoader.kt
index f2172af..d4397b5 100644
--- a/ui/ui-tooling/src/main/java/androidx/ui/tooling/preview/LayoutlibFontResourceLoader.kt
+++ b/ui/ui-tooling/src/main/java/androidx/ui/tooling/preview/LayoutlibFontResourceLoader.kt
@@ -20,9 +20,8 @@
import android.graphics.Typeface
import android.os.Build
import androidx.annotation.RequiresApi
-import androidx.ui.text.font.Font
-import androidx.ui.text.font.font
-import androidx.ui.text.font.ResourceFont
+import androidx.compose.ui.text.font.Font
+import androidx.compose.ui.text.font.ResourceFont
/**
* Layoutlib implementation for [Font.ResourceLoader]