Rename LayoutModifier2 to LayoutModifier
Relnote: Renamed LayoutModifier2 to LayoutModifier.
Bug: 153971245
Change-Id: Id29f36d6b19674d189abb198a7656562b3b310b5
diff --git a/ui/ui-core/api/0.1.0-dev10.txt b/ui/ui-core/api/0.1.0-dev10.txt
index 7fbfeb0..da55017 100644
--- a/ui/ui-core/api/0.1.0-dev10.txt
+++ b/ui/ui-core/api/0.1.0-dev10.txt
@@ -374,6 +374,18 @@
enum_constant public static final androidx.ui.core.LayoutDirection Rtl;
}
+ @Deprecated public interface LayoutModifier extends androidx.ui.core.Modifier.Element {
+ method @Deprecated public default int maxIntrinsicHeightOf-hc1DRLk(androidx.ui.unit.Density, androidx.ui.core.Measurable measurable, int width, androidx.ui.core.LayoutDirection layoutDirection);
+ method @Deprecated public default int maxIntrinsicWidthOf-hc1DRLk(androidx.ui.unit.Density, androidx.ui.core.Measurable measurable, int height, androidx.ui.core.LayoutDirection layoutDirection);
+ method @Deprecated public default int minIntrinsicHeightOf-hc1DRLk(androidx.ui.unit.Density, androidx.ui.core.Measurable measurable, int width, androidx.ui.core.LayoutDirection layoutDirection);
+ method @Deprecated public default int minIntrinsicWidthOf-hc1DRLk(androidx.ui.unit.Density, androidx.ui.core.Measurable measurable, int height, androidx.ui.core.LayoutDirection layoutDirection);
+ method @Deprecated public default androidx.ui.unit.IntPx? modifyAlignmentLine-4TLTOQ4(androidx.ui.unit.Density, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value, androidx.ui.core.LayoutDirection layoutDirection);
+ method @Deprecated public default androidx.ui.core.Constraints modifyConstraints(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
+ method @Deprecated public default androidx.ui.core.LayoutDirection modifyLayoutDirection(androidx.ui.unit.Density, androidx.ui.core.LayoutDirection layoutDirection);
+ method @Deprecated public default androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.Density, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize, androidx.ui.core.LayoutDirection layoutDirection);
+ method @Deprecated public default androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection, androidx.ui.unit.IntPxSize childSize);
+ }
+
public interface LayoutModifier2 extends androidx.ui.core.Modifier.Element {
method public default int maxIntrinsicHeight-QYUUffc(androidx.ui.core.IntrinsicMeasureScope, androidx.ui.core.IntrinsicMeasurable measurable, int width, androidx.ui.core.LayoutDirection layoutDirection);
method public default int maxIntrinsicWidth-QYUUffc(androidx.ui.core.IntrinsicMeasureScope, androidx.ui.core.IntrinsicMeasurable measurable, int height, androidx.ui.core.LayoutDirection layoutDirection);
diff --git a/ui/ui-core/api/0.1.0-dev11.txt b/ui/ui-core/api/0.1.0-dev11.txt
index 64ebf82..12cfc0f 100644
--- a/ui/ui-core/api/0.1.0-dev11.txt
+++ b/ui/ui-core/api/0.1.0-dev11.txt
@@ -387,7 +387,7 @@
enum_constant public static final androidx.ui.core.LayoutDirection Rtl;
}
- public interface LayoutModifier2 extends androidx.ui.core.Modifier.Element {
+ public interface LayoutModifier extends androidx.ui.core.Modifier.Element {
method public default int maxIntrinsicHeight-QYUUffc(androidx.ui.core.IntrinsicMeasureScope, androidx.ui.core.IntrinsicMeasurable measurable, int width, androidx.ui.core.LayoutDirection layoutDirection);
method public default int maxIntrinsicWidth-QYUUffc(androidx.ui.core.IntrinsicMeasureScope, androidx.ui.core.IntrinsicMeasurable measurable, int height, androidx.ui.core.LayoutDirection layoutDirection);
method public androidx.ui.core.MeasureScope.MeasureResult measure(androidx.ui.core.MeasureScope, androidx.ui.core.Measurable measurable, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
diff --git a/ui/ui-core/api/api_lint.ignore b/ui/ui-core/api/api_lint.ignore
index 542fb6f..57903b1 100644
--- a/ui/ui-core/api/api_lint.ignore
+++ b/ui/ui-core/api/api_lint.ignore
@@ -21,23 +21,13 @@
Acronyms should not be capitalized in method names: was `minIntrinsicHeight-e0m06WU`, should this be `minIntrinsicHeight-e0m06Wu`?
AcronymName: androidx.ui.core.IntrinsicMeasureScope#minIntrinsicWidth-e0m06WU(androidx.ui.core.IntrinsicMeasurable, int):
Acronyms should not be capitalized in method names: was `minIntrinsicWidth-e0m06WU`, should this be `minIntrinsicWidth-e0m06Wu`?
-AcronymName: androidx.ui.core.LayoutModifier#maxIntrinsicHeightOf-hc1DRLk(androidx.ui.unit.Density, androidx.ui.core.Measurable, int, androidx.ui.core.LayoutDirection):
- Acronyms should not be capitalized in method names: was `maxIntrinsicHeightOf-hc1DRLk`, should this be `maxIntrinsicHeightOf-hc1DrLk`?
-AcronymName: androidx.ui.core.LayoutModifier#maxIntrinsicWidthOf-hc1DRLk(androidx.ui.unit.Density, androidx.ui.core.Measurable, int, androidx.ui.core.LayoutDirection):
- Acronyms should not be capitalized in method names: was `maxIntrinsicWidthOf-hc1DRLk`, should this be `maxIntrinsicWidthOf-hc1DrLk`?
-AcronymName: androidx.ui.core.LayoutModifier#minIntrinsicHeightOf-hc1DRLk(androidx.ui.unit.Density, androidx.ui.core.Measurable, int, androidx.ui.core.LayoutDirection):
- Acronyms should not be capitalized in method names: was `minIntrinsicHeightOf-hc1DRLk`, should this be `minIntrinsicHeightOf-hc1DrLk`?
-AcronymName: androidx.ui.core.LayoutModifier#minIntrinsicWidthOf-hc1DRLk(androidx.ui.unit.Density, androidx.ui.core.Measurable, int, androidx.ui.core.LayoutDirection):
- Acronyms should not be capitalized in method names: was `minIntrinsicWidthOf-hc1DRLk`, should this be `minIntrinsicWidthOf-hc1DrLk`?
-AcronymName: androidx.ui.core.LayoutModifier#modifyAlignmentLine-4TLTOQ4(androidx.ui.unit.Density, androidx.ui.core.AlignmentLine, androidx.ui.unit.IntPx, androidx.ui.core.LayoutDirection):
- Acronyms should not be capitalized in method names: was `modifyAlignmentLine-4TLTOQ4`, should this be `modifyAlignmentLine-4TltoQ4`?
-AcronymName: androidx.ui.core.LayoutModifier2#maxIntrinsicHeight-QYUUffc(androidx.ui.core.IntrinsicMeasureScope, androidx.ui.core.IntrinsicMeasurable, int, androidx.ui.core.LayoutDirection):
+AcronymName: androidx.ui.core.LayoutModifier#maxIntrinsicHeight-QYUUffc(androidx.ui.core.IntrinsicMeasureScope, androidx.ui.core.IntrinsicMeasurable, int, androidx.ui.core.LayoutDirection):
Acronyms should not be capitalized in method names: was `maxIntrinsicHeight-QYUUffc`, should this be `maxIntrinsicHeight-QyuUffc`?
-AcronymName: androidx.ui.core.LayoutModifier2#maxIntrinsicWidth-QYUUffc(androidx.ui.core.IntrinsicMeasureScope, androidx.ui.core.IntrinsicMeasurable, int, androidx.ui.core.LayoutDirection):
+AcronymName: androidx.ui.core.LayoutModifier#maxIntrinsicWidth-QYUUffc(androidx.ui.core.IntrinsicMeasureScope, androidx.ui.core.IntrinsicMeasurable, int, androidx.ui.core.LayoutDirection):
Acronyms should not be capitalized in method names: was `maxIntrinsicWidth-QYUUffc`, should this be `maxIntrinsicWidth-QyuUffc`?
-AcronymName: androidx.ui.core.LayoutModifier2#minIntrinsicHeight-QYUUffc(androidx.ui.core.IntrinsicMeasureScope, androidx.ui.core.IntrinsicMeasurable, int, androidx.ui.core.LayoutDirection):
+AcronymName: androidx.ui.core.LayoutModifier#minIntrinsicHeight-QYUUffc(androidx.ui.core.IntrinsicMeasureScope, androidx.ui.core.IntrinsicMeasurable, int, androidx.ui.core.LayoutDirection):
Acronyms should not be capitalized in method names: was `minIntrinsicHeight-QYUUffc`, should this be `minIntrinsicHeight-QyuUffc`?
-AcronymName: androidx.ui.core.LayoutModifier2#minIntrinsicWidth-QYUUffc(androidx.ui.core.IntrinsicMeasureScope, androidx.ui.core.IntrinsicMeasurable, int, androidx.ui.core.LayoutDirection):
+AcronymName: androidx.ui.core.LayoutModifier#minIntrinsicWidth-QYUUffc(androidx.ui.core.IntrinsicMeasureScope, androidx.ui.core.IntrinsicMeasurable, int, androidx.ui.core.LayoutDirection):
Acronyms should not be capitalized in method names: was `minIntrinsicWidth-QYUUffc`, should this be `minIntrinsicWidth-QyuUffc`?
diff --git a/ui/ui-core/api/current.txt b/ui/ui-core/api/current.txt
index 64ebf82..12cfc0f 100644
--- a/ui/ui-core/api/current.txt
+++ b/ui/ui-core/api/current.txt
@@ -387,7 +387,7 @@
enum_constant public static final androidx.ui.core.LayoutDirection Rtl;
}
- public interface LayoutModifier2 extends androidx.ui.core.Modifier.Element {
+ public interface LayoutModifier extends androidx.ui.core.Modifier.Element {
method public default int maxIntrinsicHeight-QYUUffc(androidx.ui.core.IntrinsicMeasureScope, androidx.ui.core.IntrinsicMeasurable measurable, int width, androidx.ui.core.LayoutDirection layoutDirection);
method public default int maxIntrinsicWidth-QYUUffc(androidx.ui.core.IntrinsicMeasureScope, androidx.ui.core.IntrinsicMeasurable measurable, int height, androidx.ui.core.LayoutDirection layoutDirection);
method public androidx.ui.core.MeasureScope.MeasureResult measure(androidx.ui.core.MeasureScope, androidx.ui.core.Measurable measurable, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
diff --git a/ui/ui-core/api/public_plus_experimental_0.1.0-dev10.txt b/ui/ui-core/api/public_plus_experimental_0.1.0-dev10.txt
index 7fbfeb0..da55017 100644
--- a/ui/ui-core/api/public_plus_experimental_0.1.0-dev10.txt
+++ b/ui/ui-core/api/public_plus_experimental_0.1.0-dev10.txt
@@ -374,6 +374,18 @@
enum_constant public static final androidx.ui.core.LayoutDirection Rtl;
}
+ @Deprecated public interface LayoutModifier extends androidx.ui.core.Modifier.Element {
+ method @Deprecated public default int maxIntrinsicHeightOf-hc1DRLk(androidx.ui.unit.Density, androidx.ui.core.Measurable measurable, int width, androidx.ui.core.LayoutDirection layoutDirection);
+ method @Deprecated public default int maxIntrinsicWidthOf-hc1DRLk(androidx.ui.unit.Density, androidx.ui.core.Measurable measurable, int height, androidx.ui.core.LayoutDirection layoutDirection);
+ method @Deprecated public default int minIntrinsicHeightOf-hc1DRLk(androidx.ui.unit.Density, androidx.ui.core.Measurable measurable, int width, androidx.ui.core.LayoutDirection layoutDirection);
+ method @Deprecated public default int minIntrinsicWidthOf-hc1DRLk(androidx.ui.unit.Density, androidx.ui.core.Measurable measurable, int height, androidx.ui.core.LayoutDirection layoutDirection);
+ method @Deprecated public default androidx.ui.unit.IntPx? modifyAlignmentLine-4TLTOQ4(androidx.ui.unit.Density, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value, androidx.ui.core.LayoutDirection layoutDirection);
+ method @Deprecated public default androidx.ui.core.Constraints modifyConstraints(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
+ method @Deprecated public default androidx.ui.core.LayoutDirection modifyLayoutDirection(androidx.ui.unit.Density, androidx.ui.core.LayoutDirection layoutDirection);
+ method @Deprecated public default androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.Density, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize, androidx.ui.core.LayoutDirection layoutDirection);
+ method @Deprecated public default androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection, androidx.ui.unit.IntPxSize childSize);
+ }
+
public interface LayoutModifier2 extends androidx.ui.core.Modifier.Element {
method public default int maxIntrinsicHeight-QYUUffc(androidx.ui.core.IntrinsicMeasureScope, androidx.ui.core.IntrinsicMeasurable measurable, int width, androidx.ui.core.LayoutDirection layoutDirection);
method public default int maxIntrinsicWidth-QYUUffc(androidx.ui.core.IntrinsicMeasureScope, androidx.ui.core.IntrinsicMeasurable measurable, int height, androidx.ui.core.LayoutDirection layoutDirection);
diff --git a/ui/ui-core/api/public_plus_experimental_0.1.0-dev11.txt b/ui/ui-core/api/public_plus_experimental_0.1.0-dev11.txt
index 64ebf82..12cfc0f 100644
--- a/ui/ui-core/api/public_plus_experimental_0.1.0-dev11.txt
+++ b/ui/ui-core/api/public_plus_experimental_0.1.0-dev11.txt
@@ -387,7 +387,7 @@
enum_constant public static final androidx.ui.core.LayoutDirection Rtl;
}
- public interface LayoutModifier2 extends androidx.ui.core.Modifier.Element {
+ public interface LayoutModifier extends androidx.ui.core.Modifier.Element {
method public default int maxIntrinsicHeight-QYUUffc(androidx.ui.core.IntrinsicMeasureScope, androidx.ui.core.IntrinsicMeasurable measurable, int width, androidx.ui.core.LayoutDirection layoutDirection);
method public default int maxIntrinsicWidth-QYUUffc(androidx.ui.core.IntrinsicMeasureScope, androidx.ui.core.IntrinsicMeasurable measurable, int height, androidx.ui.core.LayoutDirection layoutDirection);
method public androidx.ui.core.MeasureScope.MeasureResult measure(androidx.ui.core.MeasureScope, androidx.ui.core.Measurable measurable, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
diff --git a/ui/ui-core/api/public_plus_experimental_current.txt b/ui/ui-core/api/public_plus_experimental_current.txt
index 64ebf82..12cfc0f 100644
--- a/ui/ui-core/api/public_plus_experimental_current.txt
+++ b/ui/ui-core/api/public_plus_experimental_current.txt
@@ -387,7 +387,7 @@
enum_constant public static final androidx.ui.core.LayoutDirection Rtl;
}
- public interface LayoutModifier2 extends androidx.ui.core.Modifier.Element {
+ public interface LayoutModifier extends androidx.ui.core.Modifier.Element {
method public default int maxIntrinsicHeight-QYUUffc(androidx.ui.core.IntrinsicMeasureScope, androidx.ui.core.IntrinsicMeasurable measurable, int width, androidx.ui.core.LayoutDirection layoutDirection);
method public default int maxIntrinsicWidth-QYUUffc(androidx.ui.core.IntrinsicMeasureScope, androidx.ui.core.IntrinsicMeasurable measurable, int height, androidx.ui.core.LayoutDirection layoutDirection);
method public androidx.ui.core.MeasureScope.MeasureResult measure(androidx.ui.core.MeasureScope, androidx.ui.core.Measurable measurable, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
diff --git a/ui/ui-core/api/restricted_0.1.0-dev10.txt b/ui/ui-core/api/restricted_0.1.0-dev10.txt
index 7fbfeb0..da55017 100644
--- a/ui/ui-core/api/restricted_0.1.0-dev10.txt
+++ b/ui/ui-core/api/restricted_0.1.0-dev10.txt
@@ -374,6 +374,18 @@
enum_constant public static final androidx.ui.core.LayoutDirection Rtl;
}
+ @Deprecated public interface LayoutModifier extends androidx.ui.core.Modifier.Element {
+ method @Deprecated public default int maxIntrinsicHeightOf-hc1DRLk(androidx.ui.unit.Density, androidx.ui.core.Measurable measurable, int width, androidx.ui.core.LayoutDirection layoutDirection);
+ method @Deprecated public default int maxIntrinsicWidthOf-hc1DRLk(androidx.ui.unit.Density, androidx.ui.core.Measurable measurable, int height, androidx.ui.core.LayoutDirection layoutDirection);
+ method @Deprecated public default int minIntrinsicHeightOf-hc1DRLk(androidx.ui.unit.Density, androidx.ui.core.Measurable measurable, int width, androidx.ui.core.LayoutDirection layoutDirection);
+ method @Deprecated public default int minIntrinsicWidthOf-hc1DRLk(androidx.ui.unit.Density, androidx.ui.core.Measurable measurable, int height, androidx.ui.core.LayoutDirection layoutDirection);
+ method @Deprecated public default androidx.ui.unit.IntPx? modifyAlignmentLine-4TLTOQ4(androidx.ui.unit.Density, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value, androidx.ui.core.LayoutDirection layoutDirection);
+ method @Deprecated public default androidx.ui.core.Constraints modifyConstraints(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
+ method @Deprecated public default androidx.ui.core.LayoutDirection modifyLayoutDirection(androidx.ui.unit.Density, androidx.ui.core.LayoutDirection layoutDirection);
+ method @Deprecated public default androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.Density, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize, androidx.ui.core.LayoutDirection layoutDirection);
+ method @Deprecated public default androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.Density, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection, androidx.ui.unit.IntPxSize childSize);
+ }
+
public interface LayoutModifier2 extends androidx.ui.core.Modifier.Element {
method public default int maxIntrinsicHeight-QYUUffc(androidx.ui.core.IntrinsicMeasureScope, androidx.ui.core.IntrinsicMeasurable measurable, int width, androidx.ui.core.LayoutDirection layoutDirection);
method public default int maxIntrinsicWidth-QYUUffc(androidx.ui.core.IntrinsicMeasureScope, androidx.ui.core.IntrinsicMeasurable measurable, int height, androidx.ui.core.LayoutDirection layoutDirection);
diff --git a/ui/ui-core/api/restricted_0.1.0-dev11.txt b/ui/ui-core/api/restricted_0.1.0-dev11.txt
index 64ebf82..12cfc0f 100644
--- a/ui/ui-core/api/restricted_0.1.0-dev11.txt
+++ b/ui/ui-core/api/restricted_0.1.0-dev11.txt
@@ -387,7 +387,7 @@
enum_constant public static final androidx.ui.core.LayoutDirection Rtl;
}
- public interface LayoutModifier2 extends androidx.ui.core.Modifier.Element {
+ public interface LayoutModifier extends androidx.ui.core.Modifier.Element {
method public default int maxIntrinsicHeight-QYUUffc(androidx.ui.core.IntrinsicMeasureScope, androidx.ui.core.IntrinsicMeasurable measurable, int width, androidx.ui.core.LayoutDirection layoutDirection);
method public default int maxIntrinsicWidth-QYUUffc(androidx.ui.core.IntrinsicMeasureScope, androidx.ui.core.IntrinsicMeasurable measurable, int height, androidx.ui.core.LayoutDirection layoutDirection);
method public androidx.ui.core.MeasureScope.MeasureResult measure(androidx.ui.core.MeasureScope, androidx.ui.core.Measurable measurable, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
diff --git a/ui/ui-core/api/restricted_current.txt b/ui/ui-core/api/restricted_current.txt
index 64ebf82..12cfc0f 100644
--- a/ui/ui-core/api/restricted_current.txt
+++ b/ui/ui-core/api/restricted_current.txt
@@ -387,7 +387,7 @@
enum_constant public static final androidx.ui.core.LayoutDirection Rtl;
}
- public interface LayoutModifier2 extends androidx.ui.core.Modifier.Element {
+ public interface LayoutModifier extends androidx.ui.core.Modifier.Element {
method public default int maxIntrinsicHeight-QYUUffc(androidx.ui.core.IntrinsicMeasureScope, androidx.ui.core.IntrinsicMeasurable measurable, int width, androidx.ui.core.LayoutDirection layoutDirection);
method public default int maxIntrinsicWidth-QYUUffc(androidx.ui.core.IntrinsicMeasureScope, androidx.ui.core.IntrinsicMeasurable measurable, int height, androidx.ui.core.LayoutDirection layoutDirection);
method public androidx.ui.core.MeasureScope.MeasureResult measure(androidx.ui.core.MeasureScope, androidx.ui.core.Measurable measurable, androidx.ui.core.Constraints constraints, androidx.ui.core.LayoutDirection layoutDirection);
diff --git a/ui/ui-core/src/main/java/androidx/ui/core/Constraints.kt b/ui/ui-core/src/main/java/androidx/ui/core/Constraints.kt
index dd190c1..5eeb2da 100644
--- a/ui/ui-core/src/main/java/androidx/ui/core/Constraints.kt
+++ b/ui/ui-core/src/main/java/androidx/ui/core/Constraints.kt
@@ -25,7 +25,7 @@
import androidx.ui.unit.isFinite
/**
- * Immutable constraints used for measuring child [Layout]s or [LayoutModifier2]s. A parent layout
+ * Immutable constraints used for measuring child [Layout]s or [LayoutModifier]s. A parent layout
* can measure their children using the measure method on the corresponding [Measurable]s,
* method which takes the [Constraints] the child has to follow. A measured child is then
* responsible to choose for themselves and return a size which satisfies the set of [Constraints]
diff --git a/ui/ui-core/src/main/java/androidx/ui/core/Constraints2.kt b/ui/ui-core/src/main/java/androidx/ui/core/Constraints2.kt
index 0515540..4e22058 100644
--- a/ui/ui-core/src/main/java/androidx/ui/core/Constraints2.kt
+++ b/ui/ui-core/src/main/java/androidx/ui/core/Constraints2.kt
@@ -23,7 +23,7 @@
import kotlin.math.max
/**
- * Immutable constraints used for measuring child Layouts or [LayoutModifier2]s. A parent layout
+ * Immutable constraints used for measuring child Layouts or [LayoutModifier]s. A parent layout
* can measure their children using the measure method on the corresponding [Measurable]s,
* method which takes the [Constraints2] the child has to follow. A measured child is then
* responsible to choose for themselves and return a size which satisfies the set of [Constraints2]
diff --git a/ui/ui-core/src/main/java/androidx/ui/core/LayoutModifier.kt b/ui/ui-core/src/main/java/androidx/ui/core/LayoutModifier.kt
index a7e6344..60eb358 100644
--- a/ui/ui-core/src/main/java/androidx/ui/core/LayoutModifier.kt
+++ b/ui/ui-core/src/main/java/androidx/ui/core/LayoutModifier.kt
@@ -30,16 +30,16 @@
*
* @see androidx.ui.core.Layout
*/
-interface LayoutModifier2 : Modifier.Element {
+interface LayoutModifier : Modifier.Element {
/**
* The function used to measure the modifier. The [measurable] corresponds to the
* wrapped content, and it can be measured with the desired constraints according
- * to the logic of the [LayoutModifier2]. The modifier needs to choose its own
+ * to the logic of the [LayoutModifier]. The modifier needs to choose its own
* size, which can depend on the size chosen by the wrapped content (the obtained
* [Placeable]), if the wrapped content was measured. The size needs to be returned
* as part of a [MeasureScope.MeasureResult], alongside the placement logic of the
* [Placeable], which defines how the wrapped content should be positioned inside
- * the [LayoutModifier2]. A convenient way to create the [MeasureScope.MeasureResult]
+ * the [LayoutModifier]. A convenient way to create the [MeasureScope.MeasureResult]
* is to use the [MeasureScope.layout] factory function.
*/
fun MeasureScope.measure(
@@ -56,7 +56,7 @@
height: IntPx,
layoutDirection: LayoutDirection
): IntPx = MeasuringIntrinsics.minWidth(
- this@LayoutModifier2,
+ this@LayoutModifier,
this,
measurable,
height,
@@ -71,7 +71,7 @@
width: IntPx,
layoutDirection: LayoutDirection
): IntPx = MeasuringIntrinsics.minHeight(
- this@LayoutModifier2,
+ this@LayoutModifier,
this,
measurable,
width,
@@ -86,7 +86,7 @@
height: IntPx,
layoutDirection: LayoutDirection
): IntPx = MeasuringIntrinsics.maxWidth(
- this@LayoutModifier2,
+ this@LayoutModifier,
this,
measurable,
height,
@@ -101,7 +101,7 @@
width: IntPx,
layoutDirection: LayoutDirection
): IntPx = MeasuringIntrinsics.maxHeight(
- this@LayoutModifier2,
+ this@LayoutModifier,
this,
measurable,
width,
@@ -112,7 +112,7 @@
// TODO(popam): deduplicate from the copy-pasted logic of Layout.kt without making it public
private object MeasuringIntrinsics {
internal fun minWidth(
- modifier: LayoutModifier2,
+ modifier: LayoutModifier,
density: Density,
intrinsicMeasurable: IntrinsicMeasurable,
h: IntPx,
@@ -132,7 +132,7 @@
}
internal fun minHeight(
- modifier: LayoutModifier2,
+ modifier: LayoutModifier,
density: Density,
intrinsicMeasurable: IntrinsicMeasurable,
w: IntPx,
@@ -152,7 +152,7 @@
}
internal fun maxWidth(
- modifier: LayoutModifier2,
+ modifier: LayoutModifier,
density: Density,
intrinsicMeasurable: IntrinsicMeasurable,
h: IntPx,
@@ -172,7 +172,7 @@
}
internal fun maxHeight(
- modifier: LayoutModifier2,
+ modifier: LayoutModifier,
density: Density,
intrinsicMeasurable: IntrinsicMeasurable,
w: IntPx,
diff --git a/ui/ui-framework/src/androidTest/java/androidx/ui/core/PainterModifierTest.kt b/ui/ui-framework/src/androidTest/java/androidx/ui/core/PainterModifierTest.kt
index dfa9ea54..27a389c 100644
--- a/ui/ui-framework/src/androidTest/java/androidx/ui/core/PainterModifierTest.kt
+++ b/ui/ui-framework/src/androidTest/java/androidx/ui/core/PainterModifierTest.kt
@@ -39,9 +39,7 @@
import androidx.ui.graphics.compositeOver
import androidx.ui.graphics.painter.Painter
import androidx.ui.graphics.toArgb
-import androidx.ui.unit.Density
import androidx.ui.unit.IntPx
-import androidx.ui.unit.IntPxSize
import androidx.ui.unit.Px
import androidx.ui.unit.PxSize
import androidx.ui.unit.ipx
@@ -463,7 +461,7 @@
}
}
- class FixedSizeModifier(val width: IntPx, val height: IntPx = width) : LayoutModifier2 {
+ class FixedSizeModifier(val width: IntPx, val height: IntPx = width) : LayoutModifier {
override fun MeasureScope.measure(
measurable: Measurable,
constraints: Constraints,
diff --git a/ui/ui-framework/src/androidTest/java/androidx/ui/core/test/AndroidLayoutDrawTest.kt b/ui/ui-framework/src/androidTest/java/androidx/ui/core/test/AndroidLayoutDrawTest.kt
index 9f2d201..bade43c 100644
--- a/ui/ui-framework/src/androidTest/java/androidx/ui/core/test/AndroidLayoutDrawTest.kt
+++ b/ui/ui-framework/src/androidTest/java/androidx/ui/core/test/AndroidLayoutDrawTest.kt
@@ -41,13 +41,12 @@
import androidx.ui.core.ContentDrawScope
import androidx.ui.core.DrawLayerModifier
import androidx.ui.core.DrawModifier
-import androidx.ui.core.ContentDrawScope
import androidx.ui.core.HorizontalAlignmentLine
import androidx.ui.core.IntrinsicMeasurable
import androidx.ui.core.IntrinsicMeasureScope
import androidx.ui.core.Layout
import androidx.ui.core.LayoutDirection
-import androidx.ui.core.LayoutModifier2
+import androidx.ui.core.LayoutModifier
import androidx.ui.core.LayoutTag
import androidx.ui.core.Measurable
import androidx.ui.core.MeasureScope
@@ -78,7 +77,6 @@
import androidx.ui.layout.rtl
import androidx.ui.unit.Density
import androidx.ui.unit.IntPx
-import androidx.ui.unit.IntPxPosition
import androidx.ui.unit.IntPxSize
import androidx.ui.unit.PxSize
import androidx.ui.unit.dp
@@ -1649,7 +1647,7 @@
@Test
fun modifiers_validateCorrectSizes() {
- val layoutModifier = object : LayoutModifier2 {
+ val layoutModifier = object : LayoutModifier {
override fun MeasureScope.measure(
measurable: Measurable,
constraints: Constraints,
@@ -2758,7 +2756,7 @@
val top: IntPx = 0.ipx,
val right: IntPx = 0.ipx,
val bottom: IntPx = 0.ipx
-) : LayoutModifier2 {
+) : LayoutModifier {
override fun MeasureScope.measure(
measurable: Measurable,
constraints: Constraints,
@@ -2805,39 +2803,9 @@
layoutDirection: LayoutDirection
): IntPx = measurable.maxIntrinsicHeight((width - (left + right)).coerceAtLeast(0.ipx)) +
(top + bottom)
-
- override fun Density.modifyConstraints(
- constraints: Constraints,
- layoutDirection: LayoutDirection
- ) = constraints.offset(
- horizontal = -left - right,
- vertical = -top - bottom
- )
-
- override fun Density.modifySize(
- constraints: Constraints,
- layoutDirection: LayoutDirection,
- childSize: IntPxSize
- ) = IntPxSize(
- (left + childSize.width + right)
- .coerceIn(constraints.minWidth, constraints.maxWidth),
- (top + childSize.height + bottom)
- .coerceIn(constraints.minHeight, constraints.maxHeight)
- )
-
- override fun Density.modifyPosition(
- childSize: IntPxSize,
- containerSize: IntPxSize,
- layoutDirection: LayoutDirection
- ) = IntPxPosition(left, top)
-=======
- ): IntPx =
- measurable.maxIntrinsicHeight((width - (left + right)).coerceAtLeast(0.ipx)) +
- (top + bottom)
->>>>>>> 8c2936f133... Remove deprecated LayoutModifier interface
}
-internal val AlignTopLeft = object : LayoutModifier2 {
+internal val AlignTopLeft = object : LayoutModifier {
override fun MeasureScope.measure(
measurable: Measurable,
constraints: Constraints,
@@ -2942,7 +2910,7 @@
drawRect(size.toRect(), paint)
}
-class CombinedModifier(color: Color) : LayoutModifier2, DrawModifier {
+class CombinedModifier(color: Color) : LayoutModifier, DrawModifier {
val paint = Paint().also { paint ->
paint.color = color
paint.style = PaintingStyle.fill
@@ -2970,7 +2938,7 @@
fun Modifier.scale(scale: Float) = plus(LayoutScale(scale))
.drawLayer(scaleX = scale, scaleY = scale)
-class LayoutScale(val scale: Float) : LayoutModifier2 {
+class LayoutScale(val scale: Float) : LayoutModifier {
override fun MeasureScope.measure(
measurable: Measurable,
constraints: Constraints,
diff --git a/ui/ui-framework/src/androidTest/java/androidx/ui/core/test/AndroidViewCompatTest.kt b/ui/ui-framework/src/androidTest/java/androidx/ui/core/test/AndroidViewCompatTest.kt
index 631fea3..b225d18 100644
--- a/ui/ui-framework/src/androidTest/java/androidx/ui/core/test/AndroidViewCompatTest.kt
+++ b/ui/ui-framework/src/androidTest/java/androidx/ui/core/test/AndroidViewCompatTest.kt
@@ -39,7 +39,6 @@
import androidx.ui.core.Layout
import androidx.ui.core.LayoutDirection
import androidx.ui.core.LayoutModifier
-import androidx.ui.core.LayoutModifier2
import androidx.ui.core.Measurable
import androidx.ui.core.MeasureScope
import androidx.ui.core.Modifier
@@ -57,7 +56,6 @@
import androidx.ui.test.findByTag
import androidx.ui.test.runOnIdleCompose
import androidx.ui.test.runOnUiThread
-import androidx.ui.unit.Density
import androidx.ui.unit.IntPxPosition
import androidx.ui.unit.ipx
import junit.framework.TestCase.assertNotNull
@@ -383,7 +381,7 @@
}
}
- fun LayoutConstraints(childConstraints: Constraints) = object : LayoutModifier2 {
+ fun LayoutConstraints(childConstraints: Constraints) = object : LayoutModifier {
override fun MeasureScope.measure(
measurable: Measurable,
constraints: Constraints,
diff --git a/ui/ui-framework/src/androidTest/java/androidx/ui/core/test/RtlLayoutTest.kt b/ui/ui-framework/src/androidTest/java/androidx/ui/core/test/RtlLayoutTest.kt
index 14fa815..b709d08 100644
--- a/ui/ui-framework/src/androidTest/java/androidx/ui/core/test/RtlLayoutTest.kt
+++ b/ui/ui-framework/src/androidTest/java/androidx/ui/core/test/RtlLayoutTest.kt
@@ -24,7 +24,7 @@
import androidx.ui.core.IntrinsicMeasureScope
import androidx.ui.core.Layout
import androidx.ui.core.LayoutDirection
-import androidx.ui.core.LayoutModifier2
+import androidx.ui.core.LayoutModifier
import androidx.ui.core.Measurable
import androidx.ui.core.MeasureScope
import androidx.ui.core.Modifier
@@ -343,7 +343,7 @@
}
}
- private fun Modifier.queryIntrinsics() = this + object : LayoutModifier2 {
+ private fun Modifier.queryIntrinsics() = this + object : LayoutModifier {
override fun MeasureScope.measure(
measurable: Measurable,
constraints: Constraints,
@@ -375,7 +375,7 @@
}
private fun Modifier.assertLayoutDirection(expectedLayoutDirection: LayoutDirection): Modifier =
- this + object : LayoutModifier2 {
+ this + object : LayoutModifier {
override fun MeasureScope.measure(
measurable: Measurable,
constraints: Constraints,
diff --git a/ui/ui-framework/src/androidTest/java/androidx/ui/core/test/WithConstraintsTest.kt b/ui/ui-framework/src/androidTest/java/androidx/ui/core/test/WithConstraintsTest.kt
index f0cef1a..cc7b67c 100644
--- a/ui/ui-framework/src/androidTest/java/androidx/ui/core/test/WithConstraintsTest.kt
+++ b/ui/ui-framework/src/androidTest/java/androidx/ui/core/test/WithConstraintsTest.kt
@@ -33,7 +33,6 @@
import androidx.ui.core.Layout
import androidx.ui.core.LayoutDirection
import androidx.ui.core.LayoutModifier
-import androidx.ui.core.LayoutModifier2
import androidx.ui.core.Measurable
import androidx.ui.core.MeasureBlock
import androidx.ui.core.MeasureScope
@@ -800,7 +799,7 @@
drawRect(size.toRect(), paint)
}
-val infiniteConstraints = object : LayoutModifier2 {
+val infiniteConstraints = object : LayoutModifier {
override fun MeasureScope.measure(
measurable: Measurable,
constraints: Constraints,
diff --git a/ui/ui-framework/src/main/java/androidx/ui/core/PainterModifier.kt b/ui/ui-framework/src/main/java/androidx/ui/core/PainterModifier.kt
index dd4e28e9..70dd418 100644
--- a/ui/ui-framework/src/main/java/androidx/ui/core/PainterModifier.kt
+++ b/ui/ui-framework/src/main/java/androidx/ui/core/PainterModifier.kt
@@ -121,7 +121,7 @@
val alpha: Float = DefaultAlpha,
val colorFilter: ColorFilter? = null,
val rtl: Boolean = false
-) : LayoutModifier2, DrawModifier {
+) : LayoutModifier, DrawModifier {
override fun MeasureScope.measure(
measurable: Measurable,
constraints: Constraints,
diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/Intrinsic.kt b/ui/ui-layout/src/main/java/androidx/ui/layout/Intrinsic.kt
index 508d5aa..8151cfc 100644
--- a/ui/ui-layout/src/main/java/androidx/ui/layout/Intrinsic.kt
+++ b/ui/ui-layout/src/main/java/androidx/ui/layout/Intrinsic.kt
@@ -22,7 +22,7 @@
import androidx.ui.core.IntrinsicMeasureScope
import androidx.ui.core.Layout
import androidx.ui.core.LayoutDirection
-import androidx.ui.core.LayoutModifier2
+import androidx.ui.core.LayoutModifier
import androidx.ui.core.Measurable
import androidx.ui.core.MeasureScope
import androidx.ui.core.Modifier
@@ -75,12 +75,11 @@
enum class IntrinsicSize { Min, Max }
private object PreferredMinIntrinsicWidthModifier : PreferredIntrinsicSizeModifier {
- override fun calculateContentConstraints(
+ override fun MeasureScope.calculateContentConstraints(
measurable: Measurable,
- constraints: Constraints,
- layoutDirection: LayoutDirection
+ constraints: Constraints
): Constraints {
- val width = measurable.minIntrinsicWidth(constraints.maxHeight, layoutDirection)
+ val width = measurable.minIntrinsicWidth(constraints.maxHeight)
return Constraints.fixedWidth(width)
}
@@ -88,16 +87,15 @@
measurable: IntrinsicMeasurable,
height: IntPx,
layoutDirection: LayoutDirection
- ) = measurable.minIntrinsicWidth(height, layoutDirection)
+ ) = measurable.minIntrinsicWidth(height)
}
private object PreferredMinIntrinsicHeightModifier : PreferredIntrinsicSizeModifier {
- override fun calculateContentConstraints(
+ override fun MeasureScope.calculateContentConstraints(
measurable: Measurable,
- constraints: Constraints,
- layoutDirection: LayoutDirection
+ constraints: Constraints
): Constraints {
- val height = measurable.minIntrinsicHeight(constraints.maxWidth, layoutDirection)
+ val height = measurable.minIntrinsicHeight(constraints.maxWidth)
return Constraints.fixedHeight(height)
}
@@ -105,16 +103,15 @@
measurable: IntrinsicMeasurable,
width: IntPx,
layoutDirection: LayoutDirection
- ) = measurable.minIntrinsicHeight(width, layoutDirection)
+ ) = measurable.minIntrinsicHeight(width)
}
private object PreferredMaxIntrinsicWidthModifier : PreferredIntrinsicSizeModifier {
- override fun calculateContentConstraints(
+ override fun MeasureScope.calculateContentConstraints(
measurable: Measurable,
- constraints: Constraints,
- layoutDirection: LayoutDirection
+ constraints: Constraints
): Constraints {
- val width = measurable.maxIntrinsicWidth(constraints.maxHeight, layoutDirection)
+ val width = measurable.maxIntrinsicWidth(constraints.maxHeight)
return Constraints.fixedWidth(width)
}
@@ -126,12 +123,11 @@
}
private object PreferredMaxIntrinsicHeightModifier : PreferredIntrinsicSizeModifier {
- override fun calculateContentConstraints(
+ override fun MeasureScope.calculateContentConstraints(
measurable: Measurable,
- constraints: Constraints,
- layoutDirection: LayoutDirection
+ constraints: Constraints
): Constraints {
- val height = measurable.maxIntrinsicHeight(constraints.maxWidth, layoutDirection)
+ val height = measurable.maxIntrinsicHeight(constraints.maxWidth)
return Constraints.fixedHeight(height)
}
@@ -139,14 +135,13 @@
measurable: IntrinsicMeasurable,
width: IntPx,
layoutDirection: LayoutDirection
- ) = measurable.maxIntrinsicHeight(width, layoutDirection)
+ ) = measurable.maxIntrinsicHeight(width)
}
-private interface PreferredIntrinsicSizeModifier : LayoutModifier2 {
- fun calculateContentConstraints(
+private interface PreferredIntrinsicSizeModifier : LayoutModifier {
+ fun MeasureScope.calculateContentConstraints(
measurable: Measurable,
- constraints: Constraints,
- layoutDirection: LayoutDirection
+ constraints: Constraints
): Constraints
override fun MeasureScope.measure(
@@ -157,8 +152,7 @@
val placeable = measurable.measure(
calculateContentConstraints(
measurable,
- constraints,
- layoutDirection
+ constraints
).enforce(constraints)
)
return layout(placeable.width, placeable.height) {
diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/LayoutAspectRatio.kt b/ui/ui-layout/src/main/java/androidx/ui/layout/LayoutAspectRatio.kt
index c47dfb6..c687157 100644
--- a/ui/ui-layout/src/main/java/androidx/ui/layout/LayoutAspectRatio.kt
+++ b/ui/ui-layout/src/main/java/androidx/ui/layout/LayoutAspectRatio.kt
@@ -21,7 +21,7 @@
import androidx.ui.core.IntrinsicMeasurable
import androidx.ui.core.IntrinsicMeasureScope
import androidx.ui.core.LayoutDirection
-import androidx.ui.core.LayoutModifier2
+import androidx.ui.core.LayoutModifier
import androidx.ui.core.Measurable
import androidx.ui.core.MeasureScope
import androidx.ui.core.Modifier
@@ -47,7 +47,7 @@
ratio: Float
) = this + AspectRatioModifier(ratio)
-private data class AspectRatioModifier(val aspectRatio: Float) : LayoutModifier2 {
+private data class AspectRatioModifier(val aspectRatio: Float) : LayoutModifier {
init {
require(aspectRatio > 0) { "aspectRatio $aspectRatio must be > 0" }
}
diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/LayoutDirections.kt b/ui/ui-layout/src/main/java/androidx/ui/layout/LayoutDirections.kt
index 17d206d..1199cdcb 100644
--- a/ui/ui-layout/src/main/java/androidx/ui/layout/LayoutDirections.kt
+++ b/ui/ui-layout/src/main/java/androidx/ui/layout/LayoutDirections.kt
@@ -20,7 +20,7 @@
import androidx.ui.core.IntrinsicMeasurable
import androidx.ui.core.IntrinsicMeasureScope
import androidx.ui.core.LayoutDirection
-import androidx.ui.core.LayoutModifier2
+import androidx.ui.core.LayoutModifier
import androidx.ui.core.Measurable
import androidx.ui.core.MeasureScope
import androidx.ui.core.Modifier
@@ -43,7 +43,7 @@
private data class LayoutDirectionModifier(
val prescribedLayoutDirection: LayoutDirection
-) : LayoutModifier2 {
+) : LayoutModifier {
override fun MeasureScope.measure(
measurable: Measurable,
constraints: Constraints,
diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/LayoutOffset.kt b/ui/ui-layout/src/main/java/androidx/ui/layout/LayoutOffset.kt
index 893c8ec..54adf38 100644
--- a/ui/ui-layout/src/main/java/androidx/ui/layout/LayoutOffset.kt
+++ b/ui/ui-layout/src/main/java/androidx/ui/layout/LayoutOffset.kt
@@ -18,7 +18,7 @@
import androidx.ui.core.Constraints
import androidx.ui.core.LayoutDirection
-import androidx.ui.core.LayoutModifier2
+import androidx.ui.core.LayoutModifier
import androidx.ui.core.Measurable
import androidx.ui.core.MeasureScope
import androidx.ui.core.Modifier
@@ -33,7 +33,7 @@
*/
fun Modifier.offset(x: Dp = 0.dp, y: Dp = 0.dp) = this + OffsetModifier(x, y)
-private data class OffsetModifier(val x: Dp, val y: Dp) : LayoutModifier2 {
+private data class OffsetModifier(val x: Dp, val y: Dp) : LayoutModifier {
override fun MeasureScope.measure(
measurable: Measurable,
constraints: Constraints,
diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/LayoutPadding.kt b/ui/ui-layout/src/main/java/androidx/ui/layout/LayoutPadding.kt
index 45b773e..3f6249a 100644
--- a/ui/ui-layout/src/main/java/androidx/ui/layout/LayoutPadding.kt
+++ b/ui/ui-layout/src/main/java/androidx/ui/layout/LayoutPadding.kt
@@ -20,7 +20,7 @@
import androidx.ui.core.Constraints
import androidx.ui.core.LayoutDirection
import androidx.ui.core.Modifier
-import androidx.ui.core.LayoutModifier2
+import androidx.ui.core.LayoutModifier
import androidx.ui.core.Measurable
import androidx.ui.core.MeasureScope
import androidx.ui.core.offset
@@ -116,7 +116,7 @@
val end: Dp = 0.dp,
val bottom: Dp = 0.dp,
val rtlAware: Boolean
-) : LayoutModifier2 {
+) : LayoutModifier {
init {
require(start.value >= 0f && top.value >= 0f && end.value >= 0f && bottom.value >= 0f) {
"Padding must be non-negative"
diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/LayoutSize.kt b/ui/ui-layout/src/main/java/androidx/ui/layout/LayoutSize.kt
index fcc0fa3..16ed22b 100644
--- a/ui/ui-layout/src/main/java/androidx/ui/layout/LayoutSize.kt
+++ b/ui/ui-layout/src/main/java/androidx/ui/layout/LayoutSize.kt
@@ -21,7 +21,7 @@
import androidx.ui.core.IntrinsicMeasurable
import androidx.ui.core.IntrinsicMeasureScope
import androidx.ui.core.LayoutDirection
-import androidx.ui.core.LayoutModifier2
+import androidx.ui.core.LayoutModifier
import androidx.ui.core.Measurable
import androidx.ui.core.MeasureScope
import androidx.ui.core.Modifier
@@ -334,7 +334,7 @@
fun Modifier.wrapContentSize(align: Alignment = Alignment.Center) =
this + AlignmentModifier(align, Direction.Both)
-private data class FillModifier(private val direction: Direction) : LayoutModifier2 {
+private data class FillModifier(private val direction: Direction) : LayoutModifier {
override fun MeasureScope.measure(
measurable: Measurable,
constraints: Constraints,
@@ -368,7 +368,7 @@
private val maxWidth: Dp = Dp.Unspecified,
private val maxHeight: Dp = Dp.Unspecified,
private val enforceIncoming: Boolean
-) : LayoutModifier2 {
+) : LayoutModifier {
private val Density.targetConstraints
get() = Constraints(
minWidth = if (minWidth != Dp.Unspecified) minWidth.toIntPx() else 0.ipx,
@@ -460,7 +460,7 @@
private data class AlignmentModifier(
private val alignment: Alignment,
private val direction: Direction
-) : LayoutModifier2 {
+) : LayoutModifier {
override fun MeasureScope.measure(
measurable: Measurable,
constraints: Constraints,
diff --git a/ui/ui-material/src/main/java/androidx/ui/material/FloatingActionButton.kt b/ui/ui-material/src/main/java/androidx/ui/material/FloatingActionButton.kt
index 6bc4f1c..2a356d9 100644
--- a/ui/ui-material/src/main/java/androidx/ui/material/FloatingActionButton.kt
+++ b/ui/ui-material/src/main/java/androidx/ui/material/FloatingActionButton.kt
@@ -23,7 +23,7 @@
import androidx.ui.core.IntrinsicMeasurable
import androidx.ui.core.IntrinsicMeasureScope
import androidx.ui.core.LayoutDirection
-import androidx.ui.core.LayoutModifier2
+import androidx.ui.core.LayoutModifier
import androidx.ui.core.Measurable
import androidx.ui.core.MeasureScope
import androidx.ui.core.Modifier
@@ -171,7 +171,7 @@
*
* TODO: b/150460257 remove after support for this is added as a SizeModifier / similar
*/
-private object MinimumFabSizeModifier : LayoutModifier2 {
+private object MinimumFabSizeModifier : LayoutModifier {
override fun MeasureScope.measure(
measurable: Measurable,
constraints: Constraints,
@@ -198,25 +198,25 @@
measurable: IntrinsicMeasurable,
height: IntPx,
layoutDirection: LayoutDirection
- ) = max(measurable.minIntrinsicWidth(height, layoutDirection), FabSize.toIntPx())
+ ) = max(measurable.minIntrinsicWidth(height), FabSize.toIntPx())
override fun IntrinsicMeasureScope.minIntrinsicHeight(
measurable: IntrinsicMeasurable,
width: IntPx,
layoutDirection: LayoutDirection
- ) = max(measurable.minIntrinsicHeight(width, layoutDirection), FabSize.toIntPx())
+ ) = max(measurable.minIntrinsicHeight(width), FabSize.toIntPx())
override fun IntrinsicMeasureScope.maxIntrinsicWidth(
measurable: IntrinsicMeasurable,
height: IntPx,
layoutDirection: LayoutDirection
- ) = max(measurable.maxIntrinsicWidth(height, layoutDirection), FabSize.toIntPx())
+ ) = max(measurable.maxIntrinsicWidth(height), FabSize.toIntPx())
override fun IntrinsicMeasureScope.maxIntrinsicHeight(
measurable: IntrinsicMeasurable,
width: IntPx,
layoutDirection: LayoutDirection
- ) = max(measurable.maxIntrinsicHeight(width, layoutDirection), FabSize.toIntPx())
+ ) = max(measurable.maxIntrinsicHeight(width), FabSize.toIntPx())
}
private val FabSize = 56.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 9964726..becd1f8 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
@@ -35,7 +35,7 @@
import androidx.ui.core.FocusManagerAmbient
import androidx.ui.core.Layout
import androidx.ui.core.LayoutDirection
-import androidx.ui.core.LayoutModifier2
+import androidx.ui.core.LayoutModifier
import androidx.ui.core.Measurable
import androidx.ui.core.MeasureScope
import androidx.ui.core.Modifier
@@ -560,7 +560,7 @@
}
private fun Modifier.iconPadding(start: Dp = 0.dp, end: Dp = 0.dp) =
- this + object : LayoutModifier2 {
+ this + object : LayoutModifier {
override fun MeasureScope.measure(
measurable: Measurable,
constraints: Constraints,
diff --git a/ui/ui-material/src/main/java/androidx/ui/material/ripple/Ripple.kt b/ui/ui-material/src/main/java/androidx/ui/material/ripple/Ripple.kt
index b17caaa..54ecff3 100644
--- a/ui/ui-material/src/main/java/androidx/ui/material/ripple/Ripple.kt
+++ b/ui/ui-material/src/main/java/androidx/ui/material/ripple/Ripple.kt
@@ -34,7 +34,7 @@
import androidx.ui.core.DensityAmbient
import androidx.ui.core.DrawModifier
import androidx.ui.core.LayoutDirection
-import androidx.ui.core.LayoutModifier2
+import androidx.ui.core.LayoutModifier
import androidx.ui.core.Measurable
import androidx.ui.core.MeasureScope
import androidx.ui.core.Modifier
@@ -96,7 +96,7 @@
pressIndicator + rippleModifier
}
-private class RippleModifier : DrawModifier, LayoutModifier2, CompositionLifecycleObserver {
+private class RippleModifier : DrawModifier, LayoutModifier, CompositionLifecycleObserver {
var color: Color by mutableStateOf(Color.Transparent, StructurallyEqual)
diff --git a/ui/ui-platform/src/main/java/androidx/ui/core/ComponentNodes.kt b/ui/ui-platform/src/main/java/androidx/ui/core/ComponentNodes.kt
index 62cd25b..7407e7f 100644
--- a/ui/ui-platform/src/main/java/androidx/ui/core/ComponentNodes.kt
+++ b/ui/ui-platform/src/main/java/androidx/ui/core/ComponentNodes.kt
@@ -741,8 +741,8 @@
if (mod is PointerInputModifier) {
wrapper = PointerInputDelegatingWrapper(wrapper, mod)
}
- if (mod is LayoutModifier2) {
- wrapper = ModifiedLayoutNode2(wrapper, mod)
+ if (mod is LayoutModifier) {
+ wrapper = ModifiedLayoutNode(wrapper, mod)
}
if (mod is ParentDataModifier) {
wrapper = ModifiedParentDataNode(wrapper, mod)
diff --git a/ui/ui-platform/src/main/java/androidx/ui/core/ModifiedLayoutNode.kt b/ui/ui-platform/src/main/java/androidx/ui/core/ModifiedLayoutNode.kt
index b2b33a8..690e5e51 100644
--- a/ui/ui-platform/src/main/java/androidx/ui/core/ModifiedLayoutNode.kt
+++ b/ui/ui-platform/src/main/java/androidx/ui/core/ModifiedLayoutNode.kt
@@ -21,12 +21,11 @@
import androidx.ui.graphics.Paint
import androidx.ui.graphics.PaintingStyle
import androidx.ui.unit.IntPx
-import androidx.ui.unit.IntPxSize
-internal class ModifiedLayoutNode2(
+internal class ModifiedLayoutNode(
wrapped: LayoutNodeWrapper,
- private val layoutModifier: LayoutModifier2
-) : DelegatingLayoutNodeWrapper<LayoutModifier2>(wrapped, layoutModifier) {
+ private val layoutModifier: LayoutModifier
+) : DelegatingLayoutNodeWrapper<LayoutModifier>(wrapped, layoutModifier) {
override val measureScope = ModifierMeasureScope()
@@ -36,7 +35,7 @@
): Placeable = with(layoutModifier) {
measureScope.layoutDirection = layoutDirection
measureResult = measureScope.measure(wrapped, constraints, layoutDirection)
- this@ModifiedLayoutNode2
+ this@ModifiedLayoutNode
}
override fun minIntrinsicWidth(height: IntPx, layoutDirection: LayoutDirection): IntPx =
diff --git a/ui/ui-tooling/src/androidTest/java/androidx/ui/tooling/ModifierInfoTest.kt b/ui/ui-tooling/src/androidTest/java/androidx/ui/tooling/ModifierInfoTest.kt
index 7938d34..2bb485a 100644
--- a/ui/ui-tooling/src/androidTest/java/androidx/ui/tooling/ModifierInfoTest.kt
+++ b/ui/ui-tooling/src/androidTest/java/androidx/ui/tooling/ModifierInfoTest.kt
@@ -20,7 +20,7 @@
import androidx.ui.core.DensityAmbient
import androidx.ui.core.DrawLayerModifier
import androidx.ui.core.DrawModifier
-import androidx.ui.core.LayoutModifier2
+import androidx.ui.core.LayoutModifier
import androidx.ui.core.Modifier
import androidx.ui.core.OwnedLayer
import androidx.ui.core.drawLayer
@@ -73,12 +73,12 @@
val boxModifierInfo = modifierInfo[0]
assertEquals(2, boxModifierInfo.size)
assertTrue("Box should only have LayoutModifiers, but the first was " +
- "${boxModifierInfo[0].modifier}", boxModifierInfo[0].modifier is LayoutModifier2)
+ "${boxModifierInfo[0].modifier}", boxModifierInfo[0].modifier is LayoutModifier)
assertEquals(10.px, boxModifierInfo[0].coordinates.positionInRoot.x)
assertTrue("Box should only have LayoutModifiers, but the second was " +
"${boxModifierInfo[1].modifier}",
- boxModifierInfo[1].modifier is androidx.ui.core.LayoutModifier2
+ boxModifierInfo[1].modifier is LayoutModifier
)
assertEquals(15.px, boxModifierInfo[1].coordinates.positionInRoot.x)
@@ -87,7 +87,7 @@
assertTrue(
"The first modifier in the column should be a LayoutModifier" +
"but was ${columnModifierInfo[0].modifier}",
- columnModifierInfo[0].modifier is LayoutModifier2
+ columnModifierInfo[0].modifier is LayoutModifier
)
assertEquals(0.px, columnModifierInfo[0].coordinates.positionInRoot.x)
assertTrue(