Deprecate AspectRatio composable and use modifier instead.
Test: gradlew buildOnServer
Change-Id: I3655e4b3c8ba0501765786083e2a1cbe6dbdbe73
diff --git a/ui/ui-foundation/integration-tests/samples/src/main/java/androidx/ui/foundation/samples/TableBordersSamples.kt b/ui/ui-foundation/integration-tests/samples/src/main/java/androidx/ui/foundation/samples/TableBordersSamples.kt
index 15a99b7..c5341e1 100644
--- a/ui/ui-foundation/integration-tests/samples/src/main/java/androidx/ui/foundation/samples/TableBordersSamples.kt
+++ b/ui/ui-foundation/integration-tests/samples/src/main/java/androidx/ui/foundation/samples/TableBordersSamples.kt
@@ -48,9 +48,7 @@
tableRow {
repeat(8) {
Padding(2.dp) {
- AspectRatio(aspectRatio = 1f) {
- ColoredRect(color = Color.Magenta)
- }
+ ColoredRect(color = Color.Magenta, modifier = AspectRatio(1f))
}
}
}
diff --git a/ui/ui-layout/api/0.1.0-dev01.txt b/ui/ui-layout/api/0.1.0-dev01.txt
index 28e577c..2d82161 100644
--- a/ui/ui-layout/api/0.1.0-dev01.txt
+++ b/ui/ui-layout/api/0.1.0-dev01.txt
@@ -38,7 +38,7 @@
public final class AspectRatioKt {
ctor public AspectRatioKt();
method public static androidx.ui.core.LayoutModifier AspectRatio(float value);
- method public static void AspectRatio(float aspectRatio, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+ method @Deprecated public static void AspectRatio(float aspectRatio, kotlin.jvm.functions.Function0<kotlin.Unit> children);
}
public final class ConstrainedBoxKt {
diff --git a/ui/ui-layout/api/current.txt b/ui/ui-layout/api/current.txt
index 28e577c..2d82161 100644
--- a/ui/ui-layout/api/current.txt
+++ b/ui/ui-layout/api/current.txt
@@ -38,7 +38,7 @@
public final class AspectRatioKt {
ctor public AspectRatioKt();
method public static androidx.ui.core.LayoutModifier AspectRatio(float value);
- method public static void AspectRatio(float aspectRatio, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+ method @Deprecated public static void AspectRatio(float aspectRatio, kotlin.jvm.functions.Function0<kotlin.Unit> children);
}
public final class ConstrainedBoxKt {
diff --git a/ui/ui-layout/api/public_plus_experimental_0.1.0-dev01.txt b/ui/ui-layout/api/public_plus_experimental_0.1.0-dev01.txt
index 28e577c..2d82161 100644
--- a/ui/ui-layout/api/public_plus_experimental_0.1.0-dev01.txt
+++ b/ui/ui-layout/api/public_plus_experimental_0.1.0-dev01.txt
@@ -38,7 +38,7 @@
public final class AspectRatioKt {
ctor public AspectRatioKt();
method public static androidx.ui.core.LayoutModifier AspectRatio(float value);
- method public static void AspectRatio(float aspectRatio, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+ method @Deprecated public static void AspectRatio(float aspectRatio, kotlin.jvm.functions.Function0<kotlin.Unit> children);
}
public final class ConstrainedBoxKt {
diff --git a/ui/ui-layout/api/public_plus_experimental_current.txt b/ui/ui-layout/api/public_plus_experimental_current.txt
index 28e577c..2d82161 100644
--- a/ui/ui-layout/api/public_plus_experimental_current.txt
+++ b/ui/ui-layout/api/public_plus_experimental_current.txt
@@ -38,7 +38,7 @@
public final class AspectRatioKt {
ctor public AspectRatioKt();
method public static androidx.ui.core.LayoutModifier AspectRatio(float value);
- method public static void AspectRatio(float aspectRatio, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+ method @Deprecated public static void AspectRatio(float aspectRatio, kotlin.jvm.functions.Function0<kotlin.Unit> children);
}
public final class ConstrainedBoxKt {
diff --git a/ui/ui-layout/api/restricted_0.1.0-dev01.txt b/ui/ui-layout/api/restricted_0.1.0-dev01.txt
index 28e577c..2d82161 100644
--- a/ui/ui-layout/api/restricted_0.1.0-dev01.txt
+++ b/ui/ui-layout/api/restricted_0.1.0-dev01.txt
@@ -38,7 +38,7 @@
public final class AspectRatioKt {
ctor public AspectRatioKt();
method public static androidx.ui.core.LayoutModifier AspectRatio(float value);
- method public static void AspectRatio(float aspectRatio, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+ method @Deprecated public static void AspectRatio(float aspectRatio, kotlin.jvm.functions.Function0<kotlin.Unit> children);
}
public final class ConstrainedBoxKt {
diff --git a/ui/ui-layout/api/restricted_current.txt b/ui/ui-layout/api/restricted_current.txt
index 28e577c..2d82161 100644
--- a/ui/ui-layout/api/restricted_current.txt
+++ b/ui/ui-layout/api/restricted_current.txt
@@ -38,7 +38,7 @@
public final class AspectRatioKt {
ctor public AspectRatioKt();
method public static androidx.ui.core.LayoutModifier AspectRatio(float value);
- method public static void AspectRatio(float aspectRatio, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+ method @Deprecated public static void AspectRatio(float aspectRatio, kotlin.jvm.functions.Function0<kotlin.Unit> children);
}
public final class ConstrainedBoxKt {
diff --git a/ui/ui-layout/integration-tests/layout-demos/src/main/java/androidx/ui/layout/demos/ComplexLayoutDemos.kt b/ui/ui-layout/integration-tests/layout-demos/src/main/java/androidx/ui/layout/demos/ComplexLayoutDemos.kt
index 05e04c4..40a3b03 100644
--- a/ui/ui-layout/integration-tests/layout-demos/src/main/java/androidx/ui/layout/demos/ComplexLayoutDemos.kt
+++ b/ui/ui-layout/integration-tests/layout-demos/src/main/java/androidx/ui/layout/demos/ComplexLayoutDemos.kt
@@ -54,7 +54,6 @@
import androidx.ui.core.VerticalAlignmentLine
import androidx.ui.core.sp
import androidx.ui.layout.AlignmentLineOffset
-import androidx.ui.layout.AspectRatio
import androidx.ui.layout.Container
import androidx.ui.layout.CrossAxisAlignment
import androidx.ui.layout.EdgeInsets
@@ -398,7 +397,7 @@
Row(crossAxisAlignment = CrossAxisAlignment.AlignmentLine(FirstBaseline)) {
Text("First text")
Column {
- SizedRectangle(Color.Blue, width = 10.dp, height = 50.dp)
+ SizedRectangle(color = Color.Blue, width = 10.dp, height = 50.dp)
Padding(30.dp) {
Text("Second text", style = TextStyle(fontSize = 45.sp))
}
diff --git a/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/IntrinsicSamples.kt b/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/IntrinsicSamples.kt
index e5dfa8e..e960516 100644
--- a/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/IntrinsicSamples.kt
+++ b/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/IntrinsicSamples.kt
@@ -153,13 +153,13 @@
MaxIntrinsicHeight {
FlexRow(crossAxisAlignment = CrossAxisAlignment.Stretch) {
expanded(flex = 1f) {
- AspectRatio(2f) { DrawShape(RectangleShape, Color.Gray) }
+ Container(AspectRatio(2f)) { DrawShape(RectangleShape, Color.Gray) }
}
inflexible {
Container(width = 1.dp) { DrawShape(RectangleShape, Color.Black) }
}
expanded(flex = 1f) {
- AspectRatio(1f) { DrawShape(RectangleShape, Color.Blue) }
+ Container(AspectRatio(1f)) { DrawShape(RectangleShape, Color.Blue) }
}
}
}
diff --git a/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/StackSamples.kt b/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/StackSamples.kt
index 6c80829..5f256d5 100644
--- a/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/StackSamples.kt
+++ b/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/StackSamples.kt
@@ -23,6 +23,7 @@
import androidx.ui.core.Dp
import androidx.ui.core.Draw
import androidx.ui.core.Layout
+import androidx.ui.core.Modifier
import androidx.ui.core.dp
import androidx.ui.core.toRect
import androidx.ui.graphics.Color
@@ -34,8 +35,13 @@
* not specified.
*/
@Composable
-fun SizedRectangle(color: Color, width: Dp? = null, height: Dp? = null) {
- Layout(children = { DrawRectangle(color = color) }) { _, constraints ->
+fun SizedRectangle(
+ modifier: Modifier = Modifier.None,
+ color: Color,
+ width: Dp? = null,
+ height: Dp? = null
+) {
+ Layout(children = { DrawRectangle(color = color) }, modifier = modifier) { _, constraints ->
val widthPx = width?.toIntPx() ?: constraints.maxWidth
val heightPx = height?.toIntPx() ?: constraints.maxHeight
layout(widthPx, heightPx) {}
diff --git a/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/TableSamples.kt b/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/TableSamples.kt
index 80faba0..5b10ecc 100644
--- a/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/TableSamples.kt
+++ b/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/TableSamples.kt
@@ -105,7 +105,5 @@
@Composable
private fun SizedSquare(color: Color, size: Dp? = null) {
- AspectRatio(aspectRatio = 1f) {
- SizedRectangle(color, width = size)
- }
+ SizedRectangle(AspectRatio(1f), color = color, width = size)
}
diff --git a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/AbsolutePaddingModifierTest.kt b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/AbsolutePaddingModifierTest.kt
index a9f2bc0..46682d5 100644
--- a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/AbsolutePaddingModifierTest.kt
+++ b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/AbsolutePaddingModifierTest.kt
@@ -140,7 +140,7 @@
var error: Throwable? = null
testIntrinsics(@Composable {
TestBox(modifier = padding(padding)) {
- AspectRatio(2f) { }
+ Container(AspectRatio(2f)) { }
}
}) { minIntrinsicWidth, minIntrinsicHeight, maxIntrinsicWidth, maxIntrinsicHeight ->
// Padding is applied on both sides of an axis
diff --git a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/AlignTest.kt b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/AlignTest.kt
index 8e33064..bed127f 100644
--- a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/AlignTest.kt
+++ b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/AlignTest.kt
@@ -166,7 +166,7 @@
fun testAlign_hasCorrectIntrinsicMeasurements() = withDensity(density) {
testIntrinsics(@Composable {
Align(alignment = Alignment.TopLeft) {
- AspectRatio(2f) { }
+ Container(AspectRatio(2f)) { }
}
}) { minIntrinsicWidth, minIntrinsicHeight, maxIntrinsicWidth, maxIntrinsicHeight ->
// Min width.
diff --git a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/AspectRatioTest.kt b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/AspectRatioTest.kt
index f967878..b8a8477 100644
--- a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/AspectRatioTest.kt
+++ b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/AspectRatioTest.kt
@@ -14,6 +14,9 @@
* limitations under the License.
*/
+//AspectRatio composable is deprecated
+@file:Suppress("DEPRECATION")
+
package androidx.ui.layout.test
import androidx.compose.Children
diff --git a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/ConstrainedBoxTest.kt b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/ConstrainedBoxTest.kt
index 21569c4..31db70c 100644
--- a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/ConstrainedBoxTest.kt
+++ b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/ConstrainedBoxTest.kt
@@ -142,7 +142,7 @@
fun testConstrainedBox_hasCorrectIntrinsicMeasurements() = withDensity(density) {
testIntrinsics(@Composable {
ConstrainedBox(constraints = DpConstraints(10.dp, 20.dp, 30.dp, 40.dp)) {
- AspectRatio(1f) { }
+ Container(AspectRatio(1f)) { }
}
}) { minIntrinsicWidth, minIntrinsicHeight, maxIntrinsicWidth, maxIntrinsicHeight ->
// Min width.
diff --git a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/FlexTest.kt b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/FlexTest.kt
index 5e99116..9a00db0 100644
--- a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/FlexTest.kt
+++ b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/FlexTest.kt
@@ -28,7 +28,6 @@
import androidx.ui.core.round
import androidx.ui.core.toPx
import androidx.ui.core.withDensity
-import androidx.ui.layout.AspectRatio
import androidx.ui.layout.ConstrainedBox
import androidx.ui.layout.CrossAxisAlignment
import androidx.ui.layout.DpConstraints
@@ -43,6 +42,7 @@
import androidx.ui.core.VerticalAlignmentLine
import androidx.ui.core.min
import androidx.ui.layout.Align
+import androidx.ui.layout.AspectRatio
import androidx.ui.layout.Center
import androidx.ui.layout.Column
import androidx.ui.layout.Container
@@ -1839,12 +1839,12 @@
fun testRow_hasCorrectIntrinsicMeasurements() = withDensity(density) {
testIntrinsics(@Composable {
Row {
- AspectRatio(2f) { }
+ Container(AspectRatio(2f)) { }
ConstrainedBox(DpConstraints.tightConstraints(50.dp, 40.dp)) { }
}
}, @Composable {
Row(mainAxisSize = LayoutSize.Expand) {
- AspectRatio(2f) { }
+ Container(AspectRatio(2f)) { }
ConstrainedBox(DpConstraints.tightConstraints(50.dp, 40.dp)) { }
}
}, @Composable {
@@ -1853,7 +1853,7 @@
mainAxisAlignment = MainAxisAlignment.Start,
crossAxisAlignment = CrossAxisAlignment.Start
) {
- AspectRatio(2f) { }
+ Container(AspectRatio(2f)) { }
ConstrainedBox(DpConstraints.tightConstraints(50.dp, 40.dp)) { }
}
}, @Composable {
@@ -1862,7 +1862,7 @@
mainAxisAlignment = MainAxisAlignment.Center,
crossAxisAlignment = CrossAxisAlignment.Center
) {
- AspectRatio(2f) { }
+ Container(AspectRatio(2f)) { }
ConstrainedBox(DpConstraints.tightConstraints(50.dp, 40.dp)) { }
}
}, @Composable {
@@ -1871,7 +1871,7 @@
mainAxisAlignment = MainAxisAlignment.End,
crossAxisAlignment = CrossAxisAlignment.End
) {
- AspectRatio(2f) { }
+ Container(AspectRatio(2f)) { }
ConstrainedBox(DpConstraints.tightConstraints(50.dp, 40.dp)) { }
}
}, @Composable {
@@ -1880,7 +1880,7 @@
mainAxisAlignment = MainAxisAlignment.SpaceAround,
crossAxisAlignment = CrossAxisAlignment.Stretch
) {
- AspectRatio(2f) { }
+ Container(AspectRatio(2f)) { }
ConstrainedBox(DpConstraints.tightConstraints(50.dp, 40.dp)) { }
}
}, @Composable {
@@ -1888,7 +1888,7 @@
mainAxisSize = LayoutSize.Expand,
mainAxisAlignment = MainAxisAlignment.SpaceBetween
) {
- AspectRatio(2f) { }
+ Container(AspectRatio(2f)) { }
ConstrainedBox(DpConstraints.tightConstraints(50.dp, 40.dp)) { }
}
}, @Composable {
@@ -1896,7 +1896,7 @@
mainAxisSize = LayoutSize.Expand,
mainAxisAlignment = MainAxisAlignment.SpaceEvenly
) {
- AspectRatio(2f) { }
+ Container(AspectRatio(2f)) { }
ConstrainedBox(DpConstraints.tightConstraints(50.dp, 40.dp)) { }
}
}) { minIntrinsicWidth, minIntrinsicHeight, maxIntrinsicWidth, maxIntrinsicHeight ->
@@ -1923,12 +1923,12 @@
fun testColumn_hasCorrectIntrinsicMeasurements() = withDensity(density) {
testIntrinsics(@Composable {
Column {
- AspectRatio(2f) { }
+ Container(AspectRatio(2f)) { }
ConstrainedBox(DpConstraints.tightConstraints(50.dp, 40.dp)) { }
}
}, @Composable {
Column(mainAxisSize = LayoutSize.Expand) {
- AspectRatio(2f) { }
+ Container(AspectRatio(2f)) { }
ConstrainedBox(DpConstraints.tightConstraints(50.dp, 40.dp)) { }
}
}, @Composable {
@@ -1937,7 +1937,7 @@
mainAxisAlignment = MainAxisAlignment.Start,
crossAxisAlignment = CrossAxisAlignment.Start
) {
- AspectRatio(2f) { }
+ Container(AspectRatio(2f)) { }
ConstrainedBox(DpConstraints.tightConstraints(50.dp, 40.dp)) { }
}
}, @Composable {
@@ -1946,7 +1946,7 @@
mainAxisAlignment = MainAxisAlignment.Center,
crossAxisAlignment = CrossAxisAlignment.Center
) {
- AspectRatio(2f) { }
+ Container(AspectRatio(2f)) { }
ConstrainedBox(DpConstraints.tightConstraints(50.dp, 40.dp)) { }
}
}, @Composable {
@@ -1955,7 +1955,7 @@
mainAxisAlignment = MainAxisAlignment.End,
crossAxisAlignment = CrossAxisAlignment.End
) {
- AspectRatio(2f) { }
+ Container(AspectRatio(2f)) { }
ConstrainedBox(DpConstraints.tightConstraints(50.dp, 40.dp)) { }
}
}, @Composable {
@@ -1964,7 +1964,7 @@
mainAxisAlignment = MainAxisAlignment.SpaceAround,
crossAxisAlignment = CrossAxisAlignment.Stretch
) {
- AspectRatio(2f) { }
+ Container(AspectRatio(2f)) { }
ConstrainedBox(DpConstraints.tightConstraints(50.dp, 40.dp)) { }
}
}, @Composable {
@@ -1972,7 +1972,7 @@
mainAxisSize = LayoutSize.Expand,
mainAxisAlignment = MainAxisAlignment.SpaceBetween
) {
- AspectRatio(2f) { }
+ Container(AspectRatio(2f)) { }
ConstrainedBox(DpConstraints.tightConstraints(50.dp, 40.dp)) { }
}
}, @Composable {
@@ -1980,7 +1980,7 @@
mainAxisSize = LayoutSize.Expand,
mainAxisAlignment = MainAxisAlignment.SpaceEvenly
) {
- AspectRatio(2f) { }
+ Container(AspectRatio(2f)) { }
ConstrainedBox(DpConstraints.tightConstraints(50.dp, 40.dp)) { }
}
}) { minIntrinsicWidth, minIntrinsicHeight, maxIntrinsicWidth, maxIntrinsicHeight ->
@@ -2014,7 +2014,7 @@
ConstrainedBox(DpConstraints.tightConstraints(30.dp, 40.dp)) { }
}
expanded(flex = 2f) {
- AspectRatio(2f) { }
+ Container(AspectRatio(2f)) { }
}
inflexible {
ConstrainedBox(DpConstraints.tightConstraints(20.dp, 30.dp)) { }
@@ -2029,7 +2029,7 @@
ConstrainedBox(DpConstraints.tightConstraints(30.dp, 40.dp)) { }
}
expanded(flex = 2f) {
- AspectRatio(2f) { }
+ Container(AspectRatio(2f)) { }
}
inflexible {
ConstrainedBox(DpConstraints.tightConstraints(20.dp, 30.dp)) { }
@@ -2047,7 +2047,7 @@
ConstrainedBox(DpConstraints.tightConstraints(30.dp, 40.dp)) { }
}
expanded(flex = 2f) {
- AspectRatio(2f) { }
+ Container(AspectRatio(2f)) { }
}
inflexible {
ConstrainedBox(DpConstraints.tightConstraints(20.dp, 30.dp)) { }
@@ -2065,7 +2065,7 @@
ConstrainedBox(DpConstraints.tightConstraints(30.dp, 40.dp)) { }
}
expanded(flex = 2f) {
- AspectRatio(2f) { }
+ Container(AspectRatio(2f)) { }
}
inflexible {
ConstrainedBox(DpConstraints.tightConstraints(20.dp, 30.dp)) { }
@@ -2083,7 +2083,7 @@
ConstrainedBox(DpConstraints.tightConstraints(30.dp, 40.dp)) { }
}
expanded(flex = 2f) {
- AspectRatio(2f) { }
+ Container(AspectRatio(2f)) { }
}
inflexible {
ConstrainedBox(DpConstraints.tightConstraints(20.dp, 30.dp)) { }
@@ -2101,7 +2101,7 @@
ConstrainedBox(DpConstraints.tightConstraints(30.dp, 40.dp)) { }
}
expanded(flex = 2f) {
- AspectRatio(2f) { }
+ Container(AspectRatio(2f)) { }
}
inflexible {
ConstrainedBox(DpConstraints.tightConstraints(20.dp, 30.dp)) { }
@@ -2116,7 +2116,7 @@
ConstrainedBox(DpConstraints.tightConstraints(30.dp, 40.dp)) { }
}
expanded(flex = 2f) {
- AspectRatio(2f) { }
+ Container(AspectRatio(2f)) { }
}
inflexible {
ConstrainedBox(DpConstraints.tightConstraints(20.dp, 30.dp)) { }
@@ -2131,7 +2131,7 @@
ConstrainedBox(DpConstraints.tightConstraints(30.dp, 40.dp)) { }
}
expanded(flex = 2f) {
- AspectRatio(2f) { }
+ Container(AspectRatio(2f)) { }
}
inflexible {
ConstrainedBox(DpConstraints.tightConstraints(20.dp, 30.dp)) { }
@@ -2196,7 +2196,7 @@
ConstrainedBox(DpConstraints.tightConstraints(40.dp, 30.dp)) { }
}
expanded(flex = 2f) {
- AspectRatio(0.5f) { }
+ Container(AspectRatio(0.5f)) { }
}
inflexible {
ConstrainedBox(DpConstraints.tightConstraints(30.dp, 20.dp)) { }
@@ -2211,7 +2211,7 @@
ConstrainedBox(DpConstraints.tightConstraints(40.dp, 30.dp)) { }
}
expanded(flex = 2f) {
- AspectRatio(0.5f) { }
+ Container(AspectRatio(0.5f)) { }
}
inflexible {
ConstrainedBox(DpConstraints.tightConstraints(30.dp, 20.dp)) { }
@@ -2229,7 +2229,7 @@
ConstrainedBox(DpConstraints.tightConstraints(40.dp, 30.dp)) { }
}
expanded(flex = 2f) {
- AspectRatio(0.5f) { }
+ Container(AspectRatio(0.5f)) { }
}
inflexible {
ConstrainedBox(DpConstraints.tightConstraints(30.dp, 20.dp)) { }
@@ -2247,7 +2247,7 @@
ConstrainedBox(DpConstraints.tightConstraints(40.dp, 30.dp)) { }
}
expanded(flex = 2f) {
- AspectRatio(0.5f) { }
+ Container(AspectRatio(0.5f)) { }
}
inflexible {
ConstrainedBox(DpConstraints.tightConstraints(30.dp, 20.dp)) { }
@@ -2265,7 +2265,7 @@
ConstrainedBox(DpConstraints.tightConstraints(40.dp, 30.dp)) { }
}
expanded(flex = 2f) {
- AspectRatio(0.5f) { }
+ Container(AspectRatio(0.5f)) { }
}
inflexible {
ConstrainedBox(DpConstraints.tightConstraints(30.dp, 20.dp)) { }
@@ -2283,7 +2283,7 @@
ConstrainedBox(DpConstraints.tightConstraints(40.dp, 30.dp)) { }
}
expanded(flex = 2f) {
- AspectRatio(0.5f) { }
+ Container(AspectRatio(0.5f)) { }
}
inflexible {
ConstrainedBox(DpConstraints.tightConstraints(30.dp, 20.dp)) { }
@@ -2298,7 +2298,7 @@
ConstrainedBox(DpConstraints.tightConstraints(40.dp, 30.dp)) { }
}
expanded(flex = 2f) {
- AspectRatio(0.5f) { }
+ Container(AspectRatio(0.5f)) { }
}
inflexible {
ConstrainedBox(DpConstraints.tightConstraints(30.dp, 20.dp)) { }
@@ -2313,7 +2313,7 @@
ConstrainedBox(DpConstraints.tightConstraints(40.dp, 30.dp)) { }
}
expanded(flex = 2f) {
- AspectRatio(0.5f) { }
+ Container(AspectRatio(0.5f)) { }
}
inflexible {
ConstrainedBox(DpConstraints.tightConstraints(30.dp, 20.dp)) { }
diff --git a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/PaddingTest.kt b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/PaddingTest.kt
index 42652ca..5ff4ad9 100644
--- a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/PaddingTest.kt
+++ b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/PaddingTest.kt
@@ -283,7 +283,7 @@
testIntrinsics(@Composable {
Padding(padding = padding) {
- AspectRatio(2f) { }
+ Container(AspectRatio(2f)) { }
}
}) { minIntrinsicWidth, minIntrinsicHeight, maxIntrinsicWidth, maxIntrinsicHeight ->
// Padding is applied on both sides of an axis
diff --git a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/StackTest.kt b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/StackTest.kt
index 86b56a7..702f132 100644
--- a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/StackTest.kt
+++ b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/StackTest.kt
@@ -29,7 +29,6 @@
import androidx.ui.core.px
import androidx.ui.core.withDensity
import androidx.ui.layout.Align
-import androidx.ui.layout.AspectRatio
import androidx.ui.layout.ConstrainedBox
import androidx.ui.layout.Container
import androidx.ui.layout.DpConstraints
@@ -37,6 +36,7 @@
import androidx.compose.Composable
import androidx.compose.composer
import androidx.ui.core.Alignment
+import androidx.ui.layout.AspectRatio
import org.junit.Assert.assertEquals
import org.junit.Test
import org.junit.runner.RunWith
@@ -408,7 +408,7 @@
testIntrinsics(@Composable {
Stack {
aligned(Alignment.TopLeft) {
- AspectRatio(2f) { }
+ Container(AspectRatio(2f)) { }
}
aligned(Alignment.BottomCenter) {
ConstrainedBox(DpConstraints.tightConstraints(testWidth, testHeight)) { }
diff --git a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/TableTest.kt b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/TableTest.kt
index 723df86..a58ca32 100644
--- a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/TableTest.kt
+++ b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/TableTest.kt
@@ -39,7 +39,6 @@
import androidx.ui.layout.Table
import androidx.ui.layout.TableColumnWidth
import androidx.ui.layout.TableMeasurable
-import org.junit.Ignore
import org.junit.Test
import org.junit.runner.RunWith
import org.junit.runners.JUnit4
@@ -1311,7 +1310,7 @@
for (i in 0 until rows) {
tableRow {
for (j in 0 until columns) {
- AspectRatio(aspectRatio = 2f) { }
+ Container(AspectRatio(2f)) { }
}
}
}
@@ -1356,7 +1355,7 @@
for (i in 0 until rows) {
tableRow {
for (j in 0 until columns) {
- AspectRatio(aspectRatio = 2f) { }
+ Container(AspectRatio(2f)) { }
}
}
}
@@ -1401,7 +1400,7 @@
for (i in 0 until rows) {
tableRow {
for (j in 0 until columns) {
- AspectRatio(aspectRatio = 2f) { }
+ Container(AspectRatio(2f)) { }
}
}
}
@@ -1446,7 +1445,7 @@
for (i in 0 until rows) {
tableRow {
for (j in 0 until columns) {
- AspectRatio(aspectRatio = 2f) { }
+ Container(AspectRatio(2f)) { }
}
}
}
@@ -1491,7 +1490,7 @@
for (i in 0 until rows) {
tableRow {
for (j in 0 until columns) {
- AspectRatio(aspectRatio = 2f) { }
+ Container(AspectRatio(2f)) { }
}
}
}
@@ -1538,7 +1537,7 @@
for (i in 0 until rows) {
tableRow {
for (j in 0 until columns) {
- AspectRatio(aspectRatio = 2f) { }
+ Container(AspectRatio(2f)) { }
}
}
}
@@ -1583,7 +1582,7 @@
for (i in 0 until rows) {
tableRow {
for (j in 0 until columns) {
- AspectRatio(aspectRatio = 2f) { }
+ Container(AspectRatio(2f)) { }
}
}
}
diff --git a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/WrapTest.kt b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/WrapTest.kt
index 92cc665..2148e71 100644
--- a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/WrapTest.kt
+++ b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/WrapTest.kt
@@ -25,7 +25,6 @@
import androidx.ui.core.px
import androidx.ui.core.withDensity
import androidx.ui.layout.Align
-import androidx.ui.layout.AspectRatio
import androidx.ui.layout.ConstrainedBox
import androidx.ui.layout.Container
import androidx.ui.layout.DpConstraints
@@ -34,6 +33,7 @@
import androidx.compose.composer
import androidx.ui.core.Alignment
import androidx.ui.core.IntPx
+import androidx.ui.layout.AspectRatio
import org.junit.Assert.assertEquals
import org.junit.Test
import org.junit.runner.RunWith
@@ -164,7 +164,7 @@
fun testWrap_hasCorrectIntrinsicMeasurements() = withDensity(density) {
testIntrinsics(@Composable {
Wrap {
- AspectRatio(2f) { }
+ Container(modifier = AspectRatio(2f)) { }
}
}) { minIntrinsicWidth, minIntrinsicHeight, maxIntrinsicWidth, maxIntrinsicHeight ->
// Min width.
diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/AspectRatio.kt b/ui/ui-layout/src/main/java/androidx/ui/layout/AspectRatio.kt
index 8415b59..8beb817 100644
--- a/ui/ui-layout/src/main/java/androidx/ui/layout/AspectRatio.kt
+++ b/ui/ui-layout/src/main/java/androidx/ui/layout/AspectRatio.kt
@@ -133,6 +133,11 @@
* }
* The AspectRatio widget will make the Container have the width twice its height.
*/
+@Deprecated(
+ "Use AspectRatio layout modifier instead.",
+ ReplaceWith("modifier = AspectRatio(aspectRatio)"),
+ DeprecationLevel.WARNING
+)
@Composable
fun AspectRatio(
aspectRatio: Float,