Change module and package of Dp, IntPx, etc to unit.
Moved units into ui-unit. Moved some basic utilities
to ui-util. Moved rect, etc into ui-geometry.
This is a start to making proper packages for ui-core classes.
Test: ran tests and connectedCheck
Change-Id: I45fe4a154c0f91cb1526cd73aad6e6e8bed3616a
diff --git a/ui/ui-layout/api/0.1.0-dev04.txt b/ui/ui-layout/api/0.1.0-dev04.txt
index 8cefaec..62add70 100644
--- a/ui/ui-layout/api/0.1.0-dev04.txt
+++ b/ui/ui-layout/api/0.1.0-dev04.txt
@@ -7,12 +7,12 @@
}
public final class AlignmentLineKt {
- method public static void AlignmentLineOffset(androidx.ui.core.AlignmentLine alignmentLine, androidx.ui.core.Dp before = 0.dp, androidx.ui.core.Dp after = 0.dp, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+ method public static void AlignmentLineOffset(androidx.ui.core.AlignmentLine alignmentLine, androidx.ui.unit.Dp before = 0.dp, androidx.ui.unit.Dp after = 0.dp, kotlin.jvm.functions.Function0<kotlin.Unit> children);
method public static void CenterAlignmentLine(androidx.ui.core.AlignmentLine alignmentLine, kotlin.jvm.functions.Function0<kotlin.Unit> children);
}
public final class Arrangement {
- ctor public Arrangement(internal kotlin.jvm.functions.Function2<? super androidx.ui.core.IntPx,? super java.util.List<androidx.ui.core.IntPx>,? extends java.util.List<androidx.ui.core.IntPx>> arrangeBlock);
+ ctor public Arrangement(internal kotlin.jvm.functions.Function2<? super androidx.ui.unit.IntPx,? super java.util.List<androidx.ui.unit.IntPx>,? extends java.util.List<androidx.ui.unit.IntPx>> arrangeBlock);
field public static final androidx.ui.layout.Arrangement.Companion! Companion;
}
@@ -46,7 +46,7 @@
}
public final class ContainerKt {
- method public static void Container(androidx.ui.core.Modifier modifier = Modifier.None, androidx.ui.layout.EdgeInsets padding = androidx.ui.layout.EdgeInsets(0.dp), androidx.ui.core.Alignment alignment = Alignment.Center, boolean expanded = false, androidx.ui.layout.DpConstraints constraints = androidx.ui.layout.DpConstraints(), androidx.ui.core.Dp? width = null, androidx.ui.core.Dp? height = null, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+ method public static void Container(androidx.ui.core.Modifier modifier = Modifier.None, androidx.ui.layout.EdgeInsets padding = androidx.ui.layout.EdgeInsets(0.dp), androidx.ui.core.Alignment alignment = Alignment.Center, boolean expanded = false, androidx.ui.layout.DpConstraints constraints = androidx.ui.layout.DpConstraints(), androidx.ui.unit.Dp? width = null, androidx.ui.unit.Dp? height = null, kotlin.jvm.functions.Function0<kotlin.Unit> children);
}
public final class CrossAxisAlignment {
@@ -66,29 +66,29 @@
}
public final class DpConstraints {
- ctor public DpConstraints(androidx.ui.core.Dp minWidth, androidx.ui.core.Dp maxWidth, androidx.ui.core.Dp minHeight, androidx.ui.core.Dp maxHeight);
+ ctor public DpConstraints(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp maxWidth, androidx.ui.unit.Dp minHeight, androidx.ui.unit.Dp maxHeight);
ctor public DpConstraints();
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.core.Dp component2();
- method public androidx.ui.core.Dp component3();
- method public androidx.ui.core.Dp component4();
- method public androidx.ui.layout.DpConstraints copy(androidx.ui.core.Dp minWidth, androidx.ui.core.Dp maxWidth, androidx.ui.core.Dp minHeight, androidx.ui.core.Dp maxHeight);
- method public androidx.ui.core.Dp getMaxHeight();
- method public androidx.ui.core.Dp getMaxWidth();
- method public androidx.ui.core.Dp getMinHeight();
- method public androidx.ui.core.Dp getMinWidth();
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.unit.Dp component2();
+ method public androidx.ui.unit.Dp component3();
+ method public androidx.ui.unit.Dp component4();
+ method public androidx.ui.layout.DpConstraints copy(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp maxWidth, androidx.ui.unit.Dp minHeight, androidx.ui.unit.Dp maxHeight);
+ method public androidx.ui.unit.Dp getMaxHeight();
+ method public androidx.ui.unit.Dp getMaxWidth();
+ method public androidx.ui.unit.Dp getMinHeight();
+ method public androidx.ui.unit.Dp getMinWidth();
field public static final androidx.ui.layout.DpConstraints.Companion! Companion;
}
public static final class DpConstraints.Companion {
- method public androidx.ui.layout.DpConstraints tightConstraints(androidx.ui.core.Dp width, androidx.ui.core.Dp height);
- method public androidx.ui.layout.DpConstraints tightConstraintsForHeight(androidx.ui.core.Dp height);
- method public androidx.ui.layout.DpConstraints tightConstraintsForWidth(androidx.ui.core.Dp width);
+ method public androidx.ui.layout.DpConstraints tightConstraints(androidx.ui.unit.Dp width, androidx.ui.unit.Dp height);
+ method public androidx.ui.layout.DpConstraints tightConstraintsForHeight(androidx.ui.unit.Dp height);
+ method public androidx.ui.layout.DpConstraints tightConstraintsForWidth(androidx.ui.unit.Dp width);
}
public final class DpConstraintsKt {
- method public static androidx.ui.core.Constraints Constraints(androidx.ui.core.DensityScope, androidx.ui.layout.DpConstraints dpConstraints);
- method public static androidx.ui.layout.DpConstraints DpConstraints(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints);
+ method public static androidx.ui.core.Constraints Constraints(androidx.ui.unit.DensityScope, androidx.ui.layout.DpConstraints dpConstraints);
+ method public static androidx.ui.layout.DpConstraints DpConstraints(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints);
method public static androidx.ui.layout.DpConstraints enforce(androidx.ui.layout.DpConstraints, androidx.ui.layout.DpConstraints otherConstraints);
method public static boolean getHasBoundedHeight(androidx.ui.layout.DpConstraints);
method public static boolean getHasBoundedWidth(androidx.ui.layout.DpConstraints);
@@ -99,25 +99,25 @@
method public static boolean isZero(androidx.ui.layout.DpConstraints);
method public static androidx.ui.layout.DpConstraints looseMax(androidx.ui.layout.DpConstraints);
method public static androidx.ui.layout.DpConstraints looseMin(androidx.ui.layout.DpConstraints);
- method public static androidx.ui.layout.DpConstraints offset(androidx.ui.layout.DpConstraints, androidx.ui.core.Dp horizontal = 0.dp, androidx.ui.core.Dp vertical = 0.dp);
+ method public static androidx.ui.layout.DpConstraints offset(androidx.ui.layout.DpConstraints, androidx.ui.unit.Dp horizontal = 0.dp, androidx.ui.unit.Dp vertical = 0.dp);
method public static androidx.ui.layout.DpConstraints tightMax(androidx.ui.layout.DpConstraints);
method public static androidx.ui.layout.DpConstraints tightMin(androidx.ui.layout.DpConstraints);
- method public static androidx.ui.layout.DpConstraints withTight(androidx.ui.layout.DpConstraints, androidx.ui.core.Dp? width = null, androidx.ui.core.Dp? height = null);
+ method public static androidx.ui.layout.DpConstraints withTight(androidx.ui.layout.DpConstraints, androidx.ui.unit.Dp? width = null, androidx.ui.unit.Dp? height = null);
}
public final class EdgeInsets {
- ctor public EdgeInsets(androidx.ui.core.Dp left, androidx.ui.core.Dp top, androidx.ui.core.Dp right, androidx.ui.core.Dp bottom);
+ ctor public EdgeInsets(androidx.ui.unit.Dp left, androidx.ui.unit.Dp top, androidx.ui.unit.Dp right, androidx.ui.unit.Dp bottom);
ctor public EdgeInsets();
- ctor public EdgeInsets(androidx.ui.core.Dp all);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.core.Dp component2();
- method public androidx.ui.core.Dp component3();
- method public androidx.ui.core.Dp component4();
- method public androidx.ui.layout.EdgeInsets copy(androidx.ui.core.Dp left, androidx.ui.core.Dp top, androidx.ui.core.Dp right, androidx.ui.core.Dp bottom);
- method public androidx.ui.core.Dp getBottom();
- method public androidx.ui.core.Dp getLeft();
- method public androidx.ui.core.Dp getRight();
- method public androidx.ui.core.Dp getTop();
+ ctor public EdgeInsets(androidx.ui.unit.Dp all);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.unit.Dp component2();
+ method public androidx.ui.unit.Dp component3();
+ method public androidx.ui.unit.Dp component4();
+ method public androidx.ui.layout.EdgeInsets copy(androidx.ui.unit.Dp left, androidx.ui.unit.Dp top, androidx.ui.unit.Dp right, androidx.ui.unit.Dp bottom);
+ method public androidx.ui.unit.Dp getBottom();
+ method public androidx.ui.unit.Dp getLeft();
+ method public androidx.ui.unit.Dp getRight();
+ method public androidx.ui.unit.Dp getTop();
}
public final class FlexChildren {
@@ -135,7 +135,7 @@
@androidx.ui.layout.LayoutScopeMarker public abstract sealed class FlexScope {
method public final androidx.ui.core.ParentDataModifier LayoutFlexible(@FloatRange(from=0.0, fromInclusive=false) float flex, boolean tight = true);
- method public final androidx.ui.core.ParentDataModifier RelativeToSiblings(androidx.ui.layout.LayoutGravity, kotlin.jvm.functions.Function1<? super androidx.ui.core.Placeable,androidx.ui.core.IntPx> alignmentLineBlock);
+ method public final androidx.ui.core.ParentDataModifier RelativeToSiblings(androidx.ui.layout.LayoutGravity, kotlin.jvm.functions.Function1<? super androidx.ui.core.Placeable,androidx.ui.unit.IntPx> alignmentLineBlock);
method public final androidx.ui.core.ParentDataModifier getLayoutInflexible();
property public final androidx.ui.core.ParentDataModifier LayoutInflexible;
}
@@ -147,8 +147,8 @@
}
public final class FlowKt {
- method public static void FlowColumn(androidx.ui.layout.SizeMode mainAxisSize = androidx.ui.layout.SizeMode.Wrap, androidx.ui.layout.MainAxisAlignment mainAxisAlignment = androidx.ui.layout.MainAxisAlignment.Start, androidx.ui.core.Dp mainAxisSpacing = 0.dp, androidx.ui.layout.FlowCrossAxisAlignment crossAxisAlignment = androidx.ui.layout.FlowCrossAxisAlignment.Start, androidx.ui.core.Dp crossAxisSpacing = 0.dp, androidx.ui.layout.MainAxisAlignment lastLineMainAxisAlignment = mainAxisAlignment, kotlin.jvm.functions.Function0<kotlin.Unit> children);
- method public static void FlowRow(androidx.ui.layout.SizeMode mainAxisSize = androidx.ui.layout.SizeMode.Wrap, androidx.ui.layout.MainAxisAlignment mainAxisAlignment = androidx.ui.layout.MainAxisAlignment.Start, androidx.ui.core.Dp mainAxisSpacing = 0.dp, androidx.ui.layout.FlowCrossAxisAlignment crossAxisAlignment = androidx.ui.layout.FlowCrossAxisAlignment.Start, androidx.ui.core.Dp crossAxisSpacing = 0.dp, androidx.ui.layout.MainAxisAlignment lastLineMainAxisAlignment = mainAxisAlignment, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+ method public static void FlowColumn(androidx.ui.layout.SizeMode mainAxisSize = androidx.ui.layout.SizeMode.Wrap, androidx.ui.layout.MainAxisAlignment mainAxisAlignment = androidx.ui.layout.MainAxisAlignment.Start, androidx.ui.unit.Dp mainAxisSpacing = 0.dp, androidx.ui.layout.FlowCrossAxisAlignment crossAxisAlignment = androidx.ui.layout.FlowCrossAxisAlignment.Start, androidx.ui.unit.Dp crossAxisSpacing = 0.dp, androidx.ui.layout.MainAxisAlignment lastLineMainAxisAlignment = mainAxisAlignment, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+ method public static void FlowRow(androidx.ui.layout.SizeMode mainAxisSize = androidx.ui.layout.SizeMode.Wrap, androidx.ui.layout.MainAxisAlignment mainAxisAlignment = androidx.ui.layout.MainAxisAlignment.Start, androidx.ui.unit.Dp mainAxisSpacing = 0.dp, androidx.ui.layout.FlowCrossAxisAlignment crossAxisAlignment = androidx.ui.layout.FlowCrossAxisAlignment.Start, androidx.ui.unit.Dp crossAxisSpacing = 0.dp, androidx.ui.layout.MainAxisAlignment lastLineMainAxisAlignment = mainAxisAlignment, kotlin.jvm.functions.Function0<kotlin.Unit> children);
}
public final class IntrinsicKt {
@@ -197,11 +197,11 @@
method public float component1();
method public androidx.ui.layout.LayoutAspectRatio copy(float aspectRatio);
method public float getAspectRatio();
- method public androidx.ui.core.IntPx maxIntrinsicHeightOf(androidx.ui.core.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.core.IntPx width);
- method public androidx.ui.core.IntPx maxIntrinsicWidthOf(androidx.ui.core.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.core.IntPx height);
- method public androidx.ui.core.IntPx minIntrinsicHeightOf(androidx.ui.core.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.core.IntPx width);
- method public androidx.ui.core.IntPx minIntrinsicWidthOf(androidx.ui.core.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.core.IntPx height);
- method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints);
+ method public androidx.ui.unit.IntPx maxIntrinsicHeightOf(androidx.ui.unit.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.unit.IntPx width);
+ method public androidx.ui.unit.IntPx maxIntrinsicWidthOf(androidx.ui.unit.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.unit.IntPx height);
+ method public androidx.ui.unit.IntPx minIntrinsicHeightOf(androidx.ui.unit.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.unit.IntPx width);
+ method public androidx.ui.unit.IntPx minIntrinsicWidthOf(androidx.ui.unit.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.unit.IntPx height);
+ method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints);
}
public final class LayoutGravity {
@@ -209,224 +209,224 @@
}
public final class LayoutHeight implements androidx.ui.core.LayoutModifier {
- ctor public LayoutHeight(androidx.ui.core.Dp height);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.layout.LayoutHeight copy(androidx.ui.core.Dp height);
+ ctor public LayoutHeight(androidx.ui.unit.Dp height);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.layout.LayoutHeight copy(androidx.ui.unit.Dp height);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getHeight();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getHeight();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public static final class LayoutHeight.Constrain implements androidx.ui.core.LayoutModifier {
- ctor public LayoutHeight.Constrain(androidx.ui.core.Dp minHeight, androidx.ui.core.Dp maxHeight);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.core.Dp component2();
- method public androidx.ui.layout.LayoutHeight.Constrain copy(androidx.ui.core.Dp minHeight, androidx.ui.core.Dp maxHeight);
+ ctor public LayoutHeight.Constrain(androidx.ui.unit.Dp minHeight, androidx.ui.unit.Dp maxHeight);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.unit.Dp component2();
+ method public androidx.ui.layout.LayoutHeight.Constrain copy(androidx.ui.unit.Dp minHeight, androidx.ui.unit.Dp maxHeight);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getMaxHeight();
- method public androidx.ui.core.Dp getMinHeight();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getMaxHeight();
+ method public androidx.ui.unit.Dp getMinHeight();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public static final class LayoutHeight.Fill implements androidx.ui.core.LayoutModifier {
- method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints);
+ method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints);
field public static final androidx.ui.layout.LayoutHeight.Fill! INSTANCE;
}
public static final class LayoutHeight.Max implements androidx.ui.core.LayoutModifier {
- ctor public LayoutHeight.Max(androidx.ui.core.Dp maxHeight);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.layout.LayoutHeight.Max copy(androidx.ui.core.Dp maxHeight);
+ ctor public LayoutHeight.Max(androidx.ui.unit.Dp maxHeight);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.layout.LayoutHeight.Max copy(androidx.ui.unit.Dp maxHeight);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getMaxHeight();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getMaxHeight();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public static final class LayoutHeight.Min implements androidx.ui.core.LayoutModifier {
- ctor public LayoutHeight.Min(androidx.ui.core.Dp minHeight);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.layout.LayoutHeight.Min copy(androidx.ui.core.Dp minHeight);
+ ctor public LayoutHeight.Min(androidx.ui.unit.Dp minHeight);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.layout.LayoutHeight.Min copy(androidx.ui.unit.Dp minHeight);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getMinHeight();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getMinHeight();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public final class LayoutPadding implements androidx.ui.core.LayoutModifier {
- ctor public LayoutPadding(androidx.ui.core.Dp left, androidx.ui.core.Dp top, androidx.ui.core.Dp right, androidx.ui.core.Dp bottom);
+ ctor public LayoutPadding(androidx.ui.unit.Dp left, androidx.ui.unit.Dp top, androidx.ui.unit.Dp right, androidx.ui.unit.Dp bottom);
ctor public LayoutPadding();
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.core.Dp component2();
- method public androidx.ui.core.Dp component3();
- method public androidx.ui.core.Dp component4();
- method public androidx.ui.layout.LayoutPadding copy(androidx.ui.core.Dp left, androidx.ui.core.Dp top, androidx.ui.core.Dp right, androidx.ui.core.Dp bottom);
- method public androidx.ui.core.Dp getBottom();
- method public androidx.ui.core.Dp getLeft();
- method public androidx.ui.core.Dp getRight();
- method public androidx.ui.core.Dp getTop();
- method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.unit.Dp component2();
+ method public androidx.ui.unit.Dp component3();
+ method public androidx.ui.unit.Dp component4();
+ method public androidx.ui.layout.LayoutPadding copy(androidx.ui.unit.Dp left, androidx.ui.unit.Dp top, androidx.ui.unit.Dp right, androidx.ui.unit.Dp bottom);
+ method public androidx.ui.unit.Dp getBottom();
+ method public androidx.ui.unit.Dp getLeft();
+ method public androidx.ui.unit.Dp getRight();
+ method public androidx.ui.unit.Dp getTop();
+ method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
}
@kotlin.DslMarker public @interface LayoutScopeMarker {
}
public final class LayoutSize implements androidx.ui.core.LayoutModifier {
- ctor public LayoutSize(androidx.ui.core.Dp width, androidx.ui.core.Dp height);
- ctor public LayoutSize(androidx.ui.core.Dp size);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.core.Dp component2();
- method public androidx.ui.layout.LayoutSize copy(androidx.ui.core.Dp width, androidx.ui.core.Dp height);
+ ctor public LayoutSize(androidx.ui.unit.Dp width, androidx.ui.unit.Dp height);
+ ctor public LayoutSize(androidx.ui.unit.Dp size);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.unit.Dp component2();
+ method public androidx.ui.layout.LayoutSize copy(androidx.ui.unit.Dp width, androidx.ui.unit.Dp height);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getHeight();
- method public androidx.ui.core.Dp getWidth();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getHeight();
+ method public androidx.ui.unit.Dp getWidth();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public static final class LayoutSize.Constrain implements androidx.ui.core.LayoutModifier {
- ctor public LayoutSize.Constrain(androidx.ui.core.Dp minWidth, androidx.ui.core.Dp minHeight, androidx.ui.core.Dp maxWidth, androidx.ui.core.Dp maxHeight);
- ctor public LayoutSize.Constrain(androidx.ui.core.Dp minSize, androidx.ui.core.Dp maxSize);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.core.Dp component2();
- method public androidx.ui.core.Dp component3();
- method public androidx.ui.core.Dp component4();
- method public androidx.ui.layout.LayoutSize.Constrain copy(androidx.ui.core.Dp minWidth, androidx.ui.core.Dp minHeight, androidx.ui.core.Dp maxWidth, androidx.ui.core.Dp maxHeight);
+ ctor public LayoutSize.Constrain(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp minHeight, androidx.ui.unit.Dp maxWidth, androidx.ui.unit.Dp maxHeight);
+ ctor public LayoutSize.Constrain(androidx.ui.unit.Dp minSize, androidx.ui.unit.Dp maxSize);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.unit.Dp component2();
+ method public androidx.ui.unit.Dp component3();
+ method public androidx.ui.unit.Dp component4();
+ method public androidx.ui.layout.LayoutSize.Constrain copy(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp minHeight, androidx.ui.unit.Dp maxWidth, androidx.ui.unit.Dp maxHeight);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getMaxHeight();
- method public androidx.ui.core.Dp getMaxWidth();
- method public androidx.ui.core.Dp getMinHeight();
- method public androidx.ui.core.Dp getMinWidth();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getMaxHeight();
+ method public androidx.ui.unit.Dp getMaxWidth();
+ method public androidx.ui.unit.Dp getMinHeight();
+ method public androidx.ui.unit.Dp getMinWidth();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public static final class LayoutSize.Fill implements androidx.ui.core.LayoutModifier {
- method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints);
+ method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints);
field public static final androidx.ui.layout.LayoutSize.Fill! INSTANCE;
}
public static final class LayoutSize.Max implements androidx.ui.core.LayoutModifier {
- ctor public LayoutSize.Max(androidx.ui.core.Dp maxWidth, androidx.ui.core.Dp maxHeight);
- ctor public LayoutSize.Max(androidx.ui.core.Dp maxSize);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.core.Dp component2();
- method public androidx.ui.layout.LayoutSize.Max copy(androidx.ui.core.Dp maxWidth, androidx.ui.core.Dp maxHeight);
+ ctor public LayoutSize.Max(androidx.ui.unit.Dp maxWidth, androidx.ui.unit.Dp maxHeight);
+ ctor public LayoutSize.Max(androidx.ui.unit.Dp maxSize);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.unit.Dp component2();
+ method public androidx.ui.layout.LayoutSize.Max copy(androidx.ui.unit.Dp maxWidth, androidx.ui.unit.Dp maxHeight);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getMaxHeight();
- method public androidx.ui.core.Dp getMaxWidth();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getMaxHeight();
+ method public androidx.ui.unit.Dp getMaxWidth();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public static final class LayoutSize.Min implements androidx.ui.core.LayoutModifier {
- ctor public LayoutSize.Min(androidx.ui.core.Dp minWidth, androidx.ui.core.Dp minHeight);
- ctor public LayoutSize.Min(androidx.ui.core.Dp minSize);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.core.Dp component2();
- method public androidx.ui.layout.LayoutSize.Min copy(androidx.ui.core.Dp minWidth, androidx.ui.core.Dp minHeight);
+ ctor public LayoutSize.Min(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp minHeight);
+ ctor public LayoutSize.Min(androidx.ui.unit.Dp minSize);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.unit.Dp component2();
+ method public androidx.ui.layout.LayoutSize.Min copy(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp minHeight);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getMinHeight();
- method public androidx.ui.core.Dp getMinWidth();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getMinHeight();
+ method public androidx.ui.unit.Dp getMinWidth();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public final class LayoutWidth implements androidx.ui.core.LayoutModifier {
- ctor public LayoutWidth(androidx.ui.core.Dp width);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.layout.LayoutWidth copy(androidx.ui.core.Dp width);
+ ctor public LayoutWidth(androidx.ui.unit.Dp width);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.layout.LayoutWidth copy(androidx.ui.unit.Dp width);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getWidth();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getWidth();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public static final class LayoutWidth.Constrain implements androidx.ui.core.LayoutModifier {
- ctor public LayoutWidth.Constrain(androidx.ui.core.Dp minWidth, androidx.ui.core.Dp maxWidth);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.core.Dp component2();
- method public androidx.ui.layout.LayoutWidth.Constrain copy(androidx.ui.core.Dp minWidth, androidx.ui.core.Dp maxWidth);
+ ctor public LayoutWidth.Constrain(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp maxWidth);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.unit.Dp component2();
+ method public androidx.ui.layout.LayoutWidth.Constrain copy(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp maxWidth);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getMaxWidth();
- method public androidx.ui.core.Dp getMinWidth();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getMaxWidth();
+ method public androidx.ui.unit.Dp getMinWidth();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public static final class LayoutWidth.Fill implements androidx.ui.core.LayoutModifier {
- method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints);
+ method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints);
field public static final androidx.ui.layout.LayoutWidth.Fill! INSTANCE;
}
public static final class LayoutWidth.Max implements androidx.ui.core.LayoutModifier {
- ctor public LayoutWidth.Max(androidx.ui.core.Dp maxWidth);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.layout.LayoutWidth.Max copy(androidx.ui.core.Dp maxWidth);
+ ctor public LayoutWidth.Max(androidx.ui.unit.Dp maxWidth);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.layout.LayoutWidth.Max copy(androidx.ui.unit.Dp maxWidth);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getMaxWidth();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getMaxWidth();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public static final class LayoutWidth.Min implements androidx.ui.core.LayoutModifier {
- ctor public LayoutWidth.Min(androidx.ui.core.Dp minWidth);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.layout.LayoutWidth.Min copy(androidx.ui.core.Dp minWidth);
+ ctor public LayoutWidth.Min(androidx.ui.unit.Dp minWidth);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.layout.LayoutWidth.Min copy(androidx.ui.unit.Dp minWidth);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getMinWidth();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getMinWidth();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
@@ -441,12 +441,12 @@
}
public final class PaddingKt {
- method public static androidx.ui.layout.LayoutPadding LayoutPadding(androidx.ui.core.Dp all);
+ method public static androidx.ui.layout.LayoutPadding LayoutPadding(androidx.ui.unit.Dp all);
method public static void Padding(androidx.ui.layout.EdgeInsets padding, kotlin.jvm.functions.Function0<kotlin.Unit> children);
- method public static void Padding(androidx.ui.core.Dp left = 0.dp, androidx.ui.core.Dp top = 0.dp, androidx.ui.core.Dp right = 0.dp, androidx.ui.core.Dp bottom = 0.dp, kotlin.jvm.functions.Function0<kotlin.Unit> children);
- method public static void Padding(androidx.ui.core.Dp padding, kotlin.jvm.functions.Function0<kotlin.Unit> children);
- method @Deprecated public static androidx.ui.core.LayoutModifier Spacing(androidx.ui.core.Dp left = 0.dp, androidx.ui.core.Dp top = 0.dp, androidx.ui.core.Dp right = 0.dp, androidx.ui.core.Dp bottom = 0.dp);
- method @Deprecated public static androidx.ui.core.LayoutModifier Spacing(androidx.ui.core.Dp all = 0.dp);
+ method public static void Padding(androidx.ui.unit.Dp left = 0.dp, androidx.ui.unit.Dp top = 0.dp, androidx.ui.unit.Dp right = 0.dp, androidx.ui.unit.Dp bottom = 0.dp, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+ method public static void Padding(androidx.ui.unit.Dp padding, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+ method @Deprecated public static androidx.ui.core.LayoutModifier Spacing(androidx.ui.unit.Dp left = 0.dp, androidx.ui.unit.Dp top = 0.dp, androidx.ui.unit.Dp right = 0.dp, androidx.ui.unit.Dp bottom = 0.dp);
+ method @Deprecated public static androidx.ui.core.LayoutModifier Spacing(androidx.ui.unit.Dp all = 0.dp);
}
public final class RowScope extends androidx.ui.layout.FlexScope {
@@ -502,27 +502,27 @@
}
public abstract class TableColumnWidth {
- method public androidx.ui.core.IntPx maxIntrinsicWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density, androidx.ui.core.IntPx availableHeight);
- method public androidx.ui.core.IntPx minIntrinsicWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density, androidx.ui.core.IntPx availableHeight);
- method public abstract androidx.ui.core.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density);
+ method public androidx.ui.unit.IntPx maxIntrinsicWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density, androidx.ui.unit.IntPx availableHeight);
+ method public androidx.ui.unit.IntPx minIntrinsicWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density, androidx.ui.unit.IntPx availableHeight);
+ method public abstract androidx.ui.unit.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density);
}
public static final class TableColumnWidth.Fixed extends androidx.ui.layout.TableColumnWidth.Inflexible {
- ctor public TableColumnWidth.Fixed(androidx.ui.core.Dp width);
- method public androidx.ui.layout.TableColumnWidth.Fixed copy(androidx.ui.core.Dp width);
- method public androidx.ui.core.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density);
+ ctor public TableColumnWidth.Fixed(androidx.ui.unit.Dp width);
+ method public androidx.ui.layout.TableColumnWidth.Fixed copy(androidx.ui.unit.Dp width);
+ method public androidx.ui.unit.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density);
}
public static final class TableColumnWidth.Flex extends androidx.ui.layout.TableColumnWidth {
ctor public TableColumnWidth.Flex(@FloatRange(from=null) float flex);
method public androidx.ui.layout.TableColumnWidth.Flex copy(float flex);
- method public androidx.ui.core.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density);
+ method public androidx.ui.unit.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density);
}
public static final class TableColumnWidth.Fraction extends androidx.ui.layout.TableColumnWidth.Inflexible {
ctor public TableColumnWidth.Fraction(@FloatRange(from=null, to=null) float fraction);
method public androidx.ui.layout.TableColumnWidth.Fraction copy(float fraction);
- method public androidx.ui.core.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density);
+ method public androidx.ui.unit.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density);
}
public abstract static class TableColumnWidth.Inflexible extends androidx.ui.layout.TableColumnWidth {
@@ -533,36 +533,36 @@
public static final class TableColumnWidth.Max extends androidx.ui.layout.TableColumnWidth.Inflexible {
ctor public TableColumnWidth.Max(androidx.ui.layout.TableColumnWidth.Inflexible a, androidx.ui.layout.TableColumnWidth.Inflexible b);
method public androidx.ui.layout.TableColumnWidth.Max copy(androidx.ui.layout.TableColumnWidth.Inflexible a, androidx.ui.layout.TableColumnWidth.Inflexible b);
- method public androidx.ui.core.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density);
+ method public androidx.ui.unit.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density);
}
public static final class TableColumnWidth.MaxIntrinsic extends androidx.ui.layout.TableColumnWidth.Inflexible {
- method public androidx.ui.core.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density);
+ method public androidx.ui.unit.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density);
field public static final androidx.ui.layout.TableColumnWidth.MaxIntrinsic! INSTANCE;
}
public static final class TableColumnWidth.Min extends androidx.ui.layout.TableColumnWidth.Inflexible {
ctor public TableColumnWidth.Min(androidx.ui.layout.TableColumnWidth.Inflexible a, androidx.ui.layout.TableColumnWidth.Inflexible b);
method public androidx.ui.layout.TableColumnWidth.Min copy(androidx.ui.layout.TableColumnWidth.Inflexible a, androidx.ui.layout.TableColumnWidth.Inflexible b);
- method public androidx.ui.core.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density);
+ method public androidx.ui.unit.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density);
}
public static final class TableColumnWidth.MinIntrinsic extends androidx.ui.layout.TableColumnWidth.Inflexible {
- method public androidx.ui.core.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density);
+ method public androidx.ui.unit.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density);
field public static final androidx.ui.layout.TableColumnWidth.MinIntrinsic! INSTANCE;
}
public static final class TableColumnWidth.Wrap extends androidx.ui.layout.TableColumnWidth.Inflexible {
- method public androidx.ui.core.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density);
+ method public androidx.ui.unit.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density);
field public static final androidx.ui.layout.TableColumnWidth.Wrap! INSTANCE;
}
public final class TableDecorationChildren {
- method public java.util.List<androidx.ui.core.IntPx> component1();
- method public java.util.List<androidx.ui.core.IntPx> component2();
- method public androidx.ui.layout.TableDecorationChildren copy(java.util.List<androidx.ui.core.IntPx> verticalOffsets, java.util.List<androidx.ui.core.IntPx> horizontalOffsets);
- method public java.util.List<androidx.ui.core.IntPx> getHorizontalOffsets();
- method public java.util.List<androidx.ui.core.IntPx> getVerticalOffsets();
+ method public java.util.List<androidx.ui.unit.IntPx> component1();
+ method public java.util.List<androidx.ui.unit.IntPx> component2();
+ method public androidx.ui.layout.TableDecorationChildren copy(java.util.List<androidx.ui.unit.IntPx> verticalOffsets, java.util.List<androidx.ui.unit.IntPx> horizontalOffsets);
+ method public java.util.List<androidx.ui.unit.IntPx> getHorizontalOffsets();
+ method public java.util.List<androidx.ui.unit.IntPx> getVerticalOffsets();
}
public final class TableKt {
@@ -570,13 +570,13 @@
}
public final class TableMeasurable {
- method public kotlin.jvm.functions.Function0<androidx.ui.core.IntPx> component1();
- method public kotlin.jvm.functions.Function1<androidx.ui.core.IntPx,androidx.ui.core.IntPx> component2();
- method public kotlin.jvm.functions.Function1<androidx.ui.core.IntPx,androidx.ui.core.IntPx> component3();
- method public androidx.ui.layout.TableMeasurable copy(kotlin.jvm.functions.Function0<androidx.ui.core.IntPx> preferredWidth, kotlin.jvm.functions.Function1<? super androidx.ui.core.IntPx,androidx.ui.core.IntPx> minIntrinsicWidth, kotlin.jvm.functions.Function1<? super androidx.ui.core.IntPx,androidx.ui.core.IntPx> maxIntrinsicWidth);
- method public kotlin.jvm.functions.Function1<androidx.ui.core.IntPx,androidx.ui.core.IntPx> getMaxIntrinsicWidth();
- method public kotlin.jvm.functions.Function1<androidx.ui.core.IntPx,androidx.ui.core.IntPx> getMinIntrinsicWidth();
- method public kotlin.jvm.functions.Function0<androidx.ui.core.IntPx> getPreferredWidth();
+ method public kotlin.jvm.functions.Function0<androidx.ui.unit.IntPx> component1();
+ method public kotlin.jvm.functions.Function1<androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> component2();
+ method public kotlin.jvm.functions.Function1<androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> component3();
+ method public androidx.ui.layout.TableMeasurable copy(kotlin.jvm.functions.Function0<androidx.ui.unit.IntPx> preferredWidth, kotlin.jvm.functions.Function1<? super androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> minIntrinsicWidth, kotlin.jvm.functions.Function1<? super androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> maxIntrinsicWidth);
+ method public kotlin.jvm.functions.Function1<androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> getMaxIntrinsicWidth();
+ method public kotlin.jvm.functions.Function1<androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> getMinIntrinsicWidth();
+ method public kotlin.jvm.functions.Function0<androidx.ui.unit.IntPx> getPreferredWidth();
}
public final class WrapKt {
@@ -599,13 +599,13 @@
public final class ConstraintSetBuilderScope {
method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalAnchor.BarrierAnchor createBottomBarrier(androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.ConstrainedLayoutReference... elements);
- method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalAnchor.GuidelineAnchor createGuidelineFromBottom(androidx.ui.core.Dp offset);
+ method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalAnchor.GuidelineAnchor createGuidelineFromBottom(androidx.ui.unit.Dp offset);
method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalAnchor.GuidelineAnchor createGuidelineFromBottom(float percent);
- method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.VerticalAnchor.GuidelineAnchor createGuidelineFromLeft(androidx.ui.core.Dp offset);
+ method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.VerticalAnchor.GuidelineAnchor createGuidelineFromLeft(androidx.ui.unit.Dp offset);
method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.VerticalAnchor.GuidelineAnchor createGuidelineFromLeft(float percent);
- method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.VerticalAnchor.GuidelineAnchor createGuidelineFromRight(androidx.ui.core.Dp offset);
+ method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.VerticalAnchor.GuidelineAnchor createGuidelineFromRight(androidx.ui.unit.Dp offset);
method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.VerticalAnchor.GuidelineAnchor createGuidelineFromRight(float percent);
- method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalAnchor.GuidelineAnchor createGuidelineFromTop(androidx.ui.core.Dp offset);
+ method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalAnchor.GuidelineAnchor createGuidelineFromTop(androidx.ui.unit.Dp offset);
method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalAnchor.GuidelineAnchor createGuidelineFromTop(float percent);
method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalChain createHorizontalChain(androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.ConstrainedLayoutReference![] elements, androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.ChainStyle chainStyle = ChainStyle.Spread);
method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.VerticalAnchor.BarrierAnchor createLeftBarrier(androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.ConstrainedLayoutReference... elements);
@@ -672,21 +672,21 @@
public static final class ConstraintSetBuilderScope.HorizontalAnchor.BarrierAnchor extends androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalAnchor {
method public int getIndex$lintWithKotlin();
- method public androidx.ui.core.Dp getMargin();
+ method public androidx.ui.unit.Dp getMargin();
method public androidx.constraintlayout.solver.state.State getState$lintWithKotlin();
method public Object getTag$lintWithKotlin();
- method public void setMargin(androidx.ui.core.Dp value);
- property public final androidx.ui.core.Dp margin;
+ method public void setMargin(androidx.ui.unit.Dp value);
+ property public final androidx.ui.unit.Dp margin;
}
public static final class ConstraintSetBuilderScope.HorizontalAnchor.ConstrainedLayoutAnchor extends androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalAnchor {
method public infix void constrainTo(androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalAnchor other);
method public int getIndex$lintWithKotlin();
- method public androidx.ui.core.Dp getMargin();
+ method public androidx.ui.unit.Dp getMargin();
method public androidx.constraintlayout.solver.state.State getState$lintWithKotlin();
method public Object getTag$lintWithKotlin();
- method public void setMargin(androidx.ui.core.Dp value);
- property public final androidx.ui.core.Dp margin;
+ method public void setMargin(androidx.ui.unit.Dp value);
+ property public final androidx.ui.unit.Dp margin;
property public Object tag;
}
@@ -709,21 +709,21 @@
public static final class ConstraintSetBuilderScope.VerticalAnchor.BarrierAnchor extends androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.VerticalAnchor {
method public int getIndex$lintWithKotlin();
- method public androidx.ui.core.Dp getMargin();
+ method public androidx.ui.unit.Dp getMargin();
method public androidx.constraintlayout.solver.state.State getState$lintWithKotlin();
method public Object getTag$lintWithKotlin();
- method public void setMargin(androidx.ui.core.Dp value);
- property public final androidx.ui.core.Dp margin;
+ method public void setMargin(androidx.ui.unit.Dp value);
+ property public final androidx.ui.unit.Dp margin;
}
public static final class ConstraintSetBuilderScope.VerticalAnchor.ConstrainedLayoutAnchor extends androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.VerticalAnchor {
method public infix void constrainTo(androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.VerticalAnchor other);
method public int getIndex$lintWithKotlin();
- method public androidx.ui.core.Dp getMargin();
+ method public androidx.ui.unit.Dp getMargin();
method public androidx.constraintlayout.solver.state.State getState$lintWithKotlin();
method public Object getTag$lintWithKotlin();
- method public void setMargin(androidx.ui.core.Dp value);
- property public final androidx.ui.core.Dp margin;
+ method public void setMargin(androidx.ui.unit.Dp value);
+ property public final androidx.ui.unit.Dp margin;
property public Object tag;
}
diff --git a/ui/ui-layout/api/current.txt b/ui/ui-layout/api/current.txt
index 8cefaec..62add70 100644
--- a/ui/ui-layout/api/current.txt
+++ b/ui/ui-layout/api/current.txt
@@ -7,12 +7,12 @@
}
public final class AlignmentLineKt {
- method public static void AlignmentLineOffset(androidx.ui.core.AlignmentLine alignmentLine, androidx.ui.core.Dp before = 0.dp, androidx.ui.core.Dp after = 0.dp, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+ method public static void AlignmentLineOffset(androidx.ui.core.AlignmentLine alignmentLine, androidx.ui.unit.Dp before = 0.dp, androidx.ui.unit.Dp after = 0.dp, kotlin.jvm.functions.Function0<kotlin.Unit> children);
method public static void CenterAlignmentLine(androidx.ui.core.AlignmentLine alignmentLine, kotlin.jvm.functions.Function0<kotlin.Unit> children);
}
public final class Arrangement {
- ctor public Arrangement(internal kotlin.jvm.functions.Function2<? super androidx.ui.core.IntPx,? super java.util.List<androidx.ui.core.IntPx>,? extends java.util.List<androidx.ui.core.IntPx>> arrangeBlock);
+ ctor public Arrangement(internal kotlin.jvm.functions.Function2<? super androidx.ui.unit.IntPx,? super java.util.List<androidx.ui.unit.IntPx>,? extends java.util.List<androidx.ui.unit.IntPx>> arrangeBlock);
field public static final androidx.ui.layout.Arrangement.Companion! Companion;
}
@@ -46,7 +46,7 @@
}
public final class ContainerKt {
- method public static void Container(androidx.ui.core.Modifier modifier = Modifier.None, androidx.ui.layout.EdgeInsets padding = androidx.ui.layout.EdgeInsets(0.dp), androidx.ui.core.Alignment alignment = Alignment.Center, boolean expanded = false, androidx.ui.layout.DpConstraints constraints = androidx.ui.layout.DpConstraints(), androidx.ui.core.Dp? width = null, androidx.ui.core.Dp? height = null, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+ method public static void Container(androidx.ui.core.Modifier modifier = Modifier.None, androidx.ui.layout.EdgeInsets padding = androidx.ui.layout.EdgeInsets(0.dp), androidx.ui.core.Alignment alignment = Alignment.Center, boolean expanded = false, androidx.ui.layout.DpConstraints constraints = androidx.ui.layout.DpConstraints(), androidx.ui.unit.Dp? width = null, androidx.ui.unit.Dp? height = null, kotlin.jvm.functions.Function0<kotlin.Unit> children);
}
public final class CrossAxisAlignment {
@@ -66,29 +66,29 @@
}
public final class DpConstraints {
- ctor public DpConstraints(androidx.ui.core.Dp minWidth, androidx.ui.core.Dp maxWidth, androidx.ui.core.Dp minHeight, androidx.ui.core.Dp maxHeight);
+ ctor public DpConstraints(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp maxWidth, androidx.ui.unit.Dp minHeight, androidx.ui.unit.Dp maxHeight);
ctor public DpConstraints();
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.core.Dp component2();
- method public androidx.ui.core.Dp component3();
- method public androidx.ui.core.Dp component4();
- method public androidx.ui.layout.DpConstraints copy(androidx.ui.core.Dp minWidth, androidx.ui.core.Dp maxWidth, androidx.ui.core.Dp minHeight, androidx.ui.core.Dp maxHeight);
- method public androidx.ui.core.Dp getMaxHeight();
- method public androidx.ui.core.Dp getMaxWidth();
- method public androidx.ui.core.Dp getMinHeight();
- method public androidx.ui.core.Dp getMinWidth();
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.unit.Dp component2();
+ method public androidx.ui.unit.Dp component3();
+ method public androidx.ui.unit.Dp component4();
+ method public androidx.ui.layout.DpConstraints copy(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp maxWidth, androidx.ui.unit.Dp minHeight, androidx.ui.unit.Dp maxHeight);
+ method public androidx.ui.unit.Dp getMaxHeight();
+ method public androidx.ui.unit.Dp getMaxWidth();
+ method public androidx.ui.unit.Dp getMinHeight();
+ method public androidx.ui.unit.Dp getMinWidth();
field public static final androidx.ui.layout.DpConstraints.Companion! Companion;
}
public static final class DpConstraints.Companion {
- method public androidx.ui.layout.DpConstraints tightConstraints(androidx.ui.core.Dp width, androidx.ui.core.Dp height);
- method public androidx.ui.layout.DpConstraints tightConstraintsForHeight(androidx.ui.core.Dp height);
- method public androidx.ui.layout.DpConstraints tightConstraintsForWidth(androidx.ui.core.Dp width);
+ method public androidx.ui.layout.DpConstraints tightConstraints(androidx.ui.unit.Dp width, androidx.ui.unit.Dp height);
+ method public androidx.ui.layout.DpConstraints tightConstraintsForHeight(androidx.ui.unit.Dp height);
+ method public androidx.ui.layout.DpConstraints tightConstraintsForWidth(androidx.ui.unit.Dp width);
}
public final class DpConstraintsKt {
- method public static androidx.ui.core.Constraints Constraints(androidx.ui.core.DensityScope, androidx.ui.layout.DpConstraints dpConstraints);
- method public static androidx.ui.layout.DpConstraints DpConstraints(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints);
+ method public static androidx.ui.core.Constraints Constraints(androidx.ui.unit.DensityScope, androidx.ui.layout.DpConstraints dpConstraints);
+ method public static androidx.ui.layout.DpConstraints DpConstraints(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints);
method public static androidx.ui.layout.DpConstraints enforce(androidx.ui.layout.DpConstraints, androidx.ui.layout.DpConstraints otherConstraints);
method public static boolean getHasBoundedHeight(androidx.ui.layout.DpConstraints);
method public static boolean getHasBoundedWidth(androidx.ui.layout.DpConstraints);
@@ -99,25 +99,25 @@
method public static boolean isZero(androidx.ui.layout.DpConstraints);
method public static androidx.ui.layout.DpConstraints looseMax(androidx.ui.layout.DpConstraints);
method public static androidx.ui.layout.DpConstraints looseMin(androidx.ui.layout.DpConstraints);
- method public static androidx.ui.layout.DpConstraints offset(androidx.ui.layout.DpConstraints, androidx.ui.core.Dp horizontal = 0.dp, androidx.ui.core.Dp vertical = 0.dp);
+ method public static androidx.ui.layout.DpConstraints offset(androidx.ui.layout.DpConstraints, androidx.ui.unit.Dp horizontal = 0.dp, androidx.ui.unit.Dp vertical = 0.dp);
method public static androidx.ui.layout.DpConstraints tightMax(androidx.ui.layout.DpConstraints);
method public static androidx.ui.layout.DpConstraints tightMin(androidx.ui.layout.DpConstraints);
- method public static androidx.ui.layout.DpConstraints withTight(androidx.ui.layout.DpConstraints, androidx.ui.core.Dp? width = null, androidx.ui.core.Dp? height = null);
+ method public static androidx.ui.layout.DpConstraints withTight(androidx.ui.layout.DpConstraints, androidx.ui.unit.Dp? width = null, androidx.ui.unit.Dp? height = null);
}
public final class EdgeInsets {
- ctor public EdgeInsets(androidx.ui.core.Dp left, androidx.ui.core.Dp top, androidx.ui.core.Dp right, androidx.ui.core.Dp bottom);
+ ctor public EdgeInsets(androidx.ui.unit.Dp left, androidx.ui.unit.Dp top, androidx.ui.unit.Dp right, androidx.ui.unit.Dp bottom);
ctor public EdgeInsets();
- ctor public EdgeInsets(androidx.ui.core.Dp all);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.core.Dp component2();
- method public androidx.ui.core.Dp component3();
- method public androidx.ui.core.Dp component4();
- method public androidx.ui.layout.EdgeInsets copy(androidx.ui.core.Dp left, androidx.ui.core.Dp top, androidx.ui.core.Dp right, androidx.ui.core.Dp bottom);
- method public androidx.ui.core.Dp getBottom();
- method public androidx.ui.core.Dp getLeft();
- method public androidx.ui.core.Dp getRight();
- method public androidx.ui.core.Dp getTop();
+ ctor public EdgeInsets(androidx.ui.unit.Dp all);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.unit.Dp component2();
+ method public androidx.ui.unit.Dp component3();
+ method public androidx.ui.unit.Dp component4();
+ method public androidx.ui.layout.EdgeInsets copy(androidx.ui.unit.Dp left, androidx.ui.unit.Dp top, androidx.ui.unit.Dp right, androidx.ui.unit.Dp bottom);
+ method public androidx.ui.unit.Dp getBottom();
+ method public androidx.ui.unit.Dp getLeft();
+ method public androidx.ui.unit.Dp getRight();
+ method public androidx.ui.unit.Dp getTop();
}
public final class FlexChildren {
@@ -135,7 +135,7 @@
@androidx.ui.layout.LayoutScopeMarker public abstract sealed class FlexScope {
method public final androidx.ui.core.ParentDataModifier LayoutFlexible(@FloatRange(from=0.0, fromInclusive=false) float flex, boolean tight = true);
- method public final androidx.ui.core.ParentDataModifier RelativeToSiblings(androidx.ui.layout.LayoutGravity, kotlin.jvm.functions.Function1<? super androidx.ui.core.Placeable,androidx.ui.core.IntPx> alignmentLineBlock);
+ method public final androidx.ui.core.ParentDataModifier RelativeToSiblings(androidx.ui.layout.LayoutGravity, kotlin.jvm.functions.Function1<? super androidx.ui.core.Placeable,androidx.ui.unit.IntPx> alignmentLineBlock);
method public final androidx.ui.core.ParentDataModifier getLayoutInflexible();
property public final androidx.ui.core.ParentDataModifier LayoutInflexible;
}
@@ -147,8 +147,8 @@
}
public final class FlowKt {
- method public static void FlowColumn(androidx.ui.layout.SizeMode mainAxisSize = androidx.ui.layout.SizeMode.Wrap, androidx.ui.layout.MainAxisAlignment mainAxisAlignment = androidx.ui.layout.MainAxisAlignment.Start, androidx.ui.core.Dp mainAxisSpacing = 0.dp, androidx.ui.layout.FlowCrossAxisAlignment crossAxisAlignment = androidx.ui.layout.FlowCrossAxisAlignment.Start, androidx.ui.core.Dp crossAxisSpacing = 0.dp, androidx.ui.layout.MainAxisAlignment lastLineMainAxisAlignment = mainAxisAlignment, kotlin.jvm.functions.Function0<kotlin.Unit> children);
- method public static void FlowRow(androidx.ui.layout.SizeMode mainAxisSize = androidx.ui.layout.SizeMode.Wrap, androidx.ui.layout.MainAxisAlignment mainAxisAlignment = androidx.ui.layout.MainAxisAlignment.Start, androidx.ui.core.Dp mainAxisSpacing = 0.dp, androidx.ui.layout.FlowCrossAxisAlignment crossAxisAlignment = androidx.ui.layout.FlowCrossAxisAlignment.Start, androidx.ui.core.Dp crossAxisSpacing = 0.dp, androidx.ui.layout.MainAxisAlignment lastLineMainAxisAlignment = mainAxisAlignment, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+ method public static void FlowColumn(androidx.ui.layout.SizeMode mainAxisSize = androidx.ui.layout.SizeMode.Wrap, androidx.ui.layout.MainAxisAlignment mainAxisAlignment = androidx.ui.layout.MainAxisAlignment.Start, androidx.ui.unit.Dp mainAxisSpacing = 0.dp, androidx.ui.layout.FlowCrossAxisAlignment crossAxisAlignment = androidx.ui.layout.FlowCrossAxisAlignment.Start, androidx.ui.unit.Dp crossAxisSpacing = 0.dp, androidx.ui.layout.MainAxisAlignment lastLineMainAxisAlignment = mainAxisAlignment, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+ method public static void FlowRow(androidx.ui.layout.SizeMode mainAxisSize = androidx.ui.layout.SizeMode.Wrap, androidx.ui.layout.MainAxisAlignment mainAxisAlignment = androidx.ui.layout.MainAxisAlignment.Start, androidx.ui.unit.Dp mainAxisSpacing = 0.dp, androidx.ui.layout.FlowCrossAxisAlignment crossAxisAlignment = androidx.ui.layout.FlowCrossAxisAlignment.Start, androidx.ui.unit.Dp crossAxisSpacing = 0.dp, androidx.ui.layout.MainAxisAlignment lastLineMainAxisAlignment = mainAxisAlignment, kotlin.jvm.functions.Function0<kotlin.Unit> children);
}
public final class IntrinsicKt {
@@ -197,11 +197,11 @@
method public float component1();
method public androidx.ui.layout.LayoutAspectRatio copy(float aspectRatio);
method public float getAspectRatio();
- method public androidx.ui.core.IntPx maxIntrinsicHeightOf(androidx.ui.core.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.core.IntPx width);
- method public androidx.ui.core.IntPx maxIntrinsicWidthOf(androidx.ui.core.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.core.IntPx height);
- method public androidx.ui.core.IntPx minIntrinsicHeightOf(androidx.ui.core.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.core.IntPx width);
- method public androidx.ui.core.IntPx minIntrinsicWidthOf(androidx.ui.core.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.core.IntPx height);
- method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints);
+ method public androidx.ui.unit.IntPx maxIntrinsicHeightOf(androidx.ui.unit.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.unit.IntPx width);
+ method public androidx.ui.unit.IntPx maxIntrinsicWidthOf(androidx.ui.unit.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.unit.IntPx height);
+ method public androidx.ui.unit.IntPx minIntrinsicHeightOf(androidx.ui.unit.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.unit.IntPx width);
+ method public androidx.ui.unit.IntPx minIntrinsicWidthOf(androidx.ui.unit.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.unit.IntPx height);
+ method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints);
}
public final class LayoutGravity {
@@ -209,224 +209,224 @@
}
public final class LayoutHeight implements androidx.ui.core.LayoutModifier {
- ctor public LayoutHeight(androidx.ui.core.Dp height);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.layout.LayoutHeight copy(androidx.ui.core.Dp height);
+ ctor public LayoutHeight(androidx.ui.unit.Dp height);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.layout.LayoutHeight copy(androidx.ui.unit.Dp height);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getHeight();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getHeight();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public static final class LayoutHeight.Constrain implements androidx.ui.core.LayoutModifier {
- ctor public LayoutHeight.Constrain(androidx.ui.core.Dp minHeight, androidx.ui.core.Dp maxHeight);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.core.Dp component2();
- method public androidx.ui.layout.LayoutHeight.Constrain copy(androidx.ui.core.Dp minHeight, androidx.ui.core.Dp maxHeight);
+ ctor public LayoutHeight.Constrain(androidx.ui.unit.Dp minHeight, androidx.ui.unit.Dp maxHeight);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.unit.Dp component2();
+ method public androidx.ui.layout.LayoutHeight.Constrain copy(androidx.ui.unit.Dp minHeight, androidx.ui.unit.Dp maxHeight);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getMaxHeight();
- method public androidx.ui.core.Dp getMinHeight();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getMaxHeight();
+ method public androidx.ui.unit.Dp getMinHeight();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public static final class LayoutHeight.Fill implements androidx.ui.core.LayoutModifier {
- method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints);
+ method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints);
field public static final androidx.ui.layout.LayoutHeight.Fill! INSTANCE;
}
public static final class LayoutHeight.Max implements androidx.ui.core.LayoutModifier {
- ctor public LayoutHeight.Max(androidx.ui.core.Dp maxHeight);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.layout.LayoutHeight.Max copy(androidx.ui.core.Dp maxHeight);
+ ctor public LayoutHeight.Max(androidx.ui.unit.Dp maxHeight);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.layout.LayoutHeight.Max copy(androidx.ui.unit.Dp maxHeight);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getMaxHeight();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getMaxHeight();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public static final class LayoutHeight.Min implements androidx.ui.core.LayoutModifier {
- ctor public LayoutHeight.Min(androidx.ui.core.Dp minHeight);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.layout.LayoutHeight.Min copy(androidx.ui.core.Dp minHeight);
+ ctor public LayoutHeight.Min(androidx.ui.unit.Dp minHeight);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.layout.LayoutHeight.Min copy(androidx.ui.unit.Dp minHeight);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getMinHeight();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getMinHeight();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public final class LayoutPadding implements androidx.ui.core.LayoutModifier {
- ctor public LayoutPadding(androidx.ui.core.Dp left, androidx.ui.core.Dp top, androidx.ui.core.Dp right, androidx.ui.core.Dp bottom);
+ ctor public LayoutPadding(androidx.ui.unit.Dp left, androidx.ui.unit.Dp top, androidx.ui.unit.Dp right, androidx.ui.unit.Dp bottom);
ctor public LayoutPadding();
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.core.Dp component2();
- method public androidx.ui.core.Dp component3();
- method public androidx.ui.core.Dp component4();
- method public androidx.ui.layout.LayoutPadding copy(androidx.ui.core.Dp left, androidx.ui.core.Dp top, androidx.ui.core.Dp right, androidx.ui.core.Dp bottom);
- method public androidx.ui.core.Dp getBottom();
- method public androidx.ui.core.Dp getLeft();
- method public androidx.ui.core.Dp getRight();
- method public androidx.ui.core.Dp getTop();
- method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.unit.Dp component2();
+ method public androidx.ui.unit.Dp component3();
+ method public androidx.ui.unit.Dp component4();
+ method public androidx.ui.layout.LayoutPadding copy(androidx.ui.unit.Dp left, androidx.ui.unit.Dp top, androidx.ui.unit.Dp right, androidx.ui.unit.Dp bottom);
+ method public androidx.ui.unit.Dp getBottom();
+ method public androidx.ui.unit.Dp getLeft();
+ method public androidx.ui.unit.Dp getRight();
+ method public androidx.ui.unit.Dp getTop();
+ method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
}
@kotlin.DslMarker public @interface LayoutScopeMarker {
}
public final class LayoutSize implements androidx.ui.core.LayoutModifier {
- ctor public LayoutSize(androidx.ui.core.Dp width, androidx.ui.core.Dp height);
- ctor public LayoutSize(androidx.ui.core.Dp size);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.core.Dp component2();
- method public androidx.ui.layout.LayoutSize copy(androidx.ui.core.Dp width, androidx.ui.core.Dp height);
+ ctor public LayoutSize(androidx.ui.unit.Dp width, androidx.ui.unit.Dp height);
+ ctor public LayoutSize(androidx.ui.unit.Dp size);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.unit.Dp component2();
+ method public androidx.ui.layout.LayoutSize copy(androidx.ui.unit.Dp width, androidx.ui.unit.Dp height);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getHeight();
- method public androidx.ui.core.Dp getWidth();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getHeight();
+ method public androidx.ui.unit.Dp getWidth();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public static final class LayoutSize.Constrain implements androidx.ui.core.LayoutModifier {
- ctor public LayoutSize.Constrain(androidx.ui.core.Dp minWidth, androidx.ui.core.Dp minHeight, androidx.ui.core.Dp maxWidth, androidx.ui.core.Dp maxHeight);
- ctor public LayoutSize.Constrain(androidx.ui.core.Dp minSize, androidx.ui.core.Dp maxSize);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.core.Dp component2();
- method public androidx.ui.core.Dp component3();
- method public androidx.ui.core.Dp component4();
- method public androidx.ui.layout.LayoutSize.Constrain copy(androidx.ui.core.Dp minWidth, androidx.ui.core.Dp minHeight, androidx.ui.core.Dp maxWidth, androidx.ui.core.Dp maxHeight);
+ ctor public LayoutSize.Constrain(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp minHeight, androidx.ui.unit.Dp maxWidth, androidx.ui.unit.Dp maxHeight);
+ ctor public LayoutSize.Constrain(androidx.ui.unit.Dp minSize, androidx.ui.unit.Dp maxSize);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.unit.Dp component2();
+ method public androidx.ui.unit.Dp component3();
+ method public androidx.ui.unit.Dp component4();
+ method public androidx.ui.layout.LayoutSize.Constrain copy(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp minHeight, androidx.ui.unit.Dp maxWidth, androidx.ui.unit.Dp maxHeight);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getMaxHeight();
- method public androidx.ui.core.Dp getMaxWidth();
- method public androidx.ui.core.Dp getMinHeight();
- method public androidx.ui.core.Dp getMinWidth();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getMaxHeight();
+ method public androidx.ui.unit.Dp getMaxWidth();
+ method public androidx.ui.unit.Dp getMinHeight();
+ method public androidx.ui.unit.Dp getMinWidth();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public static final class LayoutSize.Fill implements androidx.ui.core.LayoutModifier {
- method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints);
+ method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints);
field public static final androidx.ui.layout.LayoutSize.Fill! INSTANCE;
}
public static final class LayoutSize.Max implements androidx.ui.core.LayoutModifier {
- ctor public LayoutSize.Max(androidx.ui.core.Dp maxWidth, androidx.ui.core.Dp maxHeight);
- ctor public LayoutSize.Max(androidx.ui.core.Dp maxSize);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.core.Dp component2();
- method public androidx.ui.layout.LayoutSize.Max copy(androidx.ui.core.Dp maxWidth, androidx.ui.core.Dp maxHeight);
+ ctor public LayoutSize.Max(androidx.ui.unit.Dp maxWidth, androidx.ui.unit.Dp maxHeight);
+ ctor public LayoutSize.Max(androidx.ui.unit.Dp maxSize);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.unit.Dp component2();
+ method public androidx.ui.layout.LayoutSize.Max copy(androidx.ui.unit.Dp maxWidth, androidx.ui.unit.Dp maxHeight);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getMaxHeight();
- method public androidx.ui.core.Dp getMaxWidth();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getMaxHeight();
+ method public androidx.ui.unit.Dp getMaxWidth();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public static final class LayoutSize.Min implements androidx.ui.core.LayoutModifier {
- ctor public LayoutSize.Min(androidx.ui.core.Dp minWidth, androidx.ui.core.Dp minHeight);
- ctor public LayoutSize.Min(androidx.ui.core.Dp minSize);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.core.Dp component2();
- method public androidx.ui.layout.LayoutSize.Min copy(androidx.ui.core.Dp minWidth, androidx.ui.core.Dp minHeight);
+ ctor public LayoutSize.Min(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp minHeight);
+ ctor public LayoutSize.Min(androidx.ui.unit.Dp minSize);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.unit.Dp component2();
+ method public androidx.ui.layout.LayoutSize.Min copy(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp minHeight);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getMinHeight();
- method public androidx.ui.core.Dp getMinWidth();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getMinHeight();
+ method public androidx.ui.unit.Dp getMinWidth();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public final class LayoutWidth implements androidx.ui.core.LayoutModifier {
- ctor public LayoutWidth(androidx.ui.core.Dp width);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.layout.LayoutWidth copy(androidx.ui.core.Dp width);
+ ctor public LayoutWidth(androidx.ui.unit.Dp width);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.layout.LayoutWidth copy(androidx.ui.unit.Dp width);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getWidth();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getWidth();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public static final class LayoutWidth.Constrain implements androidx.ui.core.LayoutModifier {
- ctor public LayoutWidth.Constrain(androidx.ui.core.Dp minWidth, androidx.ui.core.Dp maxWidth);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.core.Dp component2();
- method public androidx.ui.layout.LayoutWidth.Constrain copy(androidx.ui.core.Dp minWidth, androidx.ui.core.Dp maxWidth);
+ ctor public LayoutWidth.Constrain(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp maxWidth);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.unit.Dp component2();
+ method public androidx.ui.layout.LayoutWidth.Constrain copy(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp maxWidth);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getMaxWidth();
- method public androidx.ui.core.Dp getMinWidth();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getMaxWidth();
+ method public androidx.ui.unit.Dp getMinWidth();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public static final class LayoutWidth.Fill implements androidx.ui.core.LayoutModifier {
- method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints);
+ method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints);
field public static final androidx.ui.layout.LayoutWidth.Fill! INSTANCE;
}
public static final class LayoutWidth.Max implements androidx.ui.core.LayoutModifier {
- ctor public LayoutWidth.Max(androidx.ui.core.Dp maxWidth);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.layout.LayoutWidth.Max copy(androidx.ui.core.Dp maxWidth);
+ ctor public LayoutWidth.Max(androidx.ui.unit.Dp maxWidth);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.layout.LayoutWidth.Max copy(androidx.ui.unit.Dp maxWidth);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getMaxWidth();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getMaxWidth();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public static final class LayoutWidth.Min implements androidx.ui.core.LayoutModifier {
- ctor public LayoutWidth.Min(androidx.ui.core.Dp minWidth);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.layout.LayoutWidth.Min copy(androidx.ui.core.Dp minWidth);
+ ctor public LayoutWidth.Min(androidx.ui.unit.Dp minWidth);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.layout.LayoutWidth.Min copy(androidx.ui.unit.Dp minWidth);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getMinWidth();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getMinWidth();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
@@ -441,12 +441,12 @@
}
public final class PaddingKt {
- method public static androidx.ui.layout.LayoutPadding LayoutPadding(androidx.ui.core.Dp all);
+ method public static androidx.ui.layout.LayoutPadding LayoutPadding(androidx.ui.unit.Dp all);
method public static void Padding(androidx.ui.layout.EdgeInsets padding, kotlin.jvm.functions.Function0<kotlin.Unit> children);
- method public static void Padding(androidx.ui.core.Dp left = 0.dp, androidx.ui.core.Dp top = 0.dp, androidx.ui.core.Dp right = 0.dp, androidx.ui.core.Dp bottom = 0.dp, kotlin.jvm.functions.Function0<kotlin.Unit> children);
- method public static void Padding(androidx.ui.core.Dp padding, kotlin.jvm.functions.Function0<kotlin.Unit> children);
- method @Deprecated public static androidx.ui.core.LayoutModifier Spacing(androidx.ui.core.Dp left = 0.dp, androidx.ui.core.Dp top = 0.dp, androidx.ui.core.Dp right = 0.dp, androidx.ui.core.Dp bottom = 0.dp);
- method @Deprecated public static androidx.ui.core.LayoutModifier Spacing(androidx.ui.core.Dp all = 0.dp);
+ method public static void Padding(androidx.ui.unit.Dp left = 0.dp, androidx.ui.unit.Dp top = 0.dp, androidx.ui.unit.Dp right = 0.dp, androidx.ui.unit.Dp bottom = 0.dp, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+ method public static void Padding(androidx.ui.unit.Dp padding, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+ method @Deprecated public static androidx.ui.core.LayoutModifier Spacing(androidx.ui.unit.Dp left = 0.dp, androidx.ui.unit.Dp top = 0.dp, androidx.ui.unit.Dp right = 0.dp, androidx.ui.unit.Dp bottom = 0.dp);
+ method @Deprecated public static androidx.ui.core.LayoutModifier Spacing(androidx.ui.unit.Dp all = 0.dp);
}
public final class RowScope extends androidx.ui.layout.FlexScope {
@@ -502,27 +502,27 @@
}
public abstract class TableColumnWidth {
- method public androidx.ui.core.IntPx maxIntrinsicWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density, androidx.ui.core.IntPx availableHeight);
- method public androidx.ui.core.IntPx minIntrinsicWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density, androidx.ui.core.IntPx availableHeight);
- method public abstract androidx.ui.core.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density);
+ method public androidx.ui.unit.IntPx maxIntrinsicWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density, androidx.ui.unit.IntPx availableHeight);
+ method public androidx.ui.unit.IntPx minIntrinsicWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density, androidx.ui.unit.IntPx availableHeight);
+ method public abstract androidx.ui.unit.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density);
}
public static final class TableColumnWidth.Fixed extends androidx.ui.layout.TableColumnWidth.Inflexible {
- ctor public TableColumnWidth.Fixed(androidx.ui.core.Dp width);
- method public androidx.ui.layout.TableColumnWidth.Fixed copy(androidx.ui.core.Dp width);
- method public androidx.ui.core.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density);
+ ctor public TableColumnWidth.Fixed(androidx.ui.unit.Dp width);
+ method public androidx.ui.layout.TableColumnWidth.Fixed copy(androidx.ui.unit.Dp width);
+ method public androidx.ui.unit.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density);
}
public static final class TableColumnWidth.Flex extends androidx.ui.layout.TableColumnWidth {
ctor public TableColumnWidth.Flex(@FloatRange(from=null) float flex);
method public androidx.ui.layout.TableColumnWidth.Flex copy(float flex);
- method public androidx.ui.core.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density);
+ method public androidx.ui.unit.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density);
}
public static final class TableColumnWidth.Fraction extends androidx.ui.layout.TableColumnWidth.Inflexible {
ctor public TableColumnWidth.Fraction(@FloatRange(from=null, to=null) float fraction);
method public androidx.ui.layout.TableColumnWidth.Fraction copy(float fraction);
- method public androidx.ui.core.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density);
+ method public androidx.ui.unit.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density);
}
public abstract static class TableColumnWidth.Inflexible extends androidx.ui.layout.TableColumnWidth {
@@ -533,36 +533,36 @@
public static final class TableColumnWidth.Max extends androidx.ui.layout.TableColumnWidth.Inflexible {
ctor public TableColumnWidth.Max(androidx.ui.layout.TableColumnWidth.Inflexible a, androidx.ui.layout.TableColumnWidth.Inflexible b);
method public androidx.ui.layout.TableColumnWidth.Max copy(androidx.ui.layout.TableColumnWidth.Inflexible a, androidx.ui.layout.TableColumnWidth.Inflexible b);
- method public androidx.ui.core.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density);
+ method public androidx.ui.unit.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density);
}
public static final class TableColumnWidth.MaxIntrinsic extends androidx.ui.layout.TableColumnWidth.Inflexible {
- method public androidx.ui.core.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density);
+ method public androidx.ui.unit.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density);
field public static final androidx.ui.layout.TableColumnWidth.MaxIntrinsic! INSTANCE;
}
public static final class TableColumnWidth.Min extends androidx.ui.layout.TableColumnWidth.Inflexible {
ctor public TableColumnWidth.Min(androidx.ui.layout.TableColumnWidth.Inflexible a, androidx.ui.layout.TableColumnWidth.Inflexible b);
method public androidx.ui.layout.TableColumnWidth.Min copy(androidx.ui.layout.TableColumnWidth.Inflexible a, androidx.ui.layout.TableColumnWidth.Inflexible b);
- method public androidx.ui.core.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density);
+ method public androidx.ui.unit.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density);
}
public static final class TableColumnWidth.MinIntrinsic extends androidx.ui.layout.TableColumnWidth.Inflexible {
- method public androidx.ui.core.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density);
+ method public androidx.ui.unit.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density);
field public static final androidx.ui.layout.TableColumnWidth.MinIntrinsic! INSTANCE;
}
public static final class TableColumnWidth.Wrap extends androidx.ui.layout.TableColumnWidth.Inflexible {
- method public androidx.ui.core.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density);
+ method public androidx.ui.unit.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density);
field public static final androidx.ui.layout.TableColumnWidth.Wrap! INSTANCE;
}
public final class TableDecorationChildren {
- method public java.util.List<androidx.ui.core.IntPx> component1();
- method public java.util.List<androidx.ui.core.IntPx> component2();
- method public androidx.ui.layout.TableDecorationChildren copy(java.util.List<androidx.ui.core.IntPx> verticalOffsets, java.util.List<androidx.ui.core.IntPx> horizontalOffsets);
- method public java.util.List<androidx.ui.core.IntPx> getHorizontalOffsets();
- method public java.util.List<androidx.ui.core.IntPx> getVerticalOffsets();
+ method public java.util.List<androidx.ui.unit.IntPx> component1();
+ method public java.util.List<androidx.ui.unit.IntPx> component2();
+ method public androidx.ui.layout.TableDecorationChildren copy(java.util.List<androidx.ui.unit.IntPx> verticalOffsets, java.util.List<androidx.ui.unit.IntPx> horizontalOffsets);
+ method public java.util.List<androidx.ui.unit.IntPx> getHorizontalOffsets();
+ method public java.util.List<androidx.ui.unit.IntPx> getVerticalOffsets();
}
public final class TableKt {
@@ -570,13 +570,13 @@
}
public final class TableMeasurable {
- method public kotlin.jvm.functions.Function0<androidx.ui.core.IntPx> component1();
- method public kotlin.jvm.functions.Function1<androidx.ui.core.IntPx,androidx.ui.core.IntPx> component2();
- method public kotlin.jvm.functions.Function1<androidx.ui.core.IntPx,androidx.ui.core.IntPx> component3();
- method public androidx.ui.layout.TableMeasurable copy(kotlin.jvm.functions.Function0<androidx.ui.core.IntPx> preferredWidth, kotlin.jvm.functions.Function1<? super androidx.ui.core.IntPx,androidx.ui.core.IntPx> minIntrinsicWidth, kotlin.jvm.functions.Function1<? super androidx.ui.core.IntPx,androidx.ui.core.IntPx> maxIntrinsicWidth);
- method public kotlin.jvm.functions.Function1<androidx.ui.core.IntPx,androidx.ui.core.IntPx> getMaxIntrinsicWidth();
- method public kotlin.jvm.functions.Function1<androidx.ui.core.IntPx,androidx.ui.core.IntPx> getMinIntrinsicWidth();
- method public kotlin.jvm.functions.Function0<androidx.ui.core.IntPx> getPreferredWidth();
+ method public kotlin.jvm.functions.Function0<androidx.ui.unit.IntPx> component1();
+ method public kotlin.jvm.functions.Function1<androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> component2();
+ method public kotlin.jvm.functions.Function1<androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> component3();
+ method public androidx.ui.layout.TableMeasurable copy(kotlin.jvm.functions.Function0<androidx.ui.unit.IntPx> preferredWidth, kotlin.jvm.functions.Function1<? super androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> minIntrinsicWidth, kotlin.jvm.functions.Function1<? super androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> maxIntrinsicWidth);
+ method public kotlin.jvm.functions.Function1<androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> getMaxIntrinsicWidth();
+ method public kotlin.jvm.functions.Function1<androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> getMinIntrinsicWidth();
+ method public kotlin.jvm.functions.Function0<androidx.ui.unit.IntPx> getPreferredWidth();
}
public final class WrapKt {
@@ -599,13 +599,13 @@
public final class ConstraintSetBuilderScope {
method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalAnchor.BarrierAnchor createBottomBarrier(androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.ConstrainedLayoutReference... elements);
- method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalAnchor.GuidelineAnchor createGuidelineFromBottom(androidx.ui.core.Dp offset);
+ method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalAnchor.GuidelineAnchor createGuidelineFromBottom(androidx.ui.unit.Dp offset);
method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalAnchor.GuidelineAnchor createGuidelineFromBottom(float percent);
- method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.VerticalAnchor.GuidelineAnchor createGuidelineFromLeft(androidx.ui.core.Dp offset);
+ method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.VerticalAnchor.GuidelineAnchor createGuidelineFromLeft(androidx.ui.unit.Dp offset);
method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.VerticalAnchor.GuidelineAnchor createGuidelineFromLeft(float percent);
- method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.VerticalAnchor.GuidelineAnchor createGuidelineFromRight(androidx.ui.core.Dp offset);
+ method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.VerticalAnchor.GuidelineAnchor createGuidelineFromRight(androidx.ui.unit.Dp offset);
method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.VerticalAnchor.GuidelineAnchor createGuidelineFromRight(float percent);
- method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalAnchor.GuidelineAnchor createGuidelineFromTop(androidx.ui.core.Dp offset);
+ method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalAnchor.GuidelineAnchor createGuidelineFromTop(androidx.ui.unit.Dp offset);
method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalAnchor.GuidelineAnchor createGuidelineFromTop(float percent);
method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalChain createHorizontalChain(androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.ConstrainedLayoutReference![] elements, androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.ChainStyle chainStyle = ChainStyle.Spread);
method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.VerticalAnchor.BarrierAnchor createLeftBarrier(androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.ConstrainedLayoutReference... elements);
@@ -672,21 +672,21 @@
public static final class ConstraintSetBuilderScope.HorizontalAnchor.BarrierAnchor extends androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalAnchor {
method public int getIndex$lintWithKotlin();
- method public androidx.ui.core.Dp getMargin();
+ method public androidx.ui.unit.Dp getMargin();
method public androidx.constraintlayout.solver.state.State getState$lintWithKotlin();
method public Object getTag$lintWithKotlin();
- method public void setMargin(androidx.ui.core.Dp value);
- property public final androidx.ui.core.Dp margin;
+ method public void setMargin(androidx.ui.unit.Dp value);
+ property public final androidx.ui.unit.Dp margin;
}
public static final class ConstraintSetBuilderScope.HorizontalAnchor.ConstrainedLayoutAnchor extends androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalAnchor {
method public infix void constrainTo(androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalAnchor other);
method public int getIndex$lintWithKotlin();
- method public androidx.ui.core.Dp getMargin();
+ method public androidx.ui.unit.Dp getMargin();
method public androidx.constraintlayout.solver.state.State getState$lintWithKotlin();
method public Object getTag$lintWithKotlin();
- method public void setMargin(androidx.ui.core.Dp value);
- property public final androidx.ui.core.Dp margin;
+ method public void setMargin(androidx.ui.unit.Dp value);
+ property public final androidx.ui.unit.Dp margin;
property public Object tag;
}
@@ -709,21 +709,21 @@
public static final class ConstraintSetBuilderScope.VerticalAnchor.BarrierAnchor extends androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.VerticalAnchor {
method public int getIndex$lintWithKotlin();
- method public androidx.ui.core.Dp getMargin();
+ method public androidx.ui.unit.Dp getMargin();
method public androidx.constraintlayout.solver.state.State getState$lintWithKotlin();
method public Object getTag$lintWithKotlin();
- method public void setMargin(androidx.ui.core.Dp value);
- property public final androidx.ui.core.Dp margin;
+ method public void setMargin(androidx.ui.unit.Dp value);
+ property public final androidx.ui.unit.Dp margin;
}
public static final class ConstraintSetBuilderScope.VerticalAnchor.ConstrainedLayoutAnchor extends androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.VerticalAnchor {
method public infix void constrainTo(androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.VerticalAnchor other);
method public int getIndex$lintWithKotlin();
- method public androidx.ui.core.Dp getMargin();
+ method public androidx.ui.unit.Dp getMargin();
method public androidx.constraintlayout.solver.state.State getState$lintWithKotlin();
method public Object getTag$lintWithKotlin();
- method public void setMargin(androidx.ui.core.Dp value);
- property public final androidx.ui.core.Dp margin;
+ method public void setMargin(androidx.ui.unit.Dp value);
+ property public final androidx.ui.unit.Dp margin;
property public Object tag;
}
diff --git a/ui/ui-layout/api/public_plus_experimental_0.1.0-dev04.txt b/ui/ui-layout/api/public_plus_experimental_0.1.0-dev04.txt
index 8cefaec..62add70 100644
--- a/ui/ui-layout/api/public_plus_experimental_0.1.0-dev04.txt
+++ b/ui/ui-layout/api/public_plus_experimental_0.1.0-dev04.txt
@@ -7,12 +7,12 @@
}
public final class AlignmentLineKt {
- method public static void AlignmentLineOffset(androidx.ui.core.AlignmentLine alignmentLine, androidx.ui.core.Dp before = 0.dp, androidx.ui.core.Dp after = 0.dp, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+ method public static void AlignmentLineOffset(androidx.ui.core.AlignmentLine alignmentLine, androidx.ui.unit.Dp before = 0.dp, androidx.ui.unit.Dp after = 0.dp, kotlin.jvm.functions.Function0<kotlin.Unit> children);
method public static void CenterAlignmentLine(androidx.ui.core.AlignmentLine alignmentLine, kotlin.jvm.functions.Function0<kotlin.Unit> children);
}
public final class Arrangement {
- ctor public Arrangement(internal kotlin.jvm.functions.Function2<? super androidx.ui.core.IntPx,? super java.util.List<androidx.ui.core.IntPx>,? extends java.util.List<androidx.ui.core.IntPx>> arrangeBlock);
+ ctor public Arrangement(internal kotlin.jvm.functions.Function2<? super androidx.ui.unit.IntPx,? super java.util.List<androidx.ui.unit.IntPx>,? extends java.util.List<androidx.ui.unit.IntPx>> arrangeBlock);
field public static final androidx.ui.layout.Arrangement.Companion! Companion;
}
@@ -46,7 +46,7 @@
}
public final class ContainerKt {
- method public static void Container(androidx.ui.core.Modifier modifier = Modifier.None, androidx.ui.layout.EdgeInsets padding = androidx.ui.layout.EdgeInsets(0.dp), androidx.ui.core.Alignment alignment = Alignment.Center, boolean expanded = false, androidx.ui.layout.DpConstraints constraints = androidx.ui.layout.DpConstraints(), androidx.ui.core.Dp? width = null, androidx.ui.core.Dp? height = null, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+ method public static void Container(androidx.ui.core.Modifier modifier = Modifier.None, androidx.ui.layout.EdgeInsets padding = androidx.ui.layout.EdgeInsets(0.dp), androidx.ui.core.Alignment alignment = Alignment.Center, boolean expanded = false, androidx.ui.layout.DpConstraints constraints = androidx.ui.layout.DpConstraints(), androidx.ui.unit.Dp? width = null, androidx.ui.unit.Dp? height = null, kotlin.jvm.functions.Function0<kotlin.Unit> children);
}
public final class CrossAxisAlignment {
@@ -66,29 +66,29 @@
}
public final class DpConstraints {
- ctor public DpConstraints(androidx.ui.core.Dp minWidth, androidx.ui.core.Dp maxWidth, androidx.ui.core.Dp minHeight, androidx.ui.core.Dp maxHeight);
+ ctor public DpConstraints(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp maxWidth, androidx.ui.unit.Dp minHeight, androidx.ui.unit.Dp maxHeight);
ctor public DpConstraints();
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.core.Dp component2();
- method public androidx.ui.core.Dp component3();
- method public androidx.ui.core.Dp component4();
- method public androidx.ui.layout.DpConstraints copy(androidx.ui.core.Dp minWidth, androidx.ui.core.Dp maxWidth, androidx.ui.core.Dp minHeight, androidx.ui.core.Dp maxHeight);
- method public androidx.ui.core.Dp getMaxHeight();
- method public androidx.ui.core.Dp getMaxWidth();
- method public androidx.ui.core.Dp getMinHeight();
- method public androidx.ui.core.Dp getMinWidth();
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.unit.Dp component2();
+ method public androidx.ui.unit.Dp component3();
+ method public androidx.ui.unit.Dp component4();
+ method public androidx.ui.layout.DpConstraints copy(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp maxWidth, androidx.ui.unit.Dp minHeight, androidx.ui.unit.Dp maxHeight);
+ method public androidx.ui.unit.Dp getMaxHeight();
+ method public androidx.ui.unit.Dp getMaxWidth();
+ method public androidx.ui.unit.Dp getMinHeight();
+ method public androidx.ui.unit.Dp getMinWidth();
field public static final androidx.ui.layout.DpConstraints.Companion! Companion;
}
public static final class DpConstraints.Companion {
- method public androidx.ui.layout.DpConstraints tightConstraints(androidx.ui.core.Dp width, androidx.ui.core.Dp height);
- method public androidx.ui.layout.DpConstraints tightConstraintsForHeight(androidx.ui.core.Dp height);
- method public androidx.ui.layout.DpConstraints tightConstraintsForWidth(androidx.ui.core.Dp width);
+ method public androidx.ui.layout.DpConstraints tightConstraints(androidx.ui.unit.Dp width, androidx.ui.unit.Dp height);
+ method public androidx.ui.layout.DpConstraints tightConstraintsForHeight(androidx.ui.unit.Dp height);
+ method public androidx.ui.layout.DpConstraints tightConstraintsForWidth(androidx.ui.unit.Dp width);
}
public final class DpConstraintsKt {
- method public static androidx.ui.core.Constraints Constraints(androidx.ui.core.DensityScope, androidx.ui.layout.DpConstraints dpConstraints);
- method public static androidx.ui.layout.DpConstraints DpConstraints(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints);
+ method public static androidx.ui.core.Constraints Constraints(androidx.ui.unit.DensityScope, androidx.ui.layout.DpConstraints dpConstraints);
+ method public static androidx.ui.layout.DpConstraints DpConstraints(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints);
method public static androidx.ui.layout.DpConstraints enforce(androidx.ui.layout.DpConstraints, androidx.ui.layout.DpConstraints otherConstraints);
method public static boolean getHasBoundedHeight(androidx.ui.layout.DpConstraints);
method public static boolean getHasBoundedWidth(androidx.ui.layout.DpConstraints);
@@ -99,25 +99,25 @@
method public static boolean isZero(androidx.ui.layout.DpConstraints);
method public static androidx.ui.layout.DpConstraints looseMax(androidx.ui.layout.DpConstraints);
method public static androidx.ui.layout.DpConstraints looseMin(androidx.ui.layout.DpConstraints);
- method public static androidx.ui.layout.DpConstraints offset(androidx.ui.layout.DpConstraints, androidx.ui.core.Dp horizontal = 0.dp, androidx.ui.core.Dp vertical = 0.dp);
+ method public static androidx.ui.layout.DpConstraints offset(androidx.ui.layout.DpConstraints, androidx.ui.unit.Dp horizontal = 0.dp, androidx.ui.unit.Dp vertical = 0.dp);
method public static androidx.ui.layout.DpConstraints tightMax(androidx.ui.layout.DpConstraints);
method public static androidx.ui.layout.DpConstraints tightMin(androidx.ui.layout.DpConstraints);
- method public static androidx.ui.layout.DpConstraints withTight(androidx.ui.layout.DpConstraints, androidx.ui.core.Dp? width = null, androidx.ui.core.Dp? height = null);
+ method public static androidx.ui.layout.DpConstraints withTight(androidx.ui.layout.DpConstraints, androidx.ui.unit.Dp? width = null, androidx.ui.unit.Dp? height = null);
}
public final class EdgeInsets {
- ctor public EdgeInsets(androidx.ui.core.Dp left, androidx.ui.core.Dp top, androidx.ui.core.Dp right, androidx.ui.core.Dp bottom);
+ ctor public EdgeInsets(androidx.ui.unit.Dp left, androidx.ui.unit.Dp top, androidx.ui.unit.Dp right, androidx.ui.unit.Dp bottom);
ctor public EdgeInsets();
- ctor public EdgeInsets(androidx.ui.core.Dp all);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.core.Dp component2();
- method public androidx.ui.core.Dp component3();
- method public androidx.ui.core.Dp component4();
- method public androidx.ui.layout.EdgeInsets copy(androidx.ui.core.Dp left, androidx.ui.core.Dp top, androidx.ui.core.Dp right, androidx.ui.core.Dp bottom);
- method public androidx.ui.core.Dp getBottom();
- method public androidx.ui.core.Dp getLeft();
- method public androidx.ui.core.Dp getRight();
- method public androidx.ui.core.Dp getTop();
+ ctor public EdgeInsets(androidx.ui.unit.Dp all);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.unit.Dp component2();
+ method public androidx.ui.unit.Dp component3();
+ method public androidx.ui.unit.Dp component4();
+ method public androidx.ui.layout.EdgeInsets copy(androidx.ui.unit.Dp left, androidx.ui.unit.Dp top, androidx.ui.unit.Dp right, androidx.ui.unit.Dp bottom);
+ method public androidx.ui.unit.Dp getBottom();
+ method public androidx.ui.unit.Dp getLeft();
+ method public androidx.ui.unit.Dp getRight();
+ method public androidx.ui.unit.Dp getTop();
}
public final class FlexChildren {
@@ -135,7 +135,7 @@
@androidx.ui.layout.LayoutScopeMarker public abstract sealed class FlexScope {
method public final androidx.ui.core.ParentDataModifier LayoutFlexible(@FloatRange(from=0.0, fromInclusive=false) float flex, boolean tight = true);
- method public final androidx.ui.core.ParentDataModifier RelativeToSiblings(androidx.ui.layout.LayoutGravity, kotlin.jvm.functions.Function1<? super androidx.ui.core.Placeable,androidx.ui.core.IntPx> alignmentLineBlock);
+ method public final androidx.ui.core.ParentDataModifier RelativeToSiblings(androidx.ui.layout.LayoutGravity, kotlin.jvm.functions.Function1<? super androidx.ui.core.Placeable,androidx.ui.unit.IntPx> alignmentLineBlock);
method public final androidx.ui.core.ParentDataModifier getLayoutInflexible();
property public final androidx.ui.core.ParentDataModifier LayoutInflexible;
}
@@ -147,8 +147,8 @@
}
public final class FlowKt {
- method public static void FlowColumn(androidx.ui.layout.SizeMode mainAxisSize = androidx.ui.layout.SizeMode.Wrap, androidx.ui.layout.MainAxisAlignment mainAxisAlignment = androidx.ui.layout.MainAxisAlignment.Start, androidx.ui.core.Dp mainAxisSpacing = 0.dp, androidx.ui.layout.FlowCrossAxisAlignment crossAxisAlignment = androidx.ui.layout.FlowCrossAxisAlignment.Start, androidx.ui.core.Dp crossAxisSpacing = 0.dp, androidx.ui.layout.MainAxisAlignment lastLineMainAxisAlignment = mainAxisAlignment, kotlin.jvm.functions.Function0<kotlin.Unit> children);
- method public static void FlowRow(androidx.ui.layout.SizeMode mainAxisSize = androidx.ui.layout.SizeMode.Wrap, androidx.ui.layout.MainAxisAlignment mainAxisAlignment = androidx.ui.layout.MainAxisAlignment.Start, androidx.ui.core.Dp mainAxisSpacing = 0.dp, androidx.ui.layout.FlowCrossAxisAlignment crossAxisAlignment = androidx.ui.layout.FlowCrossAxisAlignment.Start, androidx.ui.core.Dp crossAxisSpacing = 0.dp, androidx.ui.layout.MainAxisAlignment lastLineMainAxisAlignment = mainAxisAlignment, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+ method public static void FlowColumn(androidx.ui.layout.SizeMode mainAxisSize = androidx.ui.layout.SizeMode.Wrap, androidx.ui.layout.MainAxisAlignment mainAxisAlignment = androidx.ui.layout.MainAxisAlignment.Start, androidx.ui.unit.Dp mainAxisSpacing = 0.dp, androidx.ui.layout.FlowCrossAxisAlignment crossAxisAlignment = androidx.ui.layout.FlowCrossAxisAlignment.Start, androidx.ui.unit.Dp crossAxisSpacing = 0.dp, androidx.ui.layout.MainAxisAlignment lastLineMainAxisAlignment = mainAxisAlignment, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+ method public static void FlowRow(androidx.ui.layout.SizeMode mainAxisSize = androidx.ui.layout.SizeMode.Wrap, androidx.ui.layout.MainAxisAlignment mainAxisAlignment = androidx.ui.layout.MainAxisAlignment.Start, androidx.ui.unit.Dp mainAxisSpacing = 0.dp, androidx.ui.layout.FlowCrossAxisAlignment crossAxisAlignment = androidx.ui.layout.FlowCrossAxisAlignment.Start, androidx.ui.unit.Dp crossAxisSpacing = 0.dp, androidx.ui.layout.MainAxisAlignment lastLineMainAxisAlignment = mainAxisAlignment, kotlin.jvm.functions.Function0<kotlin.Unit> children);
}
public final class IntrinsicKt {
@@ -197,11 +197,11 @@
method public float component1();
method public androidx.ui.layout.LayoutAspectRatio copy(float aspectRatio);
method public float getAspectRatio();
- method public androidx.ui.core.IntPx maxIntrinsicHeightOf(androidx.ui.core.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.core.IntPx width);
- method public androidx.ui.core.IntPx maxIntrinsicWidthOf(androidx.ui.core.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.core.IntPx height);
- method public androidx.ui.core.IntPx minIntrinsicHeightOf(androidx.ui.core.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.core.IntPx width);
- method public androidx.ui.core.IntPx minIntrinsicWidthOf(androidx.ui.core.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.core.IntPx height);
- method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints);
+ method public androidx.ui.unit.IntPx maxIntrinsicHeightOf(androidx.ui.unit.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.unit.IntPx width);
+ method public androidx.ui.unit.IntPx maxIntrinsicWidthOf(androidx.ui.unit.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.unit.IntPx height);
+ method public androidx.ui.unit.IntPx minIntrinsicHeightOf(androidx.ui.unit.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.unit.IntPx width);
+ method public androidx.ui.unit.IntPx minIntrinsicWidthOf(androidx.ui.unit.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.unit.IntPx height);
+ method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints);
}
public final class LayoutGravity {
@@ -209,224 +209,224 @@
}
public final class LayoutHeight implements androidx.ui.core.LayoutModifier {
- ctor public LayoutHeight(androidx.ui.core.Dp height);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.layout.LayoutHeight copy(androidx.ui.core.Dp height);
+ ctor public LayoutHeight(androidx.ui.unit.Dp height);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.layout.LayoutHeight copy(androidx.ui.unit.Dp height);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getHeight();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getHeight();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public static final class LayoutHeight.Constrain implements androidx.ui.core.LayoutModifier {
- ctor public LayoutHeight.Constrain(androidx.ui.core.Dp minHeight, androidx.ui.core.Dp maxHeight);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.core.Dp component2();
- method public androidx.ui.layout.LayoutHeight.Constrain copy(androidx.ui.core.Dp minHeight, androidx.ui.core.Dp maxHeight);
+ ctor public LayoutHeight.Constrain(androidx.ui.unit.Dp minHeight, androidx.ui.unit.Dp maxHeight);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.unit.Dp component2();
+ method public androidx.ui.layout.LayoutHeight.Constrain copy(androidx.ui.unit.Dp minHeight, androidx.ui.unit.Dp maxHeight);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getMaxHeight();
- method public androidx.ui.core.Dp getMinHeight();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getMaxHeight();
+ method public androidx.ui.unit.Dp getMinHeight();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public static final class LayoutHeight.Fill implements androidx.ui.core.LayoutModifier {
- method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints);
+ method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints);
field public static final androidx.ui.layout.LayoutHeight.Fill! INSTANCE;
}
public static final class LayoutHeight.Max implements androidx.ui.core.LayoutModifier {
- ctor public LayoutHeight.Max(androidx.ui.core.Dp maxHeight);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.layout.LayoutHeight.Max copy(androidx.ui.core.Dp maxHeight);
+ ctor public LayoutHeight.Max(androidx.ui.unit.Dp maxHeight);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.layout.LayoutHeight.Max copy(androidx.ui.unit.Dp maxHeight);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getMaxHeight();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getMaxHeight();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public static final class LayoutHeight.Min implements androidx.ui.core.LayoutModifier {
- ctor public LayoutHeight.Min(androidx.ui.core.Dp minHeight);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.layout.LayoutHeight.Min copy(androidx.ui.core.Dp minHeight);
+ ctor public LayoutHeight.Min(androidx.ui.unit.Dp minHeight);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.layout.LayoutHeight.Min copy(androidx.ui.unit.Dp minHeight);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getMinHeight();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getMinHeight();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public final class LayoutPadding implements androidx.ui.core.LayoutModifier {
- ctor public LayoutPadding(androidx.ui.core.Dp left, androidx.ui.core.Dp top, androidx.ui.core.Dp right, androidx.ui.core.Dp bottom);
+ ctor public LayoutPadding(androidx.ui.unit.Dp left, androidx.ui.unit.Dp top, androidx.ui.unit.Dp right, androidx.ui.unit.Dp bottom);
ctor public LayoutPadding();
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.core.Dp component2();
- method public androidx.ui.core.Dp component3();
- method public androidx.ui.core.Dp component4();
- method public androidx.ui.layout.LayoutPadding copy(androidx.ui.core.Dp left, androidx.ui.core.Dp top, androidx.ui.core.Dp right, androidx.ui.core.Dp bottom);
- method public androidx.ui.core.Dp getBottom();
- method public androidx.ui.core.Dp getLeft();
- method public androidx.ui.core.Dp getRight();
- method public androidx.ui.core.Dp getTop();
- method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.unit.Dp component2();
+ method public androidx.ui.unit.Dp component3();
+ method public androidx.ui.unit.Dp component4();
+ method public androidx.ui.layout.LayoutPadding copy(androidx.ui.unit.Dp left, androidx.ui.unit.Dp top, androidx.ui.unit.Dp right, androidx.ui.unit.Dp bottom);
+ method public androidx.ui.unit.Dp getBottom();
+ method public androidx.ui.unit.Dp getLeft();
+ method public androidx.ui.unit.Dp getRight();
+ method public androidx.ui.unit.Dp getTop();
+ method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
}
@kotlin.DslMarker public @interface LayoutScopeMarker {
}
public final class LayoutSize implements androidx.ui.core.LayoutModifier {
- ctor public LayoutSize(androidx.ui.core.Dp width, androidx.ui.core.Dp height);
- ctor public LayoutSize(androidx.ui.core.Dp size);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.core.Dp component2();
- method public androidx.ui.layout.LayoutSize copy(androidx.ui.core.Dp width, androidx.ui.core.Dp height);
+ ctor public LayoutSize(androidx.ui.unit.Dp width, androidx.ui.unit.Dp height);
+ ctor public LayoutSize(androidx.ui.unit.Dp size);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.unit.Dp component2();
+ method public androidx.ui.layout.LayoutSize copy(androidx.ui.unit.Dp width, androidx.ui.unit.Dp height);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getHeight();
- method public androidx.ui.core.Dp getWidth();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getHeight();
+ method public androidx.ui.unit.Dp getWidth();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public static final class LayoutSize.Constrain implements androidx.ui.core.LayoutModifier {
- ctor public LayoutSize.Constrain(androidx.ui.core.Dp minWidth, androidx.ui.core.Dp minHeight, androidx.ui.core.Dp maxWidth, androidx.ui.core.Dp maxHeight);
- ctor public LayoutSize.Constrain(androidx.ui.core.Dp minSize, androidx.ui.core.Dp maxSize);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.core.Dp component2();
- method public androidx.ui.core.Dp component3();
- method public androidx.ui.core.Dp component4();
- method public androidx.ui.layout.LayoutSize.Constrain copy(androidx.ui.core.Dp minWidth, androidx.ui.core.Dp minHeight, androidx.ui.core.Dp maxWidth, androidx.ui.core.Dp maxHeight);
+ ctor public LayoutSize.Constrain(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp minHeight, androidx.ui.unit.Dp maxWidth, androidx.ui.unit.Dp maxHeight);
+ ctor public LayoutSize.Constrain(androidx.ui.unit.Dp minSize, androidx.ui.unit.Dp maxSize);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.unit.Dp component2();
+ method public androidx.ui.unit.Dp component3();
+ method public androidx.ui.unit.Dp component4();
+ method public androidx.ui.layout.LayoutSize.Constrain copy(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp minHeight, androidx.ui.unit.Dp maxWidth, androidx.ui.unit.Dp maxHeight);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getMaxHeight();
- method public androidx.ui.core.Dp getMaxWidth();
- method public androidx.ui.core.Dp getMinHeight();
- method public androidx.ui.core.Dp getMinWidth();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getMaxHeight();
+ method public androidx.ui.unit.Dp getMaxWidth();
+ method public androidx.ui.unit.Dp getMinHeight();
+ method public androidx.ui.unit.Dp getMinWidth();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public static final class LayoutSize.Fill implements androidx.ui.core.LayoutModifier {
- method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints);
+ method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints);
field public static final androidx.ui.layout.LayoutSize.Fill! INSTANCE;
}
public static final class LayoutSize.Max implements androidx.ui.core.LayoutModifier {
- ctor public LayoutSize.Max(androidx.ui.core.Dp maxWidth, androidx.ui.core.Dp maxHeight);
- ctor public LayoutSize.Max(androidx.ui.core.Dp maxSize);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.core.Dp component2();
- method public androidx.ui.layout.LayoutSize.Max copy(androidx.ui.core.Dp maxWidth, androidx.ui.core.Dp maxHeight);
+ ctor public LayoutSize.Max(androidx.ui.unit.Dp maxWidth, androidx.ui.unit.Dp maxHeight);
+ ctor public LayoutSize.Max(androidx.ui.unit.Dp maxSize);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.unit.Dp component2();
+ method public androidx.ui.layout.LayoutSize.Max copy(androidx.ui.unit.Dp maxWidth, androidx.ui.unit.Dp maxHeight);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getMaxHeight();
- method public androidx.ui.core.Dp getMaxWidth();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getMaxHeight();
+ method public androidx.ui.unit.Dp getMaxWidth();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public static final class LayoutSize.Min implements androidx.ui.core.LayoutModifier {
- ctor public LayoutSize.Min(androidx.ui.core.Dp minWidth, androidx.ui.core.Dp minHeight);
- ctor public LayoutSize.Min(androidx.ui.core.Dp minSize);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.core.Dp component2();
- method public androidx.ui.layout.LayoutSize.Min copy(androidx.ui.core.Dp minWidth, androidx.ui.core.Dp minHeight);
+ ctor public LayoutSize.Min(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp minHeight);
+ ctor public LayoutSize.Min(androidx.ui.unit.Dp minSize);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.unit.Dp component2();
+ method public androidx.ui.layout.LayoutSize.Min copy(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp minHeight);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getMinHeight();
- method public androidx.ui.core.Dp getMinWidth();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getMinHeight();
+ method public androidx.ui.unit.Dp getMinWidth();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public final class LayoutWidth implements androidx.ui.core.LayoutModifier {
- ctor public LayoutWidth(androidx.ui.core.Dp width);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.layout.LayoutWidth copy(androidx.ui.core.Dp width);
+ ctor public LayoutWidth(androidx.ui.unit.Dp width);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.layout.LayoutWidth copy(androidx.ui.unit.Dp width);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getWidth();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getWidth();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public static final class LayoutWidth.Constrain implements androidx.ui.core.LayoutModifier {
- ctor public LayoutWidth.Constrain(androidx.ui.core.Dp minWidth, androidx.ui.core.Dp maxWidth);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.core.Dp component2();
- method public androidx.ui.layout.LayoutWidth.Constrain copy(androidx.ui.core.Dp minWidth, androidx.ui.core.Dp maxWidth);
+ ctor public LayoutWidth.Constrain(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp maxWidth);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.unit.Dp component2();
+ method public androidx.ui.layout.LayoutWidth.Constrain copy(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp maxWidth);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getMaxWidth();
- method public androidx.ui.core.Dp getMinWidth();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getMaxWidth();
+ method public androidx.ui.unit.Dp getMinWidth();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public static final class LayoutWidth.Fill implements androidx.ui.core.LayoutModifier {
- method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints);
+ method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints);
field public static final androidx.ui.layout.LayoutWidth.Fill! INSTANCE;
}
public static final class LayoutWidth.Max implements androidx.ui.core.LayoutModifier {
- ctor public LayoutWidth.Max(androidx.ui.core.Dp maxWidth);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.layout.LayoutWidth.Max copy(androidx.ui.core.Dp maxWidth);
+ ctor public LayoutWidth.Max(androidx.ui.unit.Dp maxWidth);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.layout.LayoutWidth.Max copy(androidx.ui.unit.Dp maxWidth);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getMaxWidth();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getMaxWidth();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public static final class LayoutWidth.Min implements androidx.ui.core.LayoutModifier {
- ctor public LayoutWidth.Min(androidx.ui.core.Dp minWidth);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.layout.LayoutWidth.Min copy(androidx.ui.core.Dp minWidth);
+ ctor public LayoutWidth.Min(androidx.ui.unit.Dp minWidth);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.layout.LayoutWidth.Min copy(androidx.ui.unit.Dp minWidth);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getMinWidth();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getMinWidth();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
@@ -441,12 +441,12 @@
}
public final class PaddingKt {
- method public static androidx.ui.layout.LayoutPadding LayoutPadding(androidx.ui.core.Dp all);
+ method public static androidx.ui.layout.LayoutPadding LayoutPadding(androidx.ui.unit.Dp all);
method public static void Padding(androidx.ui.layout.EdgeInsets padding, kotlin.jvm.functions.Function0<kotlin.Unit> children);
- method public static void Padding(androidx.ui.core.Dp left = 0.dp, androidx.ui.core.Dp top = 0.dp, androidx.ui.core.Dp right = 0.dp, androidx.ui.core.Dp bottom = 0.dp, kotlin.jvm.functions.Function0<kotlin.Unit> children);
- method public static void Padding(androidx.ui.core.Dp padding, kotlin.jvm.functions.Function0<kotlin.Unit> children);
- method @Deprecated public static androidx.ui.core.LayoutModifier Spacing(androidx.ui.core.Dp left = 0.dp, androidx.ui.core.Dp top = 0.dp, androidx.ui.core.Dp right = 0.dp, androidx.ui.core.Dp bottom = 0.dp);
- method @Deprecated public static androidx.ui.core.LayoutModifier Spacing(androidx.ui.core.Dp all = 0.dp);
+ method public static void Padding(androidx.ui.unit.Dp left = 0.dp, androidx.ui.unit.Dp top = 0.dp, androidx.ui.unit.Dp right = 0.dp, androidx.ui.unit.Dp bottom = 0.dp, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+ method public static void Padding(androidx.ui.unit.Dp padding, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+ method @Deprecated public static androidx.ui.core.LayoutModifier Spacing(androidx.ui.unit.Dp left = 0.dp, androidx.ui.unit.Dp top = 0.dp, androidx.ui.unit.Dp right = 0.dp, androidx.ui.unit.Dp bottom = 0.dp);
+ method @Deprecated public static androidx.ui.core.LayoutModifier Spacing(androidx.ui.unit.Dp all = 0.dp);
}
public final class RowScope extends androidx.ui.layout.FlexScope {
@@ -502,27 +502,27 @@
}
public abstract class TableColumnWidth {
- method public androidx.ui.core.IntPx maxIntrinsicWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density, androidx.ui.core.IntPx availableHeight);
- method public androidx.ui.core.IntPx minIntrinsicWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density, androidx.ui.core.IntPx availableHeight);
- method public abstract androidx.ui.core.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density);
+ method public androidx.ui.unit.IntPx maxIntrinsicWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density, androidx.ui.unit.IntPx availableHeight);
+ method public androidx.ui.unit.IntPx minIntrinsicWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density, androidx.ui.unit.IntPx availableHeight);
+ method public abstract androidx.ui.unit.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density);
}
public static final class TableColumnWidth.Fixed extends androidx.ui.layout.TableColumnWidth.Inflexible {
- ctor public TableColumnWidth.Fixed(androidx.ui.core.Dp width);
- method public androidx.ui.layout.TableColumnWidth.Fixed copy(androidx.ui.core.Dp width);
- method public androidx.ui.core.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density);
+ ctor public TableColumnWidth.Fixed(androidx.ui.unit.Dp width);
+ method public androidx.ui.layout.TableColumnWidth.Fixed copy(androidx.ui.unit.Dp width);
+ method public androidx.ui.unit.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density);
}
public static final class TableColumnWidth.Flex extends androidx.ui.layout.TableColumnWidth {
ctor public TableColumnWidth.Flex(@FloatRange(from=null) float flex);
method public androidx.ui.layout.TableColumnWidth.Flex copy(float flex);
- method public androidx.ui.core.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density);
+ method public androidx.ui.unit.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density);
}
public static final class TableColumnWidth.Fraction extends androidx.ui.layout.TableColumnWidth.Inflexible {
ctor public TableColumnWidth.Fraction(@FloatRange(from=null, to=null) float fraction);
method public androidx.ui.layout.TableColumnWidth.Fraction copy(float fraction);
- method public androidx.ui.core.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density);
+ method public androidx.ui.unit.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density);
}
public abstract static class TableColumnWidth.Inflexible extends androidx.ui.layout.TableColumnWidth {
@@ -533,36 +533,36 @@
public static final class TableColumnWidth.Max extends androidx.ui.layout.TableColumnWidth.Inflexible {
ctor public TableColumnWidth.Max(androidx.ui.layout.TableColumnWidth.Inflexible a, androidx.ui.layout.TableColumnWidth.Inflexible b);
method public androidx.ui.layout.TableColumnWidth.Max copy(androidx.ui.layout.TableColumnWidth.Inflexible a, androidx.ui.layout.TableColumnWidth.Inflexible b);
- method public androidx.ui.core.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density);
+ method public androidx.ui.unit.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density);
}
public static final class TableColumnWidth.MaxIntrinsic extends androidx.ui.layout.TableColumnWidth.Inflexible {
- method public androidx.ui.core.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density);
+ method public androidx.ui.unit.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density);
field public static final androidx.ui.layout.TableColumnWidth.MaxIntrinsic! INSTANCE;
}
public static final class TableColumnWidth.Min extends androidx.ui.layout.TableColumnWidth.Inflexible {
ctor public TableColumnWidth.Min(androidx.ui.layout.TableColumnWidth.Inflexible a, androidx.ui.layout.TableColumnWidth.Inflexible b);
method public androidx.ui.layout.TableColumnWidth.Min copy(androidx.ui.layout.TableColumnWidth.Inflexible a, androidx.ui.layout.TableColumnWidth.Inflexible b);
- method public androidx.ui.core.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density);
+ method public androidx.ui.unit.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density);
}
public static final class TableColumnWidth.MinIntrinsic extends androidx.ui.layout.TableColumnWidth.Inflexible {
- method public androidx.ui.core.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density);
+ method public androidx.ui.unit.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density);
field public static final androidx.ui.layout.TableColumnWidth.MinIntrinsic! INSTANCE;
}
public static final class TableColumnWidth.Wrap extends androidx.ui.layout.TableColumnWidth.Inflexible {
- method public androidx.ui.core.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density);
+ method public androidx.ui.unit.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density);
field public static final androidx.ui.layout.TableColumnWidth.Wrap! INSTANCE;
}
public final class TableDecorationChildren {
- method public java.util.List<androidx.ui.core.IntPx> component1();
- method public java.util.List<androidx.ui.core.IntPx> component2();
- method public androidx.ui.layout.TableDecorationChildren copy(java.util.List<androidx.ui.core.IntPx> verticalOffsets, java.util.List<androidx.ui.core.IntPx> horizontalOffsets);
- method public java.util.List<androidx.ui.core.IntPx> getHorizontalOffsets();
- method public java.util.List<androidx.ui.core.IntPx> getVerticalOffsets();
+ method public java.util.List<androidx.ui.unit.IntPx> component1();
+ method public java.util.List<androidx.ui.unit.IntPx> component2();
+ method public androidx.ui.layout.TableDecorationChildren copy(java.util.List<androidx.ui.unit.IntPx> verticalOffsets, java.util.List<androidx.ui.unit.IntPx> horizontalOffsets);
+ method public java.util.List<androidx.ui.unit.IntPx> getHorizontalOffsets();
+ method public java.util.List<androidx.ui.unit.IntPx> getVerticalOffsets();
}
public final class TableKt {
@@ -570,13 +570,13 @@
}
public final class TableMeasurable {
- method public kotlin.jvm.functions.Function0<androidx.ui.core.IntPx> component1();
- method public kotlin.jvm.functions.Function1<androidx.ui.core.IntPx,androidx.ui.core.IntPx> component2();
- method public kotlin.jvm.functions.Function1<androidx.ui.core.IntPx,androidx.ui.core.IntPx> component3();
- method public androidx.ui.layout.TableMeasurable copy(kotlin.jvm.functions.Function0<androidx.ui.core.IntPx> preferredWidth, kotlin.jvm.functions.Function1<? super androidx.ui.core.IntPx,androidx.ui.core.IntPx> minIntrinsicWidth, kotlin.jvm.functions.Function1<? super androidx.ui.core.IntPx,androidx.ui.core.IntPx> maxIntrinsicWidth);
- method public kotlin.jvm.functions.Function1<androidx.ui.core.IntPx,androidx.ui.core.IntPx> getMaxIntrinsicWidth();
- method public kotlin.jvm.functions.Function1<androidx.ui.core.IntPx,androidx.ui.core.IntPx> getMinIntrinsicWidth();
- method public kotlin.jvm.functions.Function0<androidx.ui.core.IntPx> getPreferredWidth();
+ method public kotlin.jvm.functions.Function0<androidx.ui.unit.IntPx> component1();
+ method public kotlin.jvm.functions.Function1<androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> component2();
+ method public kotlin.jvm.functions.Function1<androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> component3();
+ method public androidx.ui.layout.TableMeasurable copy(kotlin.jvm.functions.Function0<androidx.ui.unit.IntPx> preferredWidth, kotlin.jvm.functions.Function1<? super androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> minIntrinsicWidth, kotlin.jvm.functions.Function1<? super androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> maxIntrinsicWidth);
+ method public kotlin.jvm.functions.Function1<androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> getMaxIntrinsicWidth();
+ method public kotlin.jvm.functions.Function1<androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> getMinIntrinsicWidth();
+ method public kotlin.jvm.functions.Function0<androidx.ui.unit.IntPx> getPreferredWidth();
}
public final class WrapKt {
@@ -599,13 +599,13 @@
public final class ConstraintSetBuilderScope {
method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalAnchor.BarrierAnchor createBottomBarrier(androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.ConstrainedLayoutReference... elements);
- method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalAnchor.GuidelineAnchor createGuidelineFromBottom(androidx.ui.core.Dp offset);
+ method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalAnchor.GuidelineAnchor createGuidelineFromBottom(androidx.ui.unit.Dp offset);
method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalAnchor.GuidelineAnchor createGuidelineFromBottom(float percent);
- method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.VerticalAnchor.GuidelineAnchor createGuidelineFromLeft(androidx.ui.core.Dp offset);
+ method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.VerticalAnchor.GuidelineAnchor createGuidelineFromLeft(androidx.ui.unit.Dp offset);
method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.VerticalAnchor.GuidelineAnchor createGuidelineFromLeft(float percent);
- method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.VerticalAnchor.GuidelineAnchor createGuidelineFromRight(androidx.ui.core.Dp offset);
+ method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.VerticalAnchor.GuidelineAnchor createGuidelineFromRight(androidx.ui.unit.Dp offset);
method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.VerticalAnchor.GuidelineAnchor createGuidelineFromRight(float percent);
- method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalAnchor.GuidelineAnchor createGuidelineFromTop(androidx.ui.core.Dp offset);
+ method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalAnchor.GuidelineAnchor createGuidelineFromTop(androidx.ui.unit.Dp offset);
method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalAnchor.GuidelineAnchor createGuidelineFromTop(float percent);
method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalChain createHorizontalChain(androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.ConstrainedLayoutReference![] elements, androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.ChainStyle chainStyle = ChainStyle.Spread);
method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.VerticalAnchor.BarrierAnchor createLeftBarrier(androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.ConstrainedLayoutReference... elements);
@@ -672,21 +672,21 @@
public static final class ConstraintSetBuilderScope.HorizontalAnchor.BarrierAnchor extends androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalAnchor {
method public int getIndex$lintWithKotlin();
- method public androidx.ui.core.Dp getMargin();
+ method public androidx.ui.unit.Dp getMargin();
method public androidx.constraintlayout.solver.state.State getState$lintWithKotlin();
method public Object getTag$lintWithKotlin();
- method public void setMargin(androidx.ui.core.Dp value);
- property public final androidx.ui.core.Dp margin;
+ method public void setMargin(androidx.ui.unit.Dp value);
+ property public final androidx.ui.unit.Dp margin;
}
public static final class ConstraintSetBuilderScope.HorizontalAnchor.ConstrainedLayoutAnchor extends androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalAnchor {
method public infix void constrainTo(androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalAnchor other);
method public int getIndex$lintWithKotlin();
- method public androidx.ui.core.Dp getMargin();
+ method public androidx.ui.unit.Dp getMargin();
method public androidx.constraintlayout.solver.state.State getState$lintWithKotlin();
method public Object getTag$lintWithKotlin();
- method public void setMargin(androidx.ui.core.Dp value);
- property public final androidx.ui.core.Dp margin;
+ method public void setMargin(androidx.ui.unit.Dp value);
+ property public final androidx.ui.unit.Dp margin;
property public Object tag;
}
@@ -709,21 +709,21 @@
public static final class ConstraintSetBuilderScope.VerticalAnchor.BarrierAnchor extends androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.VerticalAnchor {
method public int getIndex$lintWithKotlin();
- method public androidx.ui.core.Dp getMargin();
+ method public androidx.ui.unit.Dp getMargin();
method public androidx.constraintlayout.solver.state.State getState$lintWithKotlin();
method public Object getTag$lintWithKotlin();
- method public void setMargin(androidx.ui.core.Dp value);
- property public final androidx.ui.core.Dp margin;
+ method public void setMargin(androidx.ui.unit.Dp value);
+ property public final androidx.ui.unit.Dp margin;
}
public static final class ConstraintSetBuilderScope.VerticalAnchor.ConstrainedLayoutAnchor extends androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.VerticalAnchor {
method public infix void constrainTo(androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.VerticalAnchor other);
method public int getIndex$lintWithKotlin();
- method public androidx.ui.core.Dp getMargin();
+ method public androidx.ui.unit.Dp getMargin();
method public androidx.constraintlayout.solver.state.State getState$lintWithKotlin();
method public Object getTag$lintWithKotlin();
- method public void setMargin(androidx.ui.core.Dp value);
- property public final androidx.ui.core.Dp margin;
+ method public void setMargin(androidx.ui.unit.Dp value);
+ property public final androidx.ui.unit.Dp margin;
property public Object tag;
}
diff --git a/ui/ui-layout/api/public_plus_experimental_current.txt b/ui/ui-layout/api/public_plus_experimental_current.txt
index 8cefaec..62add70 100644
--- a/ui/ui-layout/api/public_plus_experimental_current.txt
+++ b/ui/ui-layout/api/public_plus_experimental_current.txt
@@ -7,12 +7,12 @@
}
public final class AlignmentLineKt {
- method public static void AlignmentLineOffset(androidx.ui.core.AlignmentLine alignmentLine, androidx.ui.core.Dp before = 0.dp, androidx.ui.core.Dp after = 0.dp, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+ method public static void AlignmentLineOffset(androidx.ui.core.AlignmentLine alignmentLine, androidx.ui.unit.Dp before = 0.dp, androidx.ui.unit.Dp after = 0.dp, kotlin.jvm.functions.Function0<kotlin.Unit> children);
method public static void CenterAlignmentLine(androidx.ui.core.AlignmentLine alignmentLine, kotlin.jvm.functions.Function0<kotlin.Unit> children);
}
public final class Arrangement {
- ctor public Arrangement(internal kotlin.jvm.functions.Function2<? super androidx.ui.core.IntPx,? super java.util.List<androidx.ui.core.IntPx>,? extends java.util.List<androidx.ui.core.IntPx>> arrangeBlock);
+ ctor public Arrangement(internal kotlin.jvm.functions.Function2<? super androidx.ui.unit.IntPx,? super java.util.List<androidx.ui.unit.IntPx>,? extends java.util.List<androidx.ui.unit.IntPx>> arrangeBlock);
field public static final androidx.ui.layout.Arrangement.Companion! Companion;
}
@@ -46,7 +46,7 @@
}
public final class ContainerKt {
- method public static void Container(androidx.ui.core.Modifier modifier = Modifier.None, androidx.ui.layout.EdgeInsets padding = androidx.ui.layout.EdgeInsets(0.dp), androidx.ui.core.Alignment alignment = Alignment.Center, boolean expanded = false, androidx.ui.layout.DpConstraints constraints = androidx.ui.layout.DpConstraints(), androidx.ui.core.Dp? width = null, androidx.ui.core.Dp? height = null, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+ method public static void Container(androidx.ui.core.Modifier modifier = Modifier.None, androidx.ui.layout.EdgeInsets padding = androidx.ui.layout.EdgeInsets(0.dp), androidx.ui.core.Alignment alignment = Alignment.Center, boolean expanded = false, androidx.ui.layout.DpConstraints constraints = androidx.ui.layout.DpConstraints(), androidx.ui.unit.Dp? width = null, androidx.ui.unit.Dp? height = null, kotlin.jvm.functions.Function0<kotlin.Unit> children);
}
public final class CrossAxisAlignment {
@@ -66,29 +66,29 @@
}
public final class DpConstraints {
- ctor public DpConstraints(androidx.ui.core.Dp minWidth, androidx.ui.core.Dp maxWidth, androidx.ui.core.Dp minHeight, androidx.ui.core.Dp maxHeight);
+ ctor public DpConstraints(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp maxWidth, androidx.ui.unit.Dp minHeight, androidx.ui.unit.Dp maxHeight);
ctor public DpConstraints();
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.core.Dp component2();
- method public androidx.ui.core.Dp component3();
- method public androidx.ui.core.Dp component4();
- method public androidx.ui.layout.DpConstraints copy(androidx.ui.core.Dp minWidth, androidx.ui.core.Dp maxWidth, androidx.ui.core.Dp minHeight, androidx.ui.core.Dp maxHeight);
- method public androidx.ui.core.Dp getMaxHeight();
- method public androidx.ui.core.Dp getMaxWidth();
- method public androidx.ui.core.Dp getMinHeight();
- method public androidx.ui.core.Dp getMinWidth();
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.unit.Dp component2();
+ method public androidx.ui.unit.Dp component3();
+ method public androidx.ui.unit.Dp component4();
+ method public androidx.ui.layout.DpConstraints copy(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp maxWidth, androidx.ui.unit.Dp minHeight, androidx.ui.unit.Dp maxHeight);
+ method public androidx.ui.unit.Dp getMaxHeight();
+ method public androidx.ui.unit.Dp getMaxWidth();
+ method public androidx.ui.unit.Dp getMinHeight();
+ method public androidx.ui.unit.Dp getMinWidth();
field public static final androidx.ui.layout.DpConstraints.Companion! Companion;
}
public static final class DpConstraints.Companion {
- method public androidx.ui.layout.DpConstraints tightConstraints(androidx.ui.core.Dp width, androidx.ui.core.Dp height);
- method public androidx.ui.layout.DpConstraints tightConstraintsForHeight(androidx.ui.core.Dp height);
- method public androidx.ui.layout.DpConstraints tightConstraintsForWidth(androidx.ui.core.Dp width);
+ method public androidx.ui.layout.DpConstraints tightConstraints(androidx.ui.unit.Dp width, androidx.ui.unit.Dp height);
+ method public androidx.ui.layout.DpConstraints tightConstraintsForHeight(androidx.ui.unit.Dp height);
+ method public androidx.ui.layout.DpConstraints tightConstraintsForWidth(androidx.ui.unit.Dp width);
}
public final class DpConstraintsKt {
- method public static androidx.ui.core.Constraints Constraints(androidx.ui.core.DensityScope, androidx.ui.layout.DpConstraints dpConstraints);
- method public static androidx.ui.layout.DpConstraints DpConstraints(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints);
+ method public static androidx.ui.core.Constraints Constraints(androidx.ui.unit.DensityScope, androidx.ui.layout.DpConstraints dpConstraints);
+ method public static androidx.ui.layout.DpConstraints DpConstraints(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints);
method public static androidx.ui.layout.DpConstraints enforce(androidx.ui.layout.DpConstraints, androidx.ui.layout.DpConstraints otherConstraints);
method public static boolean getHasBoundedHeight(androidx.ui.layout.DpConstraints);
method public static boolean getHasBoundedWidth(androidx.ui.layout.DpConstraints);
@@ -99,25 +99,25 @@
method public static boolean isZero(androidx.ui.layout.DpConstraints);
method public static androidx.ui.layout.DpConstraints looseMax(androidx.ui.layout.DpConstraints);
method public static androidx.ui.layout.DpConstraints looseMin(androidx.ui.layout.DpConstraints);
- method public static androidx.ui.layout.DpConstraints offset(androidx.ui.layout.DpConstraints, androidx.ui.core.Dp horizontal = 0.dp, androidx.ui.core.Dp vertical = 0.dp);
+ method public static androidx.ui.layout.DpConstraints offset(androidx.ui.layout.DpConstraints, androidx.ui.unit.Dp horizontal = 0.dp, androidx.ui.unit.Dp vertical = 0.dp);
method public static androidx.ui.layout.DpConstraints tightMax(androidx.ui.layout.DpConstraints);
method public static androidx.ui.layout.DpConstraints tightMin(androidx.ui.layout.DpConstraints);
- method public static androidx.ui.layout.DpConstraints withTight(androidx.ui.layout.DpConstraints, androidx.ui.core.Dp? width = null, androidx.ui.core.Dp? height = null);
+ method public static androidx.ui.layout.DpConstraints withTight(androidx.ui.layout.DpConstraints, androidx.ui.unit.Dp? width = null, androidx.ui.unit.Dp? height = null);
}
public final class EdgeInsets {
- ctor public EdgeInsets(androidx.ui.core.Dp left, androidx.ui.core.Dp top, androidx.ui.core.Dp right, androidx.ui.core.Dp bottom);
+ ctor public EdgeInsets(androidx.ui.unit.Dp left, androidx.ui.unit.Dp top, androidx.ui.unit.Dp right, androidx.ui.unit.Dp bottom);
ctor public EdgeInsets();
- ctor public EdgeInsets(androidx.ui.core.Dp all);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.core.Dp component2();
- method public androidx.ui.core.Dp component3();
- method public androidx.ui.core.Dp component4();
- method public androidx.ui.layout.EdgeInsets copy(androidx.ui.core.Dp left, androidx.ui.core.Dp top, androidx.ui.core.Dp right, androidx.ui.core.Dp bottom);
- method public androidx.ui.core.Dp getBottom();
- method public androidx.ui.core.Dp getLeft();
- method public androidx.ui.core.Dp getRight();
- method public androidx.ui.core.Dp getTop();
+ ctor public EdgeInsets(androidx.ui.unit.Dp all);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.unit.Dp component2();
+ method public androidx.ui.unit.Dp component3();
+ method public androidx.ui.unit.Dp component4();
+ method public androidx.ui.layout.EdgeInsets copy(androidx.ui.unit.Dp left, androidx.ui.unit.Dp top, androidx.ui.unit.Dp right, androidx.ui.unit.Dp bottom);
+ method public androidx.ui.unit.Dp getBottom();
+ method public androidx.ui.unit.Dp getLeft();
+ method public androidx.ui.unit.Dp getRight();
+ method public androidx.ui.unit.Dp getTop();
}
public final class FlexChildren {
@@ -135,7 +135,7 @@
@androidx.ui.layout.LayoutScopeMarker public abstract sealed class FlexScope {
method public final androidx.ui.core.ParentDataModifier LayoutFlexible(@FloatRange(from=0.0, fromInclusive=false) float flex, boolean tight = true);
- method public final androidx.ui.core.ParentDataModifier RelativeToSiblings(androidx.ui.layout.LayoutGravity, kotlin.jvm.functions.Function1<? super androidx.ui.core.Placeable,androidx.ui.core.IntPx> alignmentLineBlock);
+ method public final androidx.ui.core.ParentDataModifier RelativeToSiblings(androidx.ui.layout.LayoutGravity, kotlin.jvm.functions.Function1<? super androidx.ui.core.Placeable,androidx.ui.unit.IntPx> alignmentLineBlock);
method public final androidx.ui.core.ParentDataModifier getLayoutInflexible();
property public final androidx.ui.core.ParentDataModifier LayoutInflexible;
}
@@ -147,8 +147,8 @@
}
public final class FlowKt {
- method public static void FlowColumn(androidx.ui.layout.SizeMode mainAxisSize = androidx.ui.layout.SizeMode.Wrap, androidx.ui.layout.MainAxisAlignment mainAxisAlignment = androidx.ui.layout.MainAxisAlignment.Start, androidx.ui.core.Dp mainAxisSpacing = 0.dp, androidx.ui.layout.FlowCrossAxisAlignment crossAxisAlignment = androidx.ui.layout.FlowCrossAxisAlignment.Start, androidx.ui.core.Dp crossAxisSpacing = 0.dp, androidx.ui.layout.MainAxisAlignment lastLineMainAxisAlignment = mainAxisAlignment, kotlin.jvm.functions.Function0<kotlin.Unit> children);
- method public static void FlowRow(androidx.ui.layout.SizeMode mainAxisSize = androidx.ui.layout.SizeMode.Wrap, androidx.ui.layout.MainAxisAlignment mainAxisAlignment = androidx.ui.layout.MainAxisAlignment.Start, androidx.ui.core.Dp mainAxisSpacing = 0.dp, androidx.ui.layout.FlowCrossAxisAlignment crossAxisAlignment = androidx.ui.layout.FlowCrossAxisAlignment.Start, androidx.ui.core.Dp crossAxisSpacing = 0.dp, androidx.ui.layout.MainAxisAlignment lastLineMainAxisAlignment = mainAxisAlignment, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+ method public static void FlowColumn(androidx.ui.layout.SizeMode mainAxisSize = androidx.ui.layout.SizeMode.Wrap, androidx.ui.layout.MainAxisAlignment mainAxisAlignment = androidx.ui.layout.MainAxisAlignment.Start, androidx.ui.unit.Dp mainAxisSpacing = 0.dp, androidx.ui.layout.FlowCrossAxisAlignment crossAxisAlignment = androidx.ui.layout.FlowCrossAxisAlignment.Start, androidx.ui.unit.Dp crossAxisSpacing = 0.dp, androidx.ui.layout.MainAxisAlignment lastLineMainAxisAlignment = mainAxisAlignment, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+ method public static void FlowRow(androidx.ui.layout.SizeMode mainAxisSize = androidx.ui.layout.SizeMode.Wrap, androidx.ui.layout.MainAxisAlignment mainAxisAlignment = androidx.ui.layout.MainAxisAlignment.Start, androidx.ui.unit.Dp mainAxisSpacing = 0.dp, androidx.ui.layout.FlowCrossAxisAlignment crossAxisAlignment = androidx.ui.layout.FlowCrossAxisAlignment.Start, androidx.ui.unit.Dp crossAxisSpacing = 0.dp, androidx.ui.layout.MainAxisAlignment lastLineMainAxisAlignment = mainAxisAlignment, kotlin.jvm.functions.Function0<kotlin.Unit> children);
}
public final class IntrinsicKt {
@@ -197,11 +197,11 @@
method public float component1();
method public androidx.ui.layout.LayoutAspectRatio copy(float aspectRatio);
method public float getAspectRatio();
- method public androidx.ui.core.IntPx maxIntrinsicHeightOf(androidx.ui.core.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.core.IntPx width);
- method public androidx.ui.core.IntPx maxIntrinsicWidthOf(androidx.ui.core.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.core.IntPx height);
- method public androidx.ui.core.IntPx minIntrinsicHeightOf(androidx.ui.core.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.core.IntPx width);
- method public androidx.ui.core.IntPx minIntrinsicWidthOf(androidx.ui.core.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.core.IntPx height);
- method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints);
+ method public androidx.ui.unit.IntPx maxIntrinsicHeightOf(androidx.ui.unit.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.unit.IntPx width);
+ method public androidx.ui.unit.IntPx maxIntrinsicWidthOf(androidx.ui.unit.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.unit.IntPx height);
+ method public androidx.ui.unit.IntPx minIntrinsicHeightOf(androidx.ui.unit.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.unit.IntPx width);
+ method public androidx.ui.unit.IntPx minIntrinsicWidthOf(androidx.ui.unit.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.unit.IntPx height);
+ method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints);
}
public final class LayoutGravity {
@@ -209,224 +209,224 @@
}
public final class LayoutHeight implements androidx.ui.core.LayoutModifier {
- ctor public LayoutHeight(androidx.ui.core.Dp height);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.layout.LayoutHeight copy(androidx.ui.core.Dp height);
+ ctor public LayoutHeight(androidx.ui.unit.Dp height);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.layout.LayoutHeight copy(androidx.ui.unit.Dp height);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getHeight();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getHeight();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public static final class LayoutHeight.Constrain implements androidx.ui.core.LayoutModifier {
- ctor public LayoutHeight.Constrain(androidx.ui.core.Dp minHeight, androidx.ui.core.Dp maxHeight);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.core.Dp component2();
- method public androidx.ui.layout.LayoutHeight.Constrain copy(androidx.ui.core.Dp minHeight, androidx.ui.core.Dp maxHeight);
+ ctor public LayoutHeight.Constrain(androidx.ui.unit.Dp minHeight, androidx.ui.unit.Dp maxHeight);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.unit.Dp component2();
+ method public androidx.ui.layout.LayoutHeight.Constrain copy(androidx.ui.unit.Dp minHeight, androidx.ui.unit.Dp maxHeight);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getMaxHeight();
- method public androidx.ui.core.Dp getMinHeight();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getMaxHeight();
+ method public androidx.ui.unit.Dp getMinHeight();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public static final class LayoutHeight.Fill implements androidx.ui.core.LayoutModifier {
- method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints);
+ method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints);
field public static final androidx.ui.layout.LayoutHeight.Fill! INSTANCE;
}
public static final class LayoutHeight.Max implements androidx.ui.core.LayoutModifier {
- ctor public LayoutHeight.Max(androidx.ui.core.Dp maxHeight);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.layout.LayoutHeight.Max copy(androidx.ui.core.Dp maxHeight);
+ ctor public LayoutHeight.Max(androidx.ui.unit.Dp maxHeight);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.layout.LayoutHeight.Max copy(androidx.ui.unit.Dp maxHeight);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getMaxHeight();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getMaxHeight();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public static final class LayoutHeight.Min implements androidx.ui.core.LayoutModifier {
- ctor public LayoutHeight.Min(androidx.ui.core.Dp minHeight);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.layout.LayoutHeight.Min copy(androidx.ui.core.Dp minHeight);
+ ctor public LayoutHeight.Min(androidx.ui.unit.Dp minHeight);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.layout.LayoutHeight.Min copy(androidx.ui.unit.Dp minHeight);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getMinHeight();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getMinHeight();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public final class LayoutPadding implements androidx.ui.core.LayoutModifier {
- ctor public LayoutPadding(androidx.ui.core.Dp left, androidx.ui.core.Dp top, androidx.ui.core.Dp right, androidx.ui.core.Dp bottom);
+ ctor public LayoutPadding(androidx.ui.unit.Dp left, androidx.ui.unit.Dp top, androidx.ui.unit.Dp right, androidx.ui.unit.Dp bottom);
ctor public LayoutPadding();
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.core.Dp component2();
- method public androidx.ui.core.Dp component3();
- method public androidx.ui.core.Dp component4();
- method public androidx.ui.layout.LayoutPadding copy(androidx.ui.core.Dp left, androidx.ui.core.Dp top, androidx.ui.core.Dp right, androidx.ui.core.Dp bottom);
- method public androidx.ui.core.Dp getBottom();
- method public androidx.ui.core.Dp getLeft();
- method public androidx.ui.core.Dp getRight();
- method public androidx.ui.core.Dp getTop();
- method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.unit.Dp component2();
+ method public androidx.ui.unit.Dp component3();
+ method public androidx.ui.unit.Dp component4();
+ method public androidx.ui.layout.LayoutPadding copy(androidx.ui.unit.Dp left, androidx.ui.unit.Dp top, androidx.ui.unit.Dp right, androidx.ui.unit.Dp bottom);
+ method public androidx.ui.unit.Dp getBottom();
+ method public androidx.ui.unit.Dp getLeft();
+ method public androidx.ui.unit.Dp getRight();
+ method public androidx.ui.unit.Dp getTop();
+ method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
}
@kotlin.DslMarker public @interface LayoutScopeMarker {
}
public final class LayoutSize implements androidx.ui.core.LayoutModifier {
- ctor public LayoutSize(androidx.ui.core.Dp width, androidx.ui.core.Dp height);
- ctor public LayoutSize(androidx.ui.core.Dp size);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.core.Dp component2();
- method public androidx.ui.layout.LayoutSize copy(androidx.ui.core.Dp width, androidx.ui.core.Dp height);
+ ctor public LayoutSize(androidx.ui.unit.Dp width, androidx.ui.unit.Dp height);
+ ctor public LayoutSize(androidx.ui.unit.Dp size);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.unit.Dp component2();
+ method public androidx.ui.layout.LayoutSize copy(androidx.ui.unit.Dp width, androidx.ui.unit.Dp height);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getHeight();
- method public androidx.ui.core.Dp getWidth();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getHeight();
+ method public androidx.ui.unit.Dp getWidth();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public static final class LayoutSize.Constrain implements androidx.ui.core.LayoutModifier {
- ctor public LayoutSize.Constrain(androidx.ui.core.Dp minWidth, androidx.ui.core.Dp minHeight, androidx.ui.core.Dp maxWidth, androidx.ui.core.Dp maxHeight);
- ctor public LayoutSize.Constrain(androidx.ui.core.Dp minSize, androidx.ui.core.Dp maxSize);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.core.Dp component2();
- method public androidx.ui.core.Dp component3();
- method public androidx.ui.core.Dp component4();
- method public androidx.ui.layout.LayoutSize.Constrain copy(androidx.ui.core.Dp minWidth, androidx.ui.core.Dp minHeight, androidx.ui.core.Dp maxWidth, androidx.ui.core.Dp maxHeight);
+ ctor public LayoutSize.Constrain(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp minHeight, androidx.ui.unit.Dp maxWidth, androidx.ui.unit.Dp maxHeight);
+ ctor public LayoutSize.Constrain(androidx.ui.unit.Dp minSize, androidx.ui.unit.Dp maxSize);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.unit.Dp component2();
+ method public androidx.ui.unit.Dp component3();
+ method public androidx.ui.unit.Dp component4();
+ method public androidx.ui.layout.LayoutSize.Constrain copy(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp minHeight, androidx.ui.unit.Dp maxWidth, androidx.ui.unit.Dp maxHeight);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getMaxHeight();
- method public androidx.ui.core.Dp getMaxWidth();
- method public androidx.ui.core.Dp getMinHeight();
- method public androidx.ui.core.Dp getMinWidth();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getMaxHeight();
+ method public androidx.ui.unit.Dp getMaxWidth();
+ method public androidx.ui.unit.Dp getMinHeight();
+ method public androidx.ui.unit.Dp getMinWidth();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public static final class LayoutSize.Fill implements androidx.ui.core.LayoutModifier {
- method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints);
+ method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints);
field public static final androidx.ui.layout.LayoutSize.Fill! INSTANCE;
}
public static final class LayoutSize.Max implements androidx.ui.core.LayoutModifier {
- ctor public LayoutSize.Max(androidx.ui.core.Dp maxWidth, androidx.ui.core.Dp maxHeight);
- ctor public LayoutSize.Max(androidx.ui.core.Dp maxSize);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.core.Dp component2();
- method public androidx.ui.layout.LayoutSize.Max copy(androidx.ui.core.Dp maxWidth, androidx.ui.core.Dp maxHeight);
+ ctor public LayoutSize.Max(androidx.ui.unit.Dp maxWidth, androidx.ui.unit.Dp maxHeight);
+ ctor public LayoutSize.Max(androidx.ui.unit.Dp maxSize);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.unit.Dp component2();
+ method public androidx.ui.layout.LayoutSize.Max copy(androidx.ui.unit.Dp maxWidth, androidx.ui.unit.Dp maxHeight);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getMaxHeight();
- method public androidx.ui.core.Dp getMaxWidth();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getMaxHeight();
+ method public androidx.ui.unit.Dp getMaxWidth();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public static final class LayoutSize.Min implements androidx.ui.core.LayoutModifier {
- ctor public LayoutSize.Min(androidx.ui.core.Dp minWidth, androidx.ui.core.Dp minHeight);
- ctor public LayoutSize.Min(androidx.ui.core.Dp minSize);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.core.Dp component2();
- method public androidx.ui.layout.LayoutSize.Min copy(androidx.ui.core.Dp minWidth, androidx.ui.core.Dp minHeight);
+ ctor public LayoutSize.Min(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp minHeight);
+ ctor public LayoutSize.Min(androidx.ui.unit.Dp minSize);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.unit.Dp component2();
+ method public androidx.ui.layout.LayoutSize.Min copy(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp minHeight);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getMinHeight();
- method public androidx.ui.core.Dp getMinWidth();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getMinHeight();
+ method public androidx.ui.unit.Dp getMinWidth();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public final class LayoutWidth implements androidx.ui.core.LayoutModifier {
- ctor public LayoutWidth(androidx.ui.core.Dp width);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.layout.LayoutWidth copy(androidx.ui.core.Dp width);
+ ctor public LayoutWidth(androidx.ui.unit.Dp width);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.layout.LayoutWidth copy(androidx.ui.unit.Dp width);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getWidth();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getWidth();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public static final class LayoutWidth.Constrain implements androidx.ui.core.LayoutModifier {
- ctor public LayoutWidth.Constrain(androidx.ui.core.Dp minWidth, androidx.ui.core.Dp maxWidth);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.core.Dp component2();
- method public androidx.ui.layout.LayoutWidth.Constrain copy(androidx.ui.core.Dp minWidth, androidx.ui.core.Dp maxWidth);
+ ctor public LayoutWidth.Constrain(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp maxWidth);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.unit.Dp component2();
+ method public androidx.ui.layout.LayoutWidth.Constrain copy(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp maxWidth);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getMaxWidth();
- method public androidx.ui.core.Dp getMinWidth();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getMaxWidth();
+ method public androidx.ui.unit.Dp getMinWidth();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public static final class LayoutWidth.Fill implements androidx.ui.core.LayoutModifier {
- method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints);
+ method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints);
field public static final androidx.ui.layout.LayoutWidth.Fill! INSTANCE;
}
public static final class LayoutWidth.Max implements androidx.ui.core.LayoutModifier {
- ctor public LayoutWidth.Max(androidx.ui.core.Dp maxWidth);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.layout.LayoutWidth.Max copy(androidx.ui.core.Dp maxWidth);
+ ctor public LayoutWidth.Max(androidx.ui.unit.Dp maxWidth);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.layout.LayoutWidth.Max copy(androidx.ui.unit.Dp maxWidth);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getMaxWidth();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getMaxWidth();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public static final class LayoutWidth.Min implements androidx.ui.core.LayoutModifier {
- ctor public LayoutWidth.Min(androidx.ui.core.Dp minWidth);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.layout.LayoutWidth.Min copy(androidx.ui.core.Dp minWidth);
+ ctor public LayoutWidth.Min(androidx.ui.unit.Dp minWidth);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.layout.LayoutWidth.Min copy(androidx.ui.unit.Dp minWidth);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getMinWidth();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getMinWidth();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
@@ -441,12 +441,12 @@
}
public final class PaddingKt {
- method public static androidx.ui.layout.LayoutPadding LayoutPadding(androidx.ui.core.Dp all);
+ method public static androidx.ui.layout.LayoutPadding LayoutPadding(androidx.ui.unit.Dp all);
method public static void Padding(androidx.ui.layout.EdgeInsets padding, kotlin.jvm.functions.Function0<kotlin.Unit> children);
- method public static void Padding(androidx.ui.core.Dp left = 0.dp, androidx.ui.core.Dp top = 0.dp, androidx.ui.core.Dp right = 0.dp, androidx.ui.core.Dp bottom = 0.dp, kotlin.jvm.functions.Function0<kotlin.Unit> children);
- method public static void Padding(androidx.ui.core.Dp padding, kotlin.jvm.functions.Function0<kotlin.Unit> children);
- method @Deprecated public static androidx.ui.core.LayoutModifier Spacing(androidx.ui.core.Dp left = 0.dp, androidx.ui.core.Dp top = 0.dp, androidx.ui.core.Dp right = 0.dp, androidx.ui.core.Dp bottom = 0.dp);
- method @Deprecated public static androidx.ui.core.LayoutModifier Spacing(androidx.ui.core.Dp all = 0.dp);
+ method public static void Padding(androidx.ui.unit.Dp left = 0.dp, androidx.ui.unit.Dp top = 0.dp, androidx.ui.unit.Dp right = 0.dp, androidx.ui.unit.Dp bottom = 0.dp, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+ method public static void Padding(androidx.ui.unit.Dp padding, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+ method @Deprecated public static androidx.ui.core.LayoutModifier Spacing(androidx.ui.unit.Dp left = 0.dp, androidx.ui.unit.Dp top = 0.dp, androidx.ui.unit.Dp right = 0.dp, androidx.ui.unit.Dp bottom = 0.dp);
+ method @Deprecated public static androidx.ui.core.LayoutModifier Spacing(androidx.ui.unit.Dp all = 0.dp);
}
public final class RowScope extends androidx.ui.layout.FlexScope {
@@ -502,27 +502,27 @@
}
public abstract class TableColumnWidth {
- method public androidx.ui.core.IntPx maxIntrinsicWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density, androidx.ui.core.IntPx availableHeight);
- method public androidx.ui.core.IntPx minIntrinsicWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density, androidx.ui.core.IntPx availableHeight);
- method public abstract androidx.ui.core.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density);
+ method public androidx.ui.unit.IntPx maxIntrinsicWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density, androidx.ui.unit.IntPx availableHeight);
+ method public androidx.ui.unit.IntPx minIntrinsicWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density, androidx.ui.unit.IntPx availableHeight);
+ method public abstract androidx.ui.unit.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density);
}
public static final class TableColumnWidth.Fixed extends androidx.ui.layout.TableColumnWidth.Inflexible {
- ctor public TableColumnWidth.Fixed(androidx.ui.core.Dp width);
- method public androidx.ui.layout.TableColumnWidth.Fixed copy(androidx.ui.core.Dp width);
- method public androidx.ui.core.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density);
+ ctor public TableColumnWidth.Fixed(androidx.ui.unit.Dp width);
+ method public androidx.ui.layout.TableColumnWidth.Fixed copy(androidx.ui.unit.Dp width);
+ method public androidx.ui.unit.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density);
}
public static final class TableColumnWidth.Flex extends androidx.ui.layout.TableColumnWidth {
ctor public TableColumnWidth.Flex(@FloatRange(from=null) float flex);
method public androidx.ui.layout.TableColumnWidth.Flex copy(float flex);
- method public androidx.ui.core.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density);
+ method public androidx.ui.unit.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density);
}
public static final class TableColumnWidth.Fraction extends androidx.ui.layout.TableColumnWidth.Inflexible {
ctor public TableColumnWidth.Fraction(@FloatRange(from=null, to=null) float fraction);
method public androidx.ui.layout.TableColumnWidth.Fraction copy(float fraction);
- method public androidx.ui.core.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density);
+ method public androidx.ui.unit.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density);
}
public abstract static class TableColumnWidth.Inflexible extends androidx.ui.layout.TableColumnWidth {
@@ -533,36 +533,36 @@
public static final class TableColumnWidth.Max extends androidx.ui.layout.TableColumnWidth.Inflexible {
ctor public TableColumnWidth.Max(androidx.ui.layout.TableColumnWidth.Inflexible a, androidx.ui.layout.TableColumnWidth.Inflexible b);
method public androidx.ui.layout.TableColumnWidth.Max copy(androidx.ui.layout.TableColumnWidth.Inflexible a, androidx.ui.layout.TableColumnWidth.Inflexible b);
- method public androidx.ui.core.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density);
+ method public androidx.ui.unit.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density);
}
public static final class TableColumnWidth.MaxIntrinsic extends androidx.ui.layout.TableColumnWidth.Inflexible {
- method public androidx.ui.core.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density);
+ method public androidx.ui.unit.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density);
field public static final androidx.ui.layout.TableColumnWidth.MaxIntrinsic! INSTANCE;
}
public static final class TableColumnWidth.Min extends androidx.ui.layout.TableColumnWidth.Inflexible {
ctor public TableColumnWidth.Min(androidx.ui.layout.TableColumnWidth.Inflexible a, androidx.ui.layout.TableColumnWidth.Inflexible b);
method public androidx.ui.layout.TableColumnWidth.Min copy(androidx.ui.layout.TableColumnWidth.Inflexible a, androidx.ui.layout.TableColumnWidth.Inflexible b);
- method public androidx.ui.core.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density);
+ method public androidx.ui.unit.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density);
}
public static final class TableColumnWidth.MinIntrinsic extends androidx.ui.layout.TableColumnWidth.Inflexible {
- method public androidx.ui.core.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density);
+ method public androidx.ui.unit.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density);
field public static final androidx.ui.layout.TableColumnWidth.MinIntrinsic! INSTANCE;
}
public static final class TableColumnWidth.Wrap extends androidx.ui.layout.TableColumnWidth.Inflexible {
- method public androidx.ui.core.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density);
+ method public androidx.ui.unit.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density);
field public static final androidx.ui.layout.TableColumnWidth.Wrap! INSTANCE;
}
public final class TableDecorationChildren {
- method public java.util.List<androidx.ui.core.IntPx> component1();
- method public java.util.List<androidx.ui.core.IntPx> component2();
- method public androidx.ui.layout.TableDecorationChildren copy(java.util.List<androidx.ui.core.IntPx> verticalOffsets, java.util.List<androidx.ui.core.IntPx> horizontalOffsets);
- method public java.util.List<androidx.ui.core.IntPx> getHorizontalOffsets();
- method public java.util.List<androidx.ui.core.IntPx> getVerticalOffsets();
+ method public java.util.List<androidx.ui.unit.IntPx> component1();
+ method public java.util.List<androidx.ui.unit.IntPx> component2();
+ method public androidx.ui.layout.TableDecorationChildren copy(java.util.List<androidx.ui.unit.IntPx> verticalOffsets, java.util.List<androidx.ui.unit.IntPx> horizontalOffsets);
+ method public java.util.List<androidx.ui.unit.IntPx> getHorizontalOffsets();
+ method public java.util.List<androidx.ui.unit.IntPx> getVerticalOffsets();
}
public final class TableKt {
@@ -570,13 +570,13 @@
}
public final class TableMeasurable {
- method public kotlin.jvm.functions.Function0<androidx.ui.core.IntPx> component1();
- method public kotlin.jvm.functions.Function1<androidx.ui.core.IntPx,androidx.ui.core.IntPx> component2();
- method public kotlin.jvm.functions.Function1<androidx.ui.core.IntPx,androidx.ui.core.IntPx> component3();
- method public androidx.ui.layout.TableMeasurable copy(kotlin.jvm.functions.Function0<androidx.ui.core.IntPx> preferredWidth, kotlin.jvm.functions.Function1<? super androidx.ui.core.IntPx,androidx.ui.core.IntPx> minIntrinsicWidth, kotlin.jvm.functions.Function1<? super androidx.ui.core.IntPx,androidx.ui.core.IntPx> maxIntrinsicWidth);
- method public kotlin.jvm.functions.Function1<androidx.ui.core.IntPx,androidx.ui.core.IntPx> getMaxIntrinsicWidth();
- method public kotlin.jvm.functions.Function1<androidx.ui.core.IntPx,androidx.ui.core.IntPx> getMinIntrinsicWidth();
- method public kotlin.jvm.functions.Function0<androidx.ui.core.IntPx> getPreferredWidth();
+ method public kotlin.jvm.functions.Function0<androidx.ui.unit.IntPx> component1();
+ method public kotlin.jvm.functions.Function1<androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> component2();
+ method public kotlin.jvm.functions.Function1<androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> component3();
+ method public androidx.ui.layout.TableMeasurable copy(kotlin.jvm.functions.Function0<androidx.ui.unit.IntPx> preferredWidth, kotlin.jvm.functions.Function1<? super androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> minIntrinsicWidth, kotlin.jvm.functions.Function1<? super androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> maxIntrinsicWidth);
+ method public kotlin.jvm.functions.Function1<androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> getMaxIntrinsicWidth();
+ method public kotlin.jvm.functions.Function1<androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> getMinIntrinsicWidth();
+ method public kotlin.jvm.functions.Function0<androidx.ui.unit.IntPx> getPreferredWidth();
}
public final class WrapKt {
@@ -599,13 +599,13 @@
public final class ConstraintSetBuilderScope {
method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalAnchor.BarrierAnchor createBottomBarrier(androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.ConstrainedLayoutReference... elements);
- method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalAnchor.GuidelineAnchor createGuidelineFromBottom(androidx.ui.core.Dp offset);
+ method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalAnchor.GuidelineAnchor createGuidelineFromBottom(androidx.ui.unit.Dp offset);
method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalAnchor.GuidelineAnchor createGuidelineFromBottom(float percent);
- method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.VerticalAnchor.GuidelineAnchor createGuidelineFromLeft(androidx.ui.core.Dp offset);
+ method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.VerticalAnchor.GuidelineAnchor createGuidelineFromLeft(androidx.ui.unit.Dp offset);
method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.VerticalAnchor.GuidelineAnchor createGuidelineFromLeft(float percent);
- method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.VerticalAnchor.GuidelineAnchor createGuidelineFromRight(androidx.ui.core.Dp offset);
+ method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.VerticalAnchor.GuidelineAnchor createGuidelineFromRight(androidx.ui.unit.Dp offset);
method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.VerticalAnchor.GuidelineAnchor createGuidelineFromRight(float percent);
- method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalAnchor.GuidelineAnchor createGuidelineFromTop(androidx.ui.core.Dp offset);
+ method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalAnchor.GuidelineAnchor createGuidelineFromTop(androidx.ui.unit.Dp offset);
method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalAnchor.GuidelineAnchor createGuidelineFromTop(float percent);
method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalChain createHorizontalChain(androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.ConstrainedLayoutReference![] elements, androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.ChainStyle chainStyle = ChainStyle.Spread);
method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.VerticalAnchor.BarrierAnchor createLeftBarrier(androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.ConstrainedLayoutReference... elements);
@@ -672,21 +672,21 @@
public static final class ConstraintSetBuilderScope.HorizontalAnchor.BarrierAnchor extends androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalAnchor {
method public int getIndex$lintWithKotlin();
- method public androidx.ui.core.Dp getMargin();
+ method public androidx.ui.unit.Dp getMargin();
method public androidx.constraintlayout.solver.state.State getState$lintWithKotlin();
method public Object getTag$lintWithKotlin();
- method public void setMargin(androidx.ui.core.Dp value);
- property public final androidx.ui.core.Dp margin;
+ method public void setMargin(androidx.ui.unit.Dp value);
+ property public final androidx.ui.unit.Dp margin;
}
public static final class ConstraintSetBuilderScope.HorizontalAnchor.ConstrainedLayoutAnchor extends androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalAnchor {
method public infix void constrainTo(androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalAnchor other);
method public int getIndex$lintWithKotlin();
- method public androidx.ui.core.Dp getMargin();
+ method public androidx.ui.unit.Dp getMargin();
method public androidx.constraintlayout.solver.state.State getState$lintWithKotlin();
method public Object getTag$lintWithKotlin();
- method public void setMargin(androidx.ui.core.Dp value);
- property public final androidx.ui.core.Dp margin;
+ method public void setMargin(androidx.ui.unit.Dp value);
+ property public final androidx.ui.unit.Dp margin;
property public Object tag;
}
@@ -709,21 +709,21 @@
public static final class ConstraintSetBuilderScope.VerticalAnchor.BarrierAnchor extends androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.VerticalAnchor {
method public int getIndex$lintWithKotlin();
- method public androidx.ui.core.Dp getMargin();
+ method public androidx.ui.unit.Dp getMargin();
method public androidx.constraintlayout.solver.state.State getState$lintWithKotlin();
method public Object getTag$lintWithKotlin();
- method public void setMargin(androidx.ui.core.Dp value);
- property public final androidx.ui.core.Dp margin;
+ method public void setMargin(androidx.ui.unit.Dp value);
+ property public final androidx.ui.unit.Dp margin;
}
public static final class ConstraintSetBuilderScope.VerticalAnchor.ConstrainedLayoutAnchor extends androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.VerticalAnchor {
method public infix void constrainTo(androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.VerticalAnchor other);
method public int getIndex$lintWithKotlin();
- method public androidx.ui.core.Dp getMargin();
+ method public androidx.ui.unit.Dp getMargin();
method public androidx.constraintlayout.solver.state.State getState$lintWithKotlin();
method public Object getTag$lintWithKotlin();
- method public void setMargin(androidx.ui.core.Dp value);
- property public final androidx.ui.core.Dp margin;
+ method public void setMargin(androidx.ui.unit.Dp value);
+ property public final androidx.ui.unit.Dp margin;
property public Object tag;
}
diff --git a/ui/ui-layout/api/restricted_0.1.0-dev04.txt b/ui/ui-layout/api/restricted_0.1.0-dev04.txt
index 8cefaec..62add70 100644
--- a/ui/ui-layout/api/restricted_0.1.0-dev04.txt
+++ b/ui/ui-layout/api/restricted_0.1.0-dev04.txt
@@ -7,12 +7,12 @@
}
public final class AlignmentLineKt {
- method public static void AlignmentLineOffset(androidx.ui.core.AlignmentLine alignmentLine, androidx.ui.core.Dp before = 0.dp, androidx.ui.core.Dp after = 0.dp, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+ method public static void AlignmentLineOffset(androidx.ui.core.AlignmentLine alignmentLine, androidx.ui.unit.Dp before = 0.dp, androidx.ui.unit.Dp after = 0.dp, kotlin.jvm.functions.Function0<kotlin.Unit> children);
method public static void CenterAlignmentLine(androidx.ui.core.AlignmentLine alignmentLine, kotlin.jvm.functions.Function0<kotlin.Unit> children);
}
public final class Arrangement {
- ctor public Arrangement(internal kotlin.jvm.functions.Function2<? super androidx.ui.core.IntPx,? super java.util.List<androidx.ui.core.IntPx>,? extends java.util.List<androidx.ui.core.IntPx>> arrangeBlock);
+ ctor public Arrangement(internal kotlin.jvm.functions.Function2<? super androidx.ui.unit.IntPx,? super java.util.List<androidx.ui.unit.IntPx>,? extends java.util.List<androidx.ui.unit.IntPx>> arrangeBlock);
field public static final androidx.ui.layout.Arrangement.Companion! Companion;
}
@@ -46,7 +46,7 @@
}
public final class ContainerKt {
- method public static void Container(androidx.ui.core.Modifier modifier = Modifier.None, androidx.ui.layout.EdgeInsets padding = androidx.ui.layout.EdgeInsets(0.dp), androidx.ui.core.Alignment alignment = Alignment.Center, boolean expanded = false, androidx.ui.layout.DpConstraints constraints = androidx.ui.layout.DpConstraints(), androidx.ui.core.Dp? width = null, androidx.ui.core.Dp? height = null, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+ method public static void Container(androidx.ui.core.Modifier modifier = Modifier.None, androidx.ui.layout.EdgeInsets padding = androidx.ui.layout.EdgeInsets(0.dp), androidx.ui.core.Alignment alignment = Alignment.Center, boolean expanded = false, androidx.ui.layout.DpConstraints constraints = androidx.ui.layout.DpConstraints(), androidx.ui.unit.Dp? width = null, androidx.ui.unit.Dp? height = null, kotlin.jvm.functions.Function0<kotlin.Unit> children);
}
public final class CrossAxisAlignment {
@@ -66,29 +66,29 @@
}
public final class DpConstraints {
- ctor public DpConstraints(androidx.ui.core.Dp minWidth, androidx.ui.core.Dp maxWidth, androidx.ui.core.Dp minHeight, androidx.ui.core.Dp maxHeight);
+ ctor public DpConstraints(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp maxWidth, androidx.ui.unit.Dp minHeight, androidx.ui.unit.Dp maxHeight);
ctor public DpConstraints();
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.core.Dp component2();
- method public androidx.ui.core.Dp component3();
- method public androidx.ui.core.Dp component4();
- method public androidx.ui.layout.DpConstraints copy(androidx.ui.core.Dp minWidth, androidx.ui.core.Dp maxWidth, androidx.ui.core.Dp minHeight, androidx.ui.core.Dp maxHeight);
- method public androidx.ui.core.Dp getMaxHeight();
- method public androidx.ui.core.Dp getMaxWidth();
- method public androidx.ui.core.Dp getMinHeight();
- method public androidx.ui.core.Dp getMinWidth();
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.unit.Dp component2();
+ method public androidx.ui.unit.Dp component3();
+ method public androidx.ui.unit.Dp component4();
+ method public androidx.ui.layout.DpConstraints copy(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp maxWidth, androidx.ui.unit.Dp minHeight, androidx.ui.unit.Dp maxHeight);
+ method public androidx.ui.unit.Dp getMaxHeight();
+ method public androidx.ui.unit.Dp getMaxWidth();
+ method public androidx.ui.unit.Dp getMinHeight();
+ method public androidx.ui.unit.Dp getMinWidth();
field public static final androidx.ui.layout.DpConstraints.Companion! Companion;
}
public static final class DpConstraints.Companion {
- method public androidx.ui.layout.DpConstraints tightConstraints(androidx.ui.core.Dp width, androidx.ui.core.Dp height);
- method public androidx.ui.layout.DpConstraints tightConstraintsForHeight(androidx.ui.core.Dp height);
- method public androidx.ui.layout.DpConstraints tightConstraintsForWidth(androidx.ui.core.Dp width);
+ method public androidx.ui.layout.DpConstraints tightConstraints(androidx.ui.unit.Dp width, androidx.ui.unit.Dp height);
+ method public androidx.ui.layout.DpConstraints tightConstraintsForHeight(androidx.ui.unit.Dp height);
+ method public androidx.ui.layout.DpConstraints tightConstraintsForWidth(androidx.ui.unit.Dp width);
}
public final class DpConstraintsKt {
- method public static androidx.ui.core.Constraints Constraints(androidx.ui.core.DensityScope, androidx.ui.layout.DpConstraints dpConstraints);
- method public static androidx.ui.layout.DpConstraints DpConstraints(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints);
+ method public static androidx.ui.core.Constraints Constraints(androidx.ui.unit.DensityScope, androidx.ui.layout.DpConstraints dpConstraints);
+ method public static androidx.ui.layout.DpConstraints DpConstraints(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints);
method public static androidx.ui.layout.DpConstraints enforce(androidx.ui.layout.DpConstraints, androidx.ui.layout.DpConstraints otherConstraints);
method public static boolean getHasBoundedHeight(androidx.ui.layout.DpConstraints);
method public static boolean getHasBoundedWidth(androidx.ui.layout.DpConstraints);
@@ -99,25 +99,25 @@
method public static boolean isZero(androidx.ui.layout.DpConstraints);
method public static androidx.ui.layout.DpConstraints looseMax(androidx.ui.layout.DpConstraints);
method public static androidx.ui.layout.DpConstraints looseMin(androidx.ui.layout.DpConstraints);
- method public static androidx.ui.layout.DpConstraints offset(androidx.ui.layout.DpConstraints, androidx.ui.core.Dp horizontal = 0.dp, androidx.ui.core.Dp vertical = 0.dp);
+ method public static androidx.ui.layout.DpConstraints offset(androidx.ui.layout.DpConstraints, androidx.ui.unit.Dp horizontal = 0.dp, androidx.ui.unit.Dp vertical = 0.dp);
method public static androidx.ui.layout.DpConstraints tightMax(androidx.ui.layout.DpConstraints);
method public static androidx.ui.layout.DpConstraints tightMin(androidx.ui.layout.DpConstraints);
- method public static androidx.ui.layout.DpConstraints withTight(androidx.ui.layout.DpConstraints, androidx.ui.core.Dp? width = null, androidx.ui.core.Dp? height = null);
+ method public static androidx.ui.layout.DpConstraints withTight(androidx.ui.layout.DpConstraints, androidx.ui.unit.Dp? width = null, androidx.ui.unit.Dp? height = null);
}
public final class EdgeInsets {
- ctor public EdgeInsets(androidx.ui.core.Dp left, androidx.ui.core.Dp top, androidx.ui.core.Dp right, androidx.ui.core.Dp bottom);
+ ctor public EdgeInsets(androidx.ui.unit.Dp left, androidx.ui.unit.Dp top, androidx.ui.unit.Dp right, androidx.ui.unit.Dp bottom);
ctor public EdgeInsets();
- ctor public EdgeInsets(androidx.ui.core.Dp all);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.core.Dp component2();
- method public androidx.ui.core.Dp component3();
- method public androidx.ui.core.Dp component4();
- method public androidx.ui.layout.EdgeInsets copy(androidx.ui.core.Dp left, androidx.ui.core.Dp top, androidx.ui.core.Dp right, androidx.ui.core.Dp bottom);
- method public androidx.ui.core.Dp getBottom();
- method public androidx.ui.core.Dp getLeft();
- method public androidx.ui.core.Dp getRight();
- method public androidx.ui.core.Dp getTop();
+ ctor public EdgeInsets(androidx.ui.unit.Dp all);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.unit.Dp component2();
+ method public androidx.ui.unit.Dp component3();
+ method public androidx.ui.unit.Dp component4();
+ method public androidx.ui.layout.EdgeInsets copy(androidx.ui.unit.Dp left, androidx.ui.unit.Dp top, androidx.ui.unit.Dp right, androidx.ui.unit.Dp bottom);
+ method public androidx.ui.unit.Dp getBottom();
+ method public androidx.ui.unit.Dp getLeft();
+ method public androidx.ui.unit.Dp getRight();
+ method public androidx.ui.unit.Dp getTop();
}
public final class FlexChildren {
@@ -135,7 +135,7 @@
@androidx.ui.layout.LayoutScopeMarker public abstract sealed class FlexScope {
method public final androidx.ui.core.ParentDataModifier LayoutFlexible(@FloatRange(from=0.0, fromInclusive=false) float flex, boolean tight = true);
- method public final androidx.ui.core.ParentDataModifier RelativeToSiblings(androidx.ui.layout.LayoutGravity, kotlin.jvm.functions.Function1<? super androidx.ui.core.Placeable,androidx.ui.core.IntPx> alignmentLineBlock);
+ method public final androidx.ui.core.ParentDataModifier RelativeToSiblings(androidx.ui.layout.LayoutGravity, kotlin.jvm.functions.Function1<? super androidx.ui.core.Placeable,androidx.ui.unit.IntPx> alignmentLineBlock);
method public final androidx.ui.core.ParentDataModifier getLayoutInflexible();
property public final androidx.ui.core.ParentDataModifier LayoutInflexible;
}
@@ -147,8 +147,8 @@
}
public final class FlowKt {
- method public static void FlowColumn(androidx.ui.layout.SizeMode mainAxisSize = androidx.ui.layout.SizeMode.Wrap, androidx.ui.layout.MainAxisAlignment mainAxisAlignment = androidx.ui.layout.MainAxisAlignment.Start, androidx.ui.core.Dp mainAxisSpacing = 0.dp, androidx.ui.layout.FlowCrossAxisAlignment crossAxisAlignment = androidx.ui.layout.FlowCrossAxisAlignment.Start, androidx.ui.core.Dp crossAxisSpacing = 0.dp, androidx.ui.layout.MainAxisAlignment lastLineMainAxisAlignment = mainAxisAlignment, kotlin.jvm.functions.Function0<kotlin.Unit> children);
- method public static void FlowRow(androidx.ui.layout.SizeMode mainAxisSize = androidx.ui.layout.SizeMode.Wrap, androidx.ui.layout.MainAxisAlignment mainAxisAlignment = androidx.ui.layout.MainAxisAlignment.Start, androidx.ui.core.Dp mainAxisSpacing = 0.dp, androidx.ui.layout.FlowCrossAxisAlignment crossAxisAlignment = androidx.ui.layout.FlowCrossAxisAlignment.Start, androidx.ui.core.Dp crossAxisSpacing = 0.dp, androidx.ui.layout.MainAxisAlignment lastLineMainAxisAlignment = mainAxisAlignment, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+ method public static void FlowColumn(androidx.ui.layout.SizeMode mainAxisSize = androidx.ui.layout.SizeMode.Wrap, androidx.ui.layout.MainAxisAlignment mainAxisAlignment = androidx.ui.layout.MainAxisAlignment.Start, androidx.ui.unit.Dp mainAxisSpacing = 0.dp, androidx.ui.layout.FlowCrossAxisAlignment crossAxisAlignment = androidx.ui.layout.FlowCrossAxisAlignment.Start, androidx.ui.unit.Dp crossAxisSpacing = 0.dp, androidx.ui.layout.MainAxisAlignment lastLineMainAxisAlignment = mainAxisAlignment, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+ method public static void FlowRow(androidx.ui.layout.SizeMode mainAxisSize = androidx.ui.layout.SizeMode.Wrap, androidx.ui.layout.MainAxisAlignment mainAxisAlignment = androidx.ui.layout.MainAxisAlignment.Start, androidx.ui.unit.Dp mainAxisSpacing = 0.dp, androidx.ui.layout.FlowCrossAxisAlignment crossAxisAlignment = androidx.ui.layout.FlowCrossAxisAlignment.Start, androidx.ui.unit.Dp crossAxisSpacing = 0.dp, androidx.ui.layout.MainAxisAlignment lastLineMainAxisAlignment = mainAxisAlignment, kotlin.jvm.functions.Function0<kotlin.Unit> children);
}
public final class IntrinsicKt {
@@ -197,11 +197,11 @@
method public float component1();
method public androidx.ui.layout.LayoutAspectRatio copy(float aspectRatio);
method public float getAspectRatio();
- method public androidx.ui.core.IntPx maxIntrinsicHeightOf(androidx.ui.core.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.core.IntPx width);
- method public androidx.ui.core.IntPx maxIntrinsicWidthOf(androidx.ui.core.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.core.IntPx height);
- method public androidx.ui.core.IntPx minIntrinsicHeightOf(androidx.ui.core.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.core.IntPx width);
- method public androidx.ui.core.IntPx minIntrinsicWidthOf(androidx.ui.core.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.core.IntPx height);
- method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints);
+ method public androidx.ui.unit.IntPx maxIntrinsicHeightOf(androidx.ui.unit.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.unit.IntPx width);
+ method public androidx.ui.unit.IntPx maxIntrinsicWidthOf(androidx.ui.unit.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.unit.IntPx height);
+ method public androidx.ui.unit.IntPx minIntrinsicHeightOf(androidx.ui.unit.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.unit.IntPx width);
+ method public androidx.ui.unit.IntPx minIntrinsicWidthOf(androidx.ui.unit.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.unit.IntPx height);
+ method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints);
}
public final class LayoutGravity {
@@ -209,224 +209,224 @@
}
public final class LayoutHeight implements androidx.ui.core.LayoutModifier {
- ctor public LayoutHeight(androidx.ui.core.Dp height);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.layout.LayoutHeight copy(androidx.ui.core.Dp height);
+ ctor public LayoutHeight(androidx.ui.unit.Dp height);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.layout.LayoutHeight copy(androidx.ui.unit.Dp height);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getHeight();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getHeight();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public static final class LayoutHeight.Constrain implements androidx.ui.core.LayoutModifier {
- ctor public LayoutHeight.Constrain(androidx.ui.core.Dp minHeight, androidx.ui.core.Dp maxHeight);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.core.Dp component2();
- method public androidx.ui.layout.LayoutHeight.Constrain copy(androidx.ui.core.Dp minHeight, androidx.ui.core.Dp maxHeight);
+ ctor public LayoutHeight.Constrain(androidx.ui.unit.Dp minHeight, androidx.ui.unit.Dp maxHeight);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.unit.Dp component2();
+ method public androidx.ui.layout.LayoutHeight.Constrain copy(androidx.ui.unit.Dp minHeight, androidx.ui.unit.Dp maxHeight);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getMaxHeight();
- method public androidx.ui.core.Dp getMinHeight();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getMaxHeight();
+ method public androidx.ui.unit.Dp getMinHeight();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public static final class LayoutHeight.Fill implements androidx.ui.core.LayoutModifier {
- method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints);
+ method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints);
field public static final androidx.ui.layout.LayoutHeight.Fill! INSTANCE;
}
public static final class LayoutHeight.Max implements androidx.ui.core.LayoutModifier {
- ctor public LayoutHeight.Max(androidx.ui.core.Dp maxHeight);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.layout.LayoutHeight.Max copy(androidx.ui.core.Dp maxHeight);
+ ctor public LayoutHeight.Max(androidx.ui.unit.Dp maxHeight);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.layout.LayoutHeight.Max copy(androidx.ui.unit.Dp maxHeight);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getMaxHeight();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getMaxHeight();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public static final class LayoutHeight.Min implements androidx.ui.core.LayoutModifier {
- ctor public LayoutHeight.Min(androidx.ui.core.Dp minHeight);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.layout.LayoutHeight.Min copy(androidx.ui.core.Dp minHeight);
+ ctor public LayoutHeight.Min(androidx.ui.unit.Dp minHeight);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.layout.LayoutHeight.Min copy(androidx.ui.unit.Dp minHeight);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getMinHeight();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getMinHeight();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public final class LayoutPadding implements androidx.ui.core.LayoutModifier {
- ctor public LayoutPadding(androidx.ui.core.Dp left, androidx.ui.core.Dp top, androidx.ui.core.Dp right, androidx.ui.core.Dp bottom);
+ ctor public LayoutPadding(androidx.ui.unit.Dp left, androidx.ui.unit.Dp top, androidx.ui.unit.Dp right, androidx.ui.unit.Dp bottom);
ctor public LayoutPadding();
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.core.Dp component2();
- method public androidx.ui.core.Dp component3();
- method public androidx.ui.core.Dp component4();
- method public androidx.ui.layout.LayoutPadding copy(androidx.ui.core.Dp left, androidx.ui.core.Dp top, androidx.ui.core.Dp right, androidx.ui.core.Dp bottom);
- method public androidx.ui.core.Dp getBottom();
- method public androidx.ui.core.Dp getLeft();
- method public androidx.ui.core.Dp getRight();
- method public androidx.ui.core.Dp getTop();
- method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.unit.Dp component2();
+ method public androidx.ui.unit.Dp component3();
+ method public androidx.ui.unit.Dp component4();
+ method public androidx.ui.layout.LayoutPadding copy(androidx.ui.unit.Dp left, androidx.ui.unit.Dp top, androidx.ui.unit.Dp right, androidx.ui.unit.Dp bottom);
+ method public androidx.ui.unit.Dp getBottom();
+ method public androidx.ui.unit.Dp getLeft();
+ method public androidx.ui.unit.Dp getRight();
+ method public androidx.ui.unit.Dp getTop();
+ method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
}
@kotlin.DslMarker public @interface LayoutScopeMarker {
}
public final class LayoutSize implements androidx.ui.core.LayoutModifier {
- ctor public LayoutSize(androidx.ui.core.Dp width, androidx.ui.core.Dp height);
- ctor public LayoutSize(androidx.ui.core.Dp size);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.core.Dp component2();
- method public androidx.ui.layout.LayoutSize copy(androidx.ui.core.Dp width, androidx.ui.core.Dp height);
+ ctor public LayoutSize(androidx.ui.unit.Dp width, androidx.ui.unit.Dp height);
+ ctor public LayoutSize(androidx.ui.unit.Dp size);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.unit.Dp component2();
+ method public androidx.ui.layout.LayoutSize copy(androidx.ui.unit.Dp width, androidx.ui.unit.Dp height);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getHeight();
- method public androidx.ui.core.Dp getWidth();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getHeight();
+ method public androidx.ui.unit.Dp getWidth();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public static final class LayoutSize.Constrain implements androidx.ui.core.LayoutModifier {
- ctor public LayoutSize.Constrain(androidx.ui.core.Dp minWidth, androidx.ui.core.Dp minHeight, androidx.ui.core.Dp maxWidth, androidx.ui.core.Dp maxHeight);
- ctor public LayoutSize.Constrain(androidx.ui.core.Dp minSize, androidx.ui.core.Dp maxSize);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.core.Dp component2();
- method public androidx.ui.core.Dp component3();
- method public androidx.ui.core.Dp component4();
- method public androidx.ui.layout.LayoutSize.Constrain copy(androidx.ui.core.Dp minWidth, androidx.ui.core.Dp minHeight, androidx.ui.core.Dp maxWidth, androidx.ui.core.Dp maxHeight);
+ ctor public LayoutSize.Constrain(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp minHeight, androidx.ui.unit.Dp maxWidth, androidx.ui.unit.Dp maxHeight);
+ ctor public LayoutSize.Constrain(androidx.ui.unit.Dp minSize, androidx.ui.unit.Dp maxSize);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.unit.Dp component2();
+ method public androidx.ui.unit.Dp component3();
+ method public androidx.ui.unit.Dp component4();
+ method public androidx.ui.layout.LayoutSize.Constrain copy(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp minHeight, androidx.ui.unit.Dp maxWidth, androidx.ui.unit.Dp maxHeight);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getMaxHeight();
- method public androidx.ui.core.Dp getMaxWidth();
- method public androidx.ui.core.Dp getMinHeight();
- method public androidx.ui.core.Dp getMinWidth();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getMaxHeight();
+ method public androidx.ui.unit.Dp getMaxWidth();
+ method public androidx.ui.unit.Dp getMinHeight();
+ method public androidx.ui.unit.Dp getMinWidth();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public static final class LayoutSize.Fill implements androidx.ui.core.LayoutModifier {
- method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints);
+ method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints);
field public static final androidx.ui.layout.LayoutSize.Fill! INSTANCE;
}
public static final class LayoutSize.Max implements androidx.ui.core.LayoutModifier {
- ctor public LayoutSize.Max(androidx.ui.core.Dp maxWidth, androidx.ui.core.Dp maxHeight);
- ctor public LayoutSize.Max(androidx.ui.core.Dp maxSize);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.core.Dp component2();
- method public androidx.ui.layout.LayoutSize.Max copy(androidx.ui.core.Dp maxWidth, androidx.ui.core.Dp maxHeight);
+ ctor public LayoutSize.Max(androidx.ui.unit.Dp maxWidth, androidx.ui.unit.Dp maxHeight);
+ ctor public LayoutSize.Max(androidx.ui.unit.Dp maxSize);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.unit.Dp component2();
+ method public androidx.ui.layout.LayoutSize.Max copy(androidx.ui.unit.Dp maxWidth, androidx.ui.unit.Dp maxHeight);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getMaxHeight();
- method public androidx.ui.core.Dp getMaxWidth();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getMaxHeight();
+ method public androidx.ui.unit.Dp getMaxWidth();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public static final class LayoutSize.Min implements androidx.ui.core.LayoutModifier {
- ctor public LayoutSize.Min(androidx.ui.core.Dp minWidth, androidx.ui.core.Dp minHeight);
- ctor public LayoutSize.Min(androidx.ui.core.Dp minSize);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.core.Dp component2();
- method public androidx.ui.layout.LayoutSize.Min copy(androidx.ui.core.Dp minWidth, androidx.ui.core.Dp minHeight);
+ ctor public LayoutSize.Min(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp minHeight);
+ ctor public LayoutSize.Min(androidx.ui.unit.Dp minSize);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.unit.Dp component2();
+ method public androidx.ui.layout.LayoutSize.Min copy(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp minHeight);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getMinHeight();
- method public androidx.ui.core.Dp getMinWidth();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getMinHeight();
+ method public androidx.ui.unit.Dp getMinWidth();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public final class LayoutWidth implements androidx.ui.core.LayoutModifier {
- ctor public LayoutWidth(androidx.ui.core.Dp width);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.layout.LayoutWidth copy(androidx.ui.core.Dp width);
+ ctor public LayoutWidth(androidx.ui.unit.Dp width);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.layout.LayoutWidth copy(androidx.ui.unit.Dp width);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getWidth();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getWidth();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public static final class LayoutWidth.Constrain implements androidx.ui.core.LayoutModifier {
- ctor public LayoutWidth.Constrain(androidx.ui.core.Dp minWidth, androidx.ui.core.Dp maxWidth);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.core.Dp component2();
- method public androidx.ui.layout.LayoutWidth.Constrain copy(androidx.ui.core.Dp minWidth, androidx.ui.core.Dp maxWidth);
+ ctor public LayoutWidth.Constrain(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp maxWidth);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.unit.Dp component2();
+ method public androidx.ui.layout.LayoutWidth.Constrain copy(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp maxWidth);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getMaxWidth();
- method public androidx.ui.core.Dp getMinWidth();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getMaxWidth();
+ method public androidx.ui.unit.Dp getMinWidth();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public static final class LayoutWidth.Fill implements androidx.ui.core.LayoutModifier {
- method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints);
+ method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints);
field public static final androidx.ui.layout.LayoutWidth.Fill! INSTANCE;
}
public static final class LayoutWidth.Max implements androidx.ui.core.LayoutModifier {
- ctor public LayoutWidth.Max(androidx.ui.core.Dp maxWidth);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.layout.LayoutWidth.Max copy(androidx.ui.core.Dp maxWidth);
+ ctor public LayoutWidth.Max(androidx.ui.unit.Dp maxWidth);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.layout.LayoutWidth.Max copy(androidx.ui.unit.Dp maxWidth);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getMaxWidth();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getMaxWidth();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public static final class LayoutWidth.Min implements androidx.ui.core.LayoutModifier {
- ctor public LayoutWidth.Min(androidx.ui.core.Dp minWidth);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.layout.LayoutWidth.Min copy(androidx.ui.core.Dp minWidth);
+ ctor public LayoutWidth.Min(androidx.ui.unit.Dp minWidth);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.layout.LayoutWidth.Min copy(androidx.ui.unit.Dp minWidth);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getMinWidth();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getMinWidth();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
@@ -441,12 +441,12 @@
}
public final class PaddingKt {
- method public static androidx.ui.layout.LayoutPadding LayoutPadding(androidx.ui.core.Dp all);
+ method public static androidx.ui.layout.LayoutPadding LayoutPadding(androidx.ui.unit.Dp all);
method public static void Padding(androidx.ui.layout.EdgeInsets padding, kotlin.jvm.functions.Function0<kotlin.Unit> children);
- method public static void Padding(androidx.ui.core.Dp left = 0.dp, androidx.ui.core.Dp top = 0.dp, androidx.ui.core.Dp right = 0.dp, androidx.ui.core.Dp bottom = 0.dp, kotlin.jvm.functions.Function0<kotlin.Unit> children);
- method public static void Padding(androidx.ui.core.Dp padding, kotlin.jvm.functions.Function0<kotlin.Unit> children);
- method @Deprecated public static androidx.ui.core.LayoutModifier Spacing(androidx.ui.core.Dp left = 0.dp, androidx.ui.core.Dp top = 0.dp, androidx.ui.core.Dp right = 0.dp, androidx.ui.core.Dp bottom = 0.dp);
- method @Deprecated public static androidx.ui.core.LayoutModifier Spacing(androidx.ui.core.Dp all = 0.dp);
+ method public static void Padding(androidx.ui.unit.Dp left = 0.dp, androidx.ui.unit.Dp top = 0.dp, androidx.ui.unit.Dp right = 0.dp, androidx.ui.unit.Dp bottom = 0.dp, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+ method public static void Padding(androidx.ui.unit.Dp padding, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+ method @Deprecated public static androidx.ui.core.LayoutModifier Spacing(androidx.ui.unit.Dp left = 0.dp, androidx.ui.unit.Dp top = 0.dp, androidx.ui.unit.Dp right = 0.dp, androidx.ui.unit.Dp bottom = 0.dp);
+ method @Deprecated public static androidx.ui.core.LayoutModifier Spacing(androidx.ui.unit.Dp all = 0.dp);
}
public final class RowScope extends androidx.ui.layout.FlexScope {
@@ -502,27 +502,27 @@
}
public abstract class TableColumnWidth {
- method public androidx.ui.core.IntPx maxIntrinsicWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density, androidx.ui.core.IntPx availableHeight);
- method public androidx.ui.core.IntPx minIntrinsicWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density, androidx.ui.core.IntPx availableHeight);
- method public abstract androidx.ui.core.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density);
+ method public androidx.ui.unit.IntPx maxIntrinsicWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density, androidx.ui.unit.IntPx availableHeight);
+ method public androidx.ui.unit.IntPx minIntrinsicWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density, androidx.ui.unit.IntPx availableHeight);
+ method public abstract androidx.ui.unit.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density);
}
public static final class TableColumnWidth.Fixed extends androidx.ui.layout.TableColumnWidth.Inflexible {
- ctor public TableColumnWidth.Fixed(androidx.ui.core.Dp width);
- method public androidx.ui.layout.TableColumnWidth.Fixed copy(androidx.ui.core.Dp width);
- method public androidx.ui.core.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density);
+ ctor public TableColumnWidth.Fixed(androidx.ui.unit.Dp width);
+ method public androidx.ui.layout.TableColumnWidth.Fixed copy(androidx.ui.unit.Dp width);
+ method public androidx.ui.unit.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density);
}
public static final class TableColumnWidth.Flex extends androidx.ui.layout.TableColumnWidth {
ctor public TableColumnWidth.Flex(@FloatRange(from=null) float flex);
method public androidx.ui.layout.TableColumnWidth.Flex copy(float flex);
- method public androidx.ui.core.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density);
+ method public androidx.ui.unit.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density);
}
public static final class TableColumnWidth.Fraction extends androidx.ui.layout.TableColumnWidth.Inflexible {
ctor public TableColumnWidth.Fraction(@FloatRange(from=null, to=null) float fraction);
method public androidx.ui.layout.TableColumnWidth.Fraction copy(float fraction);
- method public androidx.ui.core.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density);
+ method public androidx.ui.unit.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density);
}
public abstract static class TableColumnWidth.Inflexible extends androidx.ui.layout.TableColumnWidth {
@@ -533,36 +533,36 @@
public static final class TableColumnWidth.Max extends androidx.ui.layout.TableColumnWidth.Inflexible {
ctor public TableColumnWidth.Max(androidx.ui.layout.TableColumnWidth.Inflexible a, androidx.ui.layout.TableColumnWidth.Inflexible b);
method public androidx.ui.layout.TableColumnWidth.Max copy(androidx.ui.layout.TableColumnWidth.Inflexible a, androidx.ui.layout.TableColumnWidth.Inflexible b);
- method public androidx.ui.core.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density);
+ method public androidx.ui.unit.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density);
}
public static final class TableColumnWidth.MaxIntrinsic extends androidx.ui.layout.TableColumnWidth.Inflexible {
- method public androidx.ui.core.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density);
+ method public androidx.ui.unit.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density);
field public static final androidx.ui.layout.TableColumnWidth.MaxIntrinsic! INSTANCE;
}
public static final class TableColumnWidth.Min extends androidx.ui.layout.TableColumnWidth.Inflexible {
ctor public TableColumnWidth.Min(androidx.ui.layout.TableColumnWidth.Inflexible a, androidx.ui.layout.TableColumnWidth.Inflexible b);
method public androidx.ui.layout.TableColumnWidth.Min copy(androidx.ui.layout.TableColumnWidth.Inflexible a, androidx.ui.layout.TableColumnWidth.Inflexible b);
- method public androidx.ui.core.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density);
+ method public androidx.ui.unit.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density);
}
public static final class TableColumnWidth.MinIntrinsic extends androidx.ui.layout.TableColumnWidth.Inflexible {
- method public androidx.ui.core.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density);
+ method public androidx.ui.unit.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density);
field public static final androidx.ui.layout.TableColumnWidth.MinIntrinsic! INSTANCE;
}
public static final class TableColumnWidth.Wrap extends androidx.ui.layout.TableColumnWidth.Inflexible {
- method public androidx.ui.core.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density);
+ method public androidx.ui.unit.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density);
field public static final androidx.ui.layout.TableColumnWidth.Wrap! INSTANCE;
}
public final class TableDecorationChildren {
- method public java.util.List<androidx.ui.core.IntPx> component1();
- method public java.util.List<androidx.ui.core.IntPx> component2();
- method public androidx.ui.layout.TableDecorationChildren copy(java.util.List<androidx.ui.core.IntPx> verticalOffsets, java.util.List<androidx.ui.core.IntPx> horizontalOffsets);
- method public java.util.List<androidx.ui.core.IntPx> getHorizontalOffsets();
- method public java.util.List<androidx.ui.core.IntPx> getVerticalOffsets();
+ method public java.util.List<androidx.ui.unit.IntPx> component1();
+ method public java.util.List<androidx.ui.unit.IntPx> component2();
+ method public androidx.ui.layout.TableDecorationChildren copy(java.util.List<androidx.ui.unit.IntPx> verticalOffsets, java.util.List<androidx.ui.unit.IntPx> horizontalOffsets);
+ method public java.util.List<androidx.ui.unit.IntPx> getHorizontalOffsets();
+ method public java.util.List<androidx.ui.unit.IntPx> getVerticalOffsets();
}
public final class TableKt {
@@ -570,13 +570,13 @@
}
public final class TableMeasurable {
- method public kotlin.jvm.functions.Function0<androidx.ui.core.IntPx> component1();
- method public kotlin.jvm.functions.Function1<androidx.ui.core.IntPx,androidx.ui.core.IntPx> component2();
- method public kotlin.jvm.functions.Function1<androidx.ui.core.IntPx,androidx.ui.core.IntPx> component3();
- method public androidx.ui.layout.TableMeasurable copy(kotlin.jvm.functions.Function0<androidx.ui.core.IntPx> preferredWidth, kotlin.jvm.functions.Function1<? super androidx.ui.core.IntPx,androidx.ui.core.IntPx> minIntrinsicWidth, kotlin.jvm.functions.Function1<? super androidx.ui.core.IntPx,androidx.ui.core.IntPx> maxIntrinsicWidth);
- method public kotlin.jvm.functions.Function1<androidx.ui.core.IntPx,androidx.ui.core.IntPx> getMaxIntrinsicWidth();
- method public kotlin.jvm.functions.Function1<androidx.ui.core.IntPx,androidx.ui.core.IntPx> getMinIntrinsicWidth();
- method public kotlin.jvm.functions.Function0<androidx.ui.core.IntPx> getPreferredWidth();
+ method public kotlin.jvm.functions.Function0<androidx.ui.unit.IntPx> component1();
+ method public kotlin.jvm.functions.Function1<androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> component2();
+ method public kotlin.jvm.functions.Function1<androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> component3();
+ method public androidx.ui.layout.TableMeasurable copy(kotlin.jvm.functions.Function0<androidx.ui.unit.IntPx> preferredWidth, kotlin.jvm.functions.Function1<? super androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> minIntrinsicWidth, kotlin.jvm.functions.Function1<? super androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> maxIntrinsicWidth);
+ method public kotlin.jvm.functions.Function1<androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> getMaxIntrinsicWidth();
+ method public kotlin.jvm.functions.Function1<androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> getMinIntrinsicWidth();
+ method public kotlin.jvm.functions.Function0<androidx.ui.unit.IntPx> getPreferredWidth();
}
public final class WrapKt {
@@ -599,13 +599,13 @@
public final class ConstraintSetBuilderScope {
method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalAnchor.BarrierAnchor createBottomBarrier(androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.ConstrainedLayoutReference... elements);
- method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalAnchor.GuidelineAnchor createGuidelineFromBottom(androidx.ui.core.Dp offset);
+ method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalAnchor.GuidelineAnchor createGuidelineFromBottom(androidx.ui.unit.Dp offset);
method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalAnchor.GuidelineAnchor createGuidelineFromBottom(float percent);
- method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.VerticalAnchor.GuidelineAnchor createGuidelineFromLeft(androidx.ui.core.Dp offset);
+ method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.VerticalAnchor.GuidelineAnchor createGuidelineFromLeft(androidx.ui.unit.Dp offset);
method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.VerticalAnchor.GuidelineAnchor createGuidelineFromLeft(float percent);
- method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.VerticalAnchor.GuidelineAnchor createGuidelineFromRight(androidx.ui.core.Dp offset);
+ method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.VerticalAnchor.GuidelineAnchor createGuidelineFromRight(androidx.ui.unit.Dp offset);
method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.VerticalAnchor.GuidelineAnchor createGuidelineFromRight(float percent);
- method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalAnchor.GuidelineAnchor createGuidelineFromTop(androidx.ui.core.Dp offset);
+ method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalAnchor.GuidelineAnchor createGuidelineFromTop(androidx.ui.unit.Dp offset);
method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalAnchor.GuidelineAnchor createGuidelineFromTop(float percent);
method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalChain createHorizontalChain(androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.ConstrainedLayoutReference![] elements, androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.ChainStyle chainStyle = ChainStyle.Spread);
method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.VerticalAnchor.BarrierAnchor createLeftBarrier(androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.ConstrainedLayoutReference... elements);
@@ -672,21 +672,21 @@
public static final class ConstraintSetBuilderScope.HorizontalAnchor.BarrierAnchor extends androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalAnchor {
method public int getIndex$lintWithKotlin();
- method public androidx.ui.core.Dp getMargin();
+ method public androidx.ui.unit.Dp getMargin();
method public androidx.constraintlayout.solver.state.State getState$lintWithKotlin();
method public Object getTag$lintWithKotlin();
- method public void setMargin(androidx.ui.core.Dp value);
- property public final androidx.ui.core.Dp margin;
+ method public void setMargin(androidx.ui.unit.Dp value);
+ property public final androidx.ui.unit.Dp margin;
}
public static final class ConstraintSetBuilderScope.HorizontalAnchor.ConstrainedLayoutAnchor extends androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalAnchor {
method public infix void constrainTo(androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalAnchor other);
method public int getIndex$lintWithKotlin();
- method public androidx.ui.core.Dp getMargin();
+ method public androidx.ui.unit.Dp getMargin();
method public androidx.constraintlayout.solver.state.State getState$lintWithKotlin();
method public Object getTag$lintWithKotlin();
- method public void setMargin(androidx.ui.core.Dp value);
- property public final androidx.ui.core.Dp margin;
+ method public void setMargin(androidx.ui.unit.Dp value);
+ property public final androidx.ui.unit.Dp margin;
property public Object tag;
}
@@ -709,21 +709,21 @@
public static final class ConstraintSetBuilderScope.VerticalAnchor.BarrierAnchor extends androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.VerticalAnchor {
method public int getIndex$lintWithKotlin();
- method public androidx.ui.core.Dp getMargin();
+ method public androidx.ui.unit.Dp getMargin();
method public androidx.constraintlayout.solver.state.State getState$lintWithKotlin();
method public Object getTag$lintWithKotlin();
- method public void setMargin(androidx.ui.core.Dp value);
- property public final androidx.ui.core.Dp margin;
+ method public void setMargin(androidx.ui.unit.Dp value);
+ property public final androidx.ui.unit.Dp margin;
}
public static final class ConstraintSetBuilderScope.VerticalAnchor.ConstrainedLayoutAnchor extends androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.VerticalAnchor {
method public infix void constrainTo(androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.VerticalAnchor other);
method public int getIndex$lintWithKotlin();
- method public androidx.ui.core.Dp getMargin();
+ method public androidx.ui.unit.Dp getMargin();
method public androidx.constraintlayout.solver.state.State getState$lintWithKotlin();
method public Object getTag$lintWithKotlin();
- method public void setMargin(androidx.ui.core.Dp value);
- property public final androidx.ui.core.Dp margin;
+ method public void setMargin(androidx.ui.unit.Dp value);
+ property public final androidx.ui.unit.Dp margin;
property public Object tag;
}
diff --git a/ui/ui-layout/api/restricted_current.txt b/ui/ui-layout/api/restricted_current.txt
index 8cefaec..62add70 100644
--- a/ui/ui-layout/api/restricted_current.txt
+++ b/ui/ui-layout/api/restricted_current.txt
@@ -7,12 +7,12 @@
}
public final class AlignmentLineKt {
- method public static void AlignmentLineOffset(androidx.ui.core.AlignmentLine alignmentLine, androidx.ui.core.Dp before = 0.dp, androidx.ui.core.Dp after = 0.dp, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+ method public static void AlignmentLineOffset(androidx.ui.core.AlignmentLine alignmentLine, androidx.ui.unit.Dp before = 0.dp, androidx.ui.unit.Dp after = 0.dp, kotlin.jvm.functions.Function0<kotlin.Unit> children);
method public static void CenterAlignmentLine(androidx.ui.core.AlignmentLine alignmentLine, kotlin.jvm.functions.Function0<kotlin.Unit> children);
}
public final class Arrangement {
- ctor public Arrangement(internal kotlin.jvm.functions.Function2<? super androidx.ui.core.IntPx,? super java.util.List<androidx.ui.core.IntPx>,? extends java.util.List<androidx.ui.core.IntPx>> arrangeBlock);
+ ctor public Arrangement(internal kotlin.jvm.functions.Function2<? super androidx.ui.unit.IntPx,? super java.util.List<androidx.ui.unit.IntPx>,? extends java.util.List<androidx.ui.unit.IntPx>> arrangeBlock);
field public static final androidx.ui.layout.Arrangement.Companion! Companion;
}
@@ -46,7 +46,7 @@
}
public final class ContainerKt {
- method public static void Container(androidx.ui.core.Modifier modifier = Modifier.None, androidx.ui.layout.EdgeInsets padding = androidx.ui.layout.EdgeInsets(0.dp), androidx.ui.core.Alignment alignment = Alignment.Center, boolean expanded = false, androidx.ui.layout.DpConstraints constraints = androidx.ui.layout.DpConstraints(), androidx.ui.core.Dp? width = null, androidx.ui.core.Dp? height = null, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+ method public static void Container(androidx.ui.core.Modifier modifier = Modifier.None, androidx.ui.layout.EdgeInsets padding = androidx.ui.layout.EdgeInsets(0.dp), androidx.ui.core.Alignment alignment = Alignment.Center, boolean expanded = false, androidx.ui.layout.DpConstraints constraints = androidx.ui.layout.DpConstraints(), androidx.ui.unit.Dp? width = null, androidx.ui.unit.Dp? height = null, kotlin.jvm.functions.Function0<kotlin.Unit> children);
}
public final class CrossAxisAlignment {
@@ -66,29 +66,29 @@
}
public final class DpConstraints {
- ctor public DpConstraints(androidx.ui.core.Dp minWidth, androidx.ui.core.Dp maxWidth, androidx.ui.core.Dp minHeight, androidx.ui.core.Dp maxHeight);
+ ctor public DpConstraints(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp maxWidth, androidx.ui.unit.Dp minHeight, androidx.ui.unit.Dp maxHeight);
ctor public DpConstraints();
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.core.Dp component2();
- method public androidx.ui.core.Dp component3();
- method public androidx.ui.core.Dp component4();
- method public androidx.ui.layout.DpConstraints copy(androidx.ui.core.Dp minWidth, androidx.ui.core.Dp maxWidth, androidx.ui.core.Dp minHeight, androidx.ui.core.Dp maxHeight);
- method public androidx.ui.core.Dp getMaxHeight();
- method public androidx.ui.core.Dp getMaxWidth();
- method public androidx.ui.core.Dp getMinHeight();
- method public androidx.ui.core.Dp getMinWidth();
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.unit.Dp component2();
+ method public androidx.ui.unit.Dp component3();
+ method public androidx.ui.unit.Dp component4();
+ method public androidx.ui.layout.DpConstraints copy(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp maxWidth, androidx.ui.unit.Dp minHeight, androidx.ui.unit.Dp maxHeight);
+ method public androidx.ui.unit.Dp getMaxHeight();
+ method public androidx.ui.unit.Dp getMaxWidth();
+ method public androidx.ui.unit.Dp getMinHeight();
+ method public androidx.ui.unit.Dp getMinWidth();
field public static final androidx.ui.layout.DpConstraints.Companion! Companion;
}
public static final class DpConstraints.Companion {
- method public androidx.ui.layout.DpConstraints tightConstraints(androidx.ui.core.Dp width, androidx.ui.core.Dp height);
- method public androidx.ui.layout.DpConstraints tightConstraintsForHeight(androidx.ui.core.Dp height);
- method public androidx.ui.layout.DpConstraints tightConstraintsForWidth(androidx.ui.core.Dp width);
+ method public androidx.ui.layout.DpConstraints tightConstraints(androidx.ui.unit.Dp width, androidx.ui.unit.Dp height);
+ method public androidx.ui.layout.DpConstraints tightConstraintsForHeight(androidx.ui.unit.Dp height);
+ method public androidx.ui.layout.DpConstraints tightConstraintsForWidth(androidx.ui.unit.Dp width);
}
public final class DpConstraintsKt {
- method public static androidx.ui.core.Constraints Constraints(androidx.ui.core.DensityScope, androidx.ui.layout.DpConstraints dpConstraints);
- method public static androidx.ui.layout.DpConstraints DpConstraints(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints);
+ method public static androidx.ui.core.Constraints Constraints(androidx.ui.unit.DensityScope, androidx.ui.layout.DpConstraints dpConstraints);
+ method public static androidx.ui.layout.DpConstraints DpConstraints(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints);
method public static androidx.ui.layout.DpConstraints enforce(androidx.ui.layout.DpConstraints, androidx.ui.layout.DpConstraints otherConstraints);
method public static boolean getHasBoundedHeight(androidx.ui.layout.DpConstraints);
method public static boolean getHasBoundedWidth(androidx.ui.layout.DpConstraints);
@@ -99,25 +99,25 @@
method public static boolean isZero(androidx.ui.layout.DpConstraints);
method public static androidx.ui.layout.DpConstraints looseMax(androidx.ui.layout.DpConstraints);
method public static androidx.ui.layout.DpConstraints looseMin(androidx.ui.layout.DpConstraints);
- method public static androidx.ui.layout.DpConstraints offset(androidx.ui.layout.DpConstraints, androidx.ui.core.Dp horizontal = 0.dp, androidx.ui.core.Dp vertical = 0.dp);
+ method public static androidx.ui.layout.DpConstraints offset(androidx.ui.layout.DpConstraints, androidx.ui.unit.Dp horizontal = 0.dp, androidx.ui.unit.Dp vertical = 0.dp);
method public static androidx.ui.layout.DpConstraints tightMax(androidx.ui.layout.DpConstraints);
method public static androidx.ui.layout.DpConstraints tightMin(androidx.ui.layout.DpConstraints);
- method public static androidx.ui.layout.DpConstraints withTight(androidx.ui.layout.DpConstraints, androidx.ui.core.Dp? width = null, androidx.ui.core.Dp? height = null);
+ method public static androidx.ui.layout.DpConstraints withTight(androidx.ui.layout.DpConstraints, androidx.ui.unit.Dp? width = null, androidx.ui.unit.Dp? height = null);
}
public final class EdgeInsets {
- ctor public EdgeInsets(androidx.ui.core.Dp left, androidx.ui.core.Dp top, androidx.ui.core.Dp right, androidx.ui.core.Dp bottom);
+ ctor public EdgeInsets(androidx.ui.unit.Dp left, androidx.ui.unit.Dp top, androidx.ui.unit.Dp right, androidx.ui.unit.Dp bottom);
ctor public EdgeInsets();
- ctor public EdgeInsets(androidx.ui.core.Dp all);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.core.Dp component2();
- method public androidx.ui.core.Dp component3();
- method public androidx.ui.core.Dp component4();
- method public androidx.ui.layout.EdgeInsets copy(androidx.ui.core.Dp left, androidx.ui.core.Dp top, androidx.ui.core.Dp right, androidx.ui.core.Dp bottom);
- method public androidx.ui.core.Dp getBottom();
- method public androidx.ui.core.Dp getLeft();
- method public androidx.ui.core.Dp getRight();
- method public androidx.ui.core.Dp getTop();
+ ctor public EdgeInsets(androidx.ui.unit.Dp all);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.unit.Dp component2();
+ method public androidx.ui.unit.Dp component3();
+ method public androidx.ui.unit.Dp component4();
+ method public androidx.ui.layout.EdgeInsets copy(androidx.ui.unit.Dp left, androidx.ui.unit.Dp top, androidx.ui.unit.Dp right, androidx.ui.unit.Dp bottom);
+ method public androidx.ui.unit.Dp getBottom();
+ method public androidx.ui.unit.Dp getLeft();
+ method public androidx.ui.unit.Dp getRight();
+ method public androidx.ui.unit.Dp getTop();
}
public final class FlexChildren {
@@ -135,7 +135,7 @@
@androidx.ui.layout.LayoutScopeMarker public abstract sealed class FlexScope {
method public final androidx.ui.core.ParentDataModifier LayoutFlexible(@FloatRange(from=0.0, fromInclusive=false) float flex, boolean tight = true);
- method public final androidx.ui.core.ParentDataModifier RelativeToSiblings(androidx.ui.layout.LayoutGravity, kotlin.jvm.functions.Function1<? super androidx.ui.core.Placeable,androidx.ui.core.IntPx> alignmentLineBlock);
+ method public final androidx.ui.core.ParentDataModifier RelativeToSiblings(androidx.ui.layout.LayoutGravity, kotlin.jvm.functions.Function1<? super androidx.ui.core.Placeable,androidx.ui.unit.IntPx> alignmentLineBlock);
method public final androidx.ui.core.ParentDataModifier getLayoutInflexible();
property public final androidx.ui.core.ParentDataModifier LayoutInflexible;
}
@@ -147,8 +147,8 @@
}
public final class FlowKt {
- method public static void FlowColumn(androidx.ui.layout.SizeMode mainAxisSize = androidx.ui.layout.SizeMode.Wrap, androidx.ui.layout.MainAxisAlignment mainAxisAlignment = androidx.ui.layout.MainAxisAlignment.Start, androidx.ui.core.Dp mainAxisSpacing = 0.dp, androidx.ui.layout.FlowCrossAxisAlignment crossAxisAlignment = androidx.ui.layout.FlowCrossAxisAlignment.Start, androidx.ui.core.Dp crossAxisSpacing = 0.dp, androidx.ui.layout.MainAxisAlignment lastLineMainAxisAlignment = mainAxisAlignment, kotlin.jvm.functions.Function0<kotlin.Unit> children);
- method public static void FlowRow(androidx.ui.layout.SizeMode mainAxisSize = androidx.ui.layout.SizeMode.Wrap, androidx.ui.layout.MainAxisAlignment mainAxisAlignment = androidx.ui.layout.MainAxisAlignment.Start, androidx.ui.core.Dp mainAxisSpacing = 0.dp, androidx.ui.layout.FlowCrossAxisAlignment crossAxisAlignment = androidx.ui.layout.FlowCrossAxisAlignment.Start, androidx.ui.core.Dp crossAxisSpacing = 0.dp, androidx.ui.layout.MainAxisAlignment lastLineMainAxisAlignment = mainAxisAlignment, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+ method public static void FlowColumn(androidx.ui.layout.SizeMode mainAxisSize = androidx.ui.layout.SizeMode.Wrap, androidx.ui.layout.MainAxisAlignment mainAxisAlignment = androidx.ui.layout.MainAxisAlignment.Start, androidx.ui.unit.Dp mainAxisSpacing = 0.dp, androidx.ui.layout.FlowCrossAxisAlignment crossAxisAlignment = androidx.ui.layout.FlowCrossAxisAlignment.Start, androidx.ui.unit.Dp crossAxisSpacing = 0.dp, androidx.ui.layout.MainAxisAlignment lastLineMainAxisAlignment = mainAxisAlignment, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+ method public static void FlowRow(androidx.ui.layout.SizeMode mainAxisSize = androidx.ui.layout.SizeMode.Wrap, androidx.ui.layout.MainAxisAlignment mainAxisAlignment = androidx.ui.layout.MainAxisAlignment.Start, androidx.ui.unit.Dp mainAxisSpacing = 0.dp, androidx.ui.layout.FlowCrossAxisAlignment crossAxisAlignment = androidx.ui.layout.FlowCrossAxisAlignment.Start, androidx.ui.unit.Dp crossAxisSpacing = 0.dp, androidx.ui.layout.MainAxisAlignment lastLineMainAxisAlignment = mainAxisAlignment, kotlin.jvm.functions.Function0<kotlin.Unit> children);
}
public final class IntrinsicKt {
@@ -197,11 +197,11 @@
method public float component1();
method public androidx.ui.layout.LayoutAspectRatio copy(float aspectRatio);
method public float getAspectRatio();
- method public androidx.ui.core.IntPx maxIntrinsicHeightOf(androidx.ui.core.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.core.IntPx width);
- method public androidx.ui.core.IntPx maxIntrinsicWidthOf(androidx.ui.core.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.core.IntPx height);
- method public androidx.ui.core.IntPx minIntrinsicHeightOf(androidx.ui.core.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.core.IntPx width);
- method public androidx.ui.core.IntPx minIntrinsicWidthOf(androidx.ui.core.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.core.IntPx height);
- method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints);
+ method public androidx.ui.unit.IntPx maxIntrinsicHeightOf(androidx.ui.unit.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.unit.IntPx width);
+ method public androidx.ui.unit.IntPx maxIntrinsicWidthOf(androidx.ui.unit.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.unit.IntPx height);
+ method public androidx.ui.unit.IntPx minIntrinsicHeightOf(androidx.ui.unit.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.unit.IntPx width);
+ method public androidx.ui.unit.IntPx minIntrinsicWidthOf(androidx.ui.unit.DensityScope, androidx.ui.core.Measurable measurable, androidx.ui.unit.IntPx height);
+ method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints);
}
public final class LayoutGravity {
@@ -209,224 +209,224 @@
}
public final class LayoutHeight implements androidx.ui.core.LayoutModifier {
- ctor public LayoutHeight(androidx.ui.core.Dp height);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.layout.LayoutHeight copy(androidx.ui.core.Dp height);
+ ctor public LayoutHeight(androidx.ui.unit.Dp height);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.layout.LayoutHeight copy(androidx.ui.unit.Dp height);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getHeight();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getHeight();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public static final class LayoutHeight.Constrain implements androidx.ui.core.LayoutModifier {
- ctor public LayoutHeight.Constrain(androidx.ui.core.Dp minHeight, androidx.ui.core.Dp maxHeight);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.core.Dp component2();
- method public androidx.ui.layout.LayoutHeight.Constrain copy(androidx.ui.core.Dp minHeight, androidx.ui.core.Dp maxHeight);
+ ctor public LayoutHeight.Constrain(androidx.ui.unit.Dp minHeight, androidx.ui.unit.Dp maxHeight);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.unit.Dp component2();
+ method public androidx.ui.layout.LayoutHeight.Constrain copy(androidx.ui.unit.Dp minHeight, androidx.ui.unit.Dp maxHeight);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getMaxHeight();
- method public androidx.ui.core.Dp getMinHeight();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getMaxHeight();
+ method public androidx.ui.unit.Dp getMinHeight();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public static final class LayoutHeight.Fill implements androidx.ui.core.LayoutModifier {
- method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints);
+ method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints);
field public static final androidx.ui.layout.LayoutHeight.Fill! INSTANCE;
}
public static final class LayoutHeight.Max implements androidx.ui.core.LayoutModifier {
- ctor public LayoutHeight.Max(androidx.ui.core.Dp maxHeight);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.layout.LayoutHeight.Max copy(androidx.ui.core.Dp maxHeight);
+ ctor public LayoutHeight.Max(androidx.ui.unit.Dp maxHeight);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.layout.LayoutHeight.Max copy(androidx.ui.unit.Dp maxHeight);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getMaxHeight();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getMaxHeight();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public static final class LayoutHeight.Min implements androidx.ui.core.LayoutModifier {
- ctor public LayoutHeight.Min(androidx.ui.core.Dp minHeight);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.layout.LayoutHeight.Min copy(androidx.ui.core.Dp minHeight);
+ ctor public LayoutHeight.Min(androidx.ui.unit.Dp minHeight);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.layout.LayoutHeight.Min copy(androidx.ui.unit.Dp minHeight);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getMinHeight();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getMinHeight();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public final class LayoutPadding implements androidx.ui.core.LayoutModifier {
- ctor public LayoutPadding(androidx.ui.core.Dp left, androidx.ui.core.Dp top, androidx.ui.core.Dp right, androidx.ui.core.Dp bottom);
+ ctor public LayoutPadding(androidx.ui.unit.Dp left, androidx.ui.unit.Dp top, androidx.ui.unit.Dp right, androidx.ui.unit.Dp bottom);
ctor public LayoutPadding();
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.core.Dp component2();
- method public androidx.ui.core.Dp component3();
- method public androidx.ui.core.Dp component4();
- method public androidx.ui.layout.LayoutPadding copy(androidx.ui.core.Dp left, androidx.ui.core.Dp top, androidx.ui.core.Dp right, androidx.ui.core.Dp bottom);
- method public androidx.ui.core.Dp getBottom();
- method public androidx.ui.core.Dp getLeft();
- method public androidx.ui.core.Dp getRight();
- method public androidx.ui.core.Dp getTop();
- method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.unit.Dp component2();
+ method public androidx.ui.unit.Dp component3();
+ method public androidx.ui.unit.Dp component4();
+ method public androidx.ui.layout.LayoutPadding copy(androidx.ui.unit.Dp left, androidx.ui.unit.Dp top, androidx.ui.unit.Dp right, androidx.ui.unit.Dp bottom);
+ method public androidx.ui.unit.Dp getBottom();
+ method public androidx.ui.unit.Dp getLeft();
+ method public androidx.ui.unit.Dp getRight();
+ method public androidx.ui.unit.Dp getTop();
+ method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
}
@kotlin.DslMarker public @interface LayoutScopeMarker {
}
public final class LayoutSize implements androidx.ui.core.LayoutModifier {
- ctor public LayoutSize(androidx.ui.core.Dp width, androidx.ui.core.Dp height);
- ctor public LayoutSize(androidx.ui.core.Dp size);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.core.Dp component2();
- method public androidx.ui.layout.LayoutSize copy(androidx.ui.core.Dp width, androidx.ui.core.Dp height);
+ ctor public LayoutSize(androidx.ui.unit.Dp width, androidx.ui.unit.Dp height);
+ ctor public LayoutSize(androidx.ui.unit.Dp size);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.unit.Dp component2();
+ method public androidx.ui.layout.LayoutSize copy(androidx.ui.unit.Dp width, androidx.ui.unit.Dp height);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getHeight();
- method public androidx.ui.core.Dp getWidth();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getHeight();
+ method public androidx.ui.unit.Dp getWidth();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public static final class LayoutSize.Constrain implements androidx.ui.core.LayoutModifier {
- ctor public LayoutSize.Constrain(androidx.ui.core.Dp minWidth, androidx.ui.core.Dp minHeight, androidx.ui.core.Dp maxWidth, androidx.ui.core.Dp maxHeight);
- ctor public LayoutSize.Constrain(androidx.ui.core.Dp minSize, androidx.ui.core.Dp maxSize);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.core.Dp component2();
- method public androidx.ui.core.Dp component3();
- method public androidx.ui.core.Dp component4();
- method public androidx.ui.layout.LayoutSize.Constrain copy(androidx.ui.core.Dp minWidth, androidx.ui.core.Dp minHeight, androidx.ui.core.Dp maxWidth, androidx.ui.core.Dp maxHeight);
+ ctor public LayoutSize.Constrain(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp minHeight, androidx.ui.unit.Dp maxWidth, androidx.ui.unit.Dp maxHeight);
+ ctor public LayoutSize.Constrain(androidx.ui.unit.Dp minSize, androidx.ui.unit.Dp maxSize);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.unit.Dp component2();
+ method public androidx.ui.unit.Dp component3();
+ method public androidx.ui.unit.Dp component4();
+ method public androidx.ui.layout.LayoutSize.Constrain copy(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp minHeight, androidx.ui.unit.Dp maxWidth, androidx.ui.unit.Dp maxHeight);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getMaxHeight();
- method public androidx.ui.core.Dp getMaxWidth();
- method public androidx.ui.core.Dp getMinHeight();
- method public androidx.ui.core.Dp getMinWidth();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getMaxHeight();
+ method public androidx.ui.unit.Dp getMaxWidth();
+ method public androidx.ui.unit.Dp getMinHeight();
+ method public androidx.ui.unit.Dp getMinWidth();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public static final class LayoutSize.Fill implements androidx.ui.core.LayoutModifier {
- method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints);
+ method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints);
field public static final androidx.ui.layout.LayoutSize.Fill! INSTANCE;
}
public static final class LayoutSize.Max implements androidx.ui.core.LayoutModifier {
- ctor public LayoutSize.Max(androidx.ui.core.Dp maxWidth, androidx.ui.core.Dp maxHeight);
- ctor public LayoutSize.Max(androidx.ui.core.Dp maxSize);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.core.Dp component2();
- method public androidx.ui.layout.LayoutSize.Max copy(androidx.ui.core.Dp maxWidth, androidx.ui.core.Dp maxHeight);
+ ctor public LayoutSize.Max(androidx.ui.unit.Dp maxWidth, androidx.ui.unit.Dp maxHeight);
+ ctor public LayoutSize.Max(androidx.ui.unit.Dp maxSize);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.unit.Dp component2();
+ method public androidx.ui.layout.LayoutSize.Max copy(androidx.ui.unit.Dp maxWidth, androidx.ui.unit.Dp maxHeight);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getMaxHeight();
- method public androidx.ui.core.Dp getMaxWidth();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getMaxHeight();
+ method public androidx.ui.unit.Dp getMaxWidth();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public static final class LayoutSize.Min implements androidx.ui.core.LayoutModifier {
- ctor public LayoutSize.Min(androidx.ui.core.Dp minWidth, androidx.ui.core.Dp minHeight);
- ctor public LayoutSize.Min(androidx.ui.core.Dp minSize);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.core.Dp component2();
- method public androidx.ui.layout.LayoutSize.Min copy(androidx.ui.core.Dp minWidth, androidx.ui.core.Dp minHeight);
+ ctor public LayoutSize.Min(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp minHeight);
+ ctor public LayoutSize.Min(androidx.ui.unit.Dp minSize);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.unit.Dp component2();
+ method public androidx.ui.layout.LayoutSize.Min copy(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp minHeight);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getMinHeight();
- method public androidx.ui.core.Dp getMinWidth();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getMinHeight();
+ method public androidx.ui.unit.Dp getMinWidth();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public final class LayoutWidth implements androidx.ui.core.LayoutModifier {
- ctor public LayoutWidth(androidx.ui.core.Dp width);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.layout.LayoutWidth copy(androidx.ui.core.Dp width);
+ ctor public LayoutWidth(androidx.ui.unit.Dp width);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.layout.LayoutWidth copy(androidx.ui.unit.Dp width);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getWidth();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getWidth();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public static final class LayoutWidth.Constrain implements androidx.ui.core.LayoutModifier {
- ctor public LayoutWidth.Constrain(androidx.ui.core.Dp minWidth, androidx.ui.core.Dp maxWidth);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.core.Dp component2();
- method public androidx.ui.layout.LayoutWidth.Constrain copy(androidx.ui.core.Dp minWidth, androidx.ui.core.Dp maxWidth);
+ ctor public LayoutWidth.Constrain(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp maxWidth);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.unit.Dp component2();
+ method public androidx.ui.layout.LayoutWidth.Constrain copy(androidx.ui.unit.Dp minWidth, androidx.ui.unit.Dp maxWidth);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getMaxWidth();
- method public androidx.ui.core.Dp getMinWidth();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getMaxWidth();
+ method public androidx.ui.unit.Dp getMinWidth();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public static final class LayoutWidth.Fill implements androidx.ui.core.LayoutModifier {
- method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints);
+ method public androidx.ui.core.Constraints modifyConstraints(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints);
field public static final androidx.ui.layout.LayoutWidth.Fill! INSTANCE;
}
public static final class LayoutWidth.Max implements androidx.ui.core.LayoutModifier {
- ctor public LayoutWidth.Max(androidx.ui.core.Dp maxWidth);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.layout.LayoutWidth.Max copy(androidx.ui.core.Dp maxWidth);
+ ctor public LayoutWidth.Max(androidx.ui.unit.Dp maxWidth);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.layout.LayoutWidth.Max copy(androidx.ui.unit.Dp maxWidth);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getMaxWidth();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getMaxWidth();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
public static final class LayoutWidth.Min implements androidx.ui.core.LayoutModifier {
- ctor public LayoutWidth.Min(androidx.ui.core.Dp minWidth);
- method public androidx.ui.core.Dp component1();
- method public androidx.ui.layout.LayoutWidth.Min copy(androidx.ui.core.Dp minWidth);
+ ctor public LayoutWidth.Min(androidx.ui.unit.Dp minWidth);
+ method public androidx.ui.unit.Dp component1();
+ method public androidx.ui.layout.LayoutWidth.Min copy(androidx.ui.unit.Dp minWidth);
method public <R> R! foldIn(R! initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
method public <R> R! foldOut(R! initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
- method public androidx.ui.core.Dp getMinWidth();
- method public androidx.ui.core.IntPx? modifyAlignmentLine(androidx.ui.core.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.core.IntPx? value);
- method public androidx.ui.core.IntPxPosition modifyPosition(androidx.ui.core.DensityScope, androidx.ui.core.IntPxSize childSize, androidx.ui.core.IntPxSize containerSize);
- method public androidx.ui.core.IntPxSize modifySize(androidx.ui.core.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.core.IntPxSize childSize);
+ method public androidx.ui.unit.Dp getMinWidth();
+ method public androidx.ui.unit.IntPx? modifyAlignmentLine(androidx.ui.unit.DensityScope, androidx.ui.core.AlignmentLine line, androidx.ui.unit.IntPx? value);
+ method public androidx.ui.unit.IntPxPosition modifyPosition(androidx.ui.unit.DensityScope, androidx.ui.unit.IntPxSize childSize, androidx.ui.unit.IntPxSize containerSize);
+ method public androidx.ui.unit.IntPxSize modifySize(androidx.ui.unit.DensityScope, androidx.ui.core.Constraints constraints, androidx.ui.unit.IntPxSize childSize);
method public androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
method @Deprecated public androidx.ui.core.Modifier wraps(androidx.ui.core.Modifier other);
}
@@ -441,12 +441,12 @@
}
public final class PaddingKt {
- method public static androidx.ui.layout.LayoutPadding LayoutPadding(androidx.ui.core.Dp all);
+ method public static androidx.ui.layout.LayoutPadding LayoutPadding(androidx.ui.unit.Dp all);
method public static void Padding(androidx.ui.layout.EdgeInsets padding, kotlin.jvm.functions.Function0<kotlin.Unit> children);
- method public static void Padding(androidx.ui.core.Dp left = 0.dp, androidx.ui.core.Dp top = 0.dp, androidx.ui.core.Dp right = 0.dp, androidx.ui.core.Dp bottom = 0.dp, kotlin.jvm.functions.Function0<kotlin.Unit> children);
- method public static void Padding(androidx.ui.core.Dp padding, kotlin.jvm.functions.Function0<kotlin.Unit> children);
- method @Deprecated public static androidx.ui.core.LayoutModifier Spacing(androidx.ui.core.Dp left = 0.dp, androidx.ui.core.Dp top = 0.dp, androidx.ui.core.Dp right = 0.dp, androidx.ui.core.Dp bottom = 0.dp);
- method @Deprecated public static androidx.ui.core.LayoutModifier Spacing(androidx.ui.core.Dp all = 0.dp);
+ method public static void Padding(androidx.ui.unit.Dp left = 0.dp, androidx.ui.unit.Dp top = 0.dp, androidx.ui.unit.Dp right = 0.dp, androidx.ui.unit.Dp bottom = 0.dp, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+ method public static void Padding(androidx.ui.unit.Dp padding, kotlin.jvm.functions.Function0<kotlin.Unit> children);
+ method @Deprecated public static androidx.ui.core.LayoutModifier Spacing(androidx.ui.unit.Dp left = 0.dp, androidx.ui.unit.Dp top = 0.dp, androidx.ui.unit.Dp right = 0.dp, androidx.ui.unit.Dp bottom = 0.dp);
+ method @Deprecated public static androidx.ui.core.LayoutModifier Spacing(androidx.ui.unit.Dp all = 0.dp);
}
public final class RowScope extends androidx.ui.layout.FlexScope {
@@ -502,27 +502,27 @@
}
public abstract class TableColumnWidth {
- method public androidx.ui.core.IntPx maxIntrinsicWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density, androidx.ui.core.IntPx availableHeight);
- method public androidx.ui.core.IntPx minIntrinsicWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density, androidx.ui.core.IntPx availableHeight);
- method public abstract androidx.ui.core.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density);
+ method public androidx.ui.unit.IntPx maxIntrinsicWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density, androidx.ui.unit.IntPx availableHeight);
+ method public androidx.ui.unit.IntPx minIntrinsicWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density, androidx.ui.unit.IntPx availableHeight);
+ method public abstract androidx.ui.unit.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density);
}
public static final class TableColumnWidth.Fixed extends androidx.ui.layout.TableColumnWidth.Inflexible {
- ctor public TableColumnWidth.Fixed(androidx.ui.core.Dp width);
- method public androidx.ui.layout.TableColumnWidth.Fixed copy(androidx.ui.core.Dp width);
- method public androidx.ui.core.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density);
+ ctor public TableColumnWidth.Fixed(androidx.ui.unit.Dp width);
+ method public androidx.ui.layout.TableColumnWidth.Fixed copy(androidx.ui.unit.Dp width);
+ method public androidx.ui.unit.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density);
}
public static final class TableColumnWidth.Flex extends androidx.ui.layout.TableColumnWidth {
ctor public TableColumnWidth.Flex(@FloatRange(from=null) float flex);
method public androidx.ui.layout.TableColumnWidth.Flex copy(float flex);
- method public androidx.ui.core.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density);
+ method public androidx.ui.unit.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density);
}
public static final class TableColumnWidth.Fraction extends androidx.ui.layout.TableColumnWidth.Inflexible {
ctor public TableColumnWidth.Fraction(@FloatRange(from=null, to=null) float fraction);
method public androidx.ui.layout.TableColumnWidth.Fraction copy(float fraction);
- method public androidx.ui.core.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density);
+ method public androidx.ui.unit.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density);
}
public abstract static class TableColumnWidth.Inflexible extends androidx.ui.layout.TableColumnWidth {
@@ -533,36 +533,36 @@
public static final class TableColumnWidth.Max extends androidx.ui.layout.TableColumnWidth.Inflexible {
ctor public TableColumnWidth.Max(androidx.ui.layout.TableColumnWidth.Inflexible a, androidx.ui.layout.TableColumnWidth.Inflexible b);
method public androidx.ui.layout.TableColumnWidth.Max copy(androidx.ui.layout.TableColumnWidth.Inflexible a, androidx.ui.layout.TableColumnWidth.Inflexible b);
- method public androidx.ui.core.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density);
+ method public androidx.ui.unit.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density);
}
public static final class TableColumnWidth.MaxIntrinsic extends androidx.ui.layout.TableColumnWidth.Inflexible {
- method public androidx.ui.core.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density);
+ method public androidx.ui.unit.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density);
field public static final androidx.ui.layout.TableColumnWidth.MaxIntrinsic! INSTANCE;
}
public static final class TableColumnWidth.Min extends androidx.ui.layout.TableColumnWidth.Inflexible {
ctor public TableColumnWidth.Min(androidx.ui.layout.TableColumnWidth.Inflexible a, androidx.ui.layout.TableColumnWidth.Inflexible b);
method public androidx.ui.layout.TableColumnWidth.Min copy(androidx.ui.layout.TableColumnWidth.Inflexible a, androidx.ui.layout.TableColumnWidth.Inflexible b);
- method public androidx.ui.core.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density);
+ method public androidx.ui.unit.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density);
}
public static final class TableColumnWidth.MinIntrinsic extends androidx.ui.layout.TableColumnWidth.Inflexible {
- method public androidx.ui.core.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density);
+ method public androidx.ui.unit.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density);
field public static final androidx.ui.layout.TableColumnWidth.MinIntrinsic! INSTANCE;
}
public static final class TableColumnWidth.Wrap extends androidx.ui.layout.TableColumnWidth.Inflexible {
- method public androidx.ui.core.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.core.IntPx containerWidth, androidx.ui.core.Density density);
+ method public androidx.ui.unit.IntPx preferredWidth(java.util.List<androidx.ui.layout.TableMeasurable> cells, androidx.ui.unit.IntPx containerWidth, androidx.ui.unit.Density density);
field public static final androidx.ui.layout.TableColumnWidth.Wrap! INSTANCE;
}
public final class TableDecorationChildren {
- method public java.util.List<androidx.ui.core.IntPx> component1();
- method public java.util.List<androidx.ui.core.IntPx> component2();
- method public androidx.ui.layout.TableDecorationChildren copy(java.util.List<androidx.ui.core.IntPx> verticalOffsets, java.util.List<androidx.ui.core.IntPx> horizontalOffsets);
- method public java.util.List<androidx.ui.core.IntPx> getHorizontalOffsets();
- method public java.util.List<androidx.ui.core.IntPx> getVerticalOffsets();
+ method public java.util.List<androidx.ui.unit.IntPx> component1();
+ method public java.util.List<androidx.ui.unit.IntPx> component2();
+ method public androidx.ui.layout.TableDecorationChildren copy(java.util.List<androidx.ui.unit.IntPx> verticalOffsets, java.util.List<androidx.ui.unit.IntPx> horizontalOffsets);
+ method public java.util.List<androidx.ui.unit.IntPx> getHorizontalOffsets();
+ method public java.util.List<androidx.ui.unit.IntPx> getVerticalOffsets();
}
public final class TableKt {
@@ -570,13 +570,13 @@
}
public final class TableMeasurable {
- method public kotlin.jvm.functions.Function0<androidx.ui.core.IntPx> component1();
- method public kotlin.jvm.functions.Function1<androidx.ui.core.IntPx,androidx.ui.core.IntPx> component2();
- method public kotlin.jvm.functions.Function1<androidx.ui.core.IntPx,androidx.ui.core.IntPx> component3();
- method public androidx.ui.layout.TableMeasurable copy(kotlin.jvm.functions.Function0<androidx.ui.core.IntPx> preferredWidth, kotlin.jvm.functions.Function1<? super androidx.ui.core.IntPx,androidx.ui.core.IntPx> minIntrinsicWidth, kotlin.jvm.functions.Function1<? super androidx.ui.core.IntPx,androidx.ui.core.IntPx> maxIntrinsicWidth);
- method public kotlin.jvm.functions.Function1<androidx.ui.core.IntPx,androidx.ui.core.IntPx> getMaxIntrinsicWidth();
- method public kotlin.jvm.functions.Function1<androidx.ui.core.IntPx,androidx.ui.core.IntPx> getMinIntrinsicWidth();
- method public kotlin.jvm.functions.Function0<androidx.ui.core.IntPx> getPreferredWidth();
+ method public kotlin.jvm.functions.Function0<androidx.ui.unit.IntPx> component1();
+ method public kotlin.jvm.functions.Function1<androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> component2();
+ method public kotlin.jvm.functions.Function1<androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> component3();
+ method public androidx.ui.layout.TableMeasurable copy(kotlin.jvm.functions.Function0<androidx.ui.unit.IntPx> preferredWidth, kotlin.jvm.functions.Function1<? super androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> minIntrinsicWidth, kotlin.jvm.functions.Function1<? super androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> maxIntrinsicWidth);
+ method public kotlin.jvm.functions.Function1<androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> getMaxIntrinsicWidth();
+ method public kotlin.jvm.functions.Function1<androidx.ui.unit.IntPx,androidx.ui.unit.IntPx> getMinIntrinsicWidth();
+ method public kotlin.jvm.functions.Function0<androidx.ui.unit.IntPx> getPreferredWidth();
}
public final class WrapKt {
@@ -599,13 +599,13 @@
public final class ConstraintSetBuilderScope {
method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalAnchor.BarrierAnchor createBottomBarrier(androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.ConstrainedLayoutReference... elements);
- method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalAnchor.GuidelineAnchor createGuidelineFromBottom(androidx.ui.core.Dp offset);
+ method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalAnchor.GuidelineAnchor createGuidelineFromBottom(androidx.ui.unit.Dp offset);
method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalAnchor.GuidelineAnchor createGuidelineFromBottom(float percent);
- method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.VerticalAnchor.GuidelineAnchor createGuidelineFromLeft(androidx.ui.core.Dp offset);
+ method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.VerticalAnchor.GuidelineAnchor createGuidelineFromLeft(androidx.ui.unit.Dp offset);
method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.VerticalAnchor.GuidelineAnchor createGuidelineFromLeft(float percent);
- method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.VerticalAnchor.GuidelineAnchor createGuidelineFromRight(androidx.ui.core.Dp offset);
+ method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.VerticalAnchor.GuidelineAnchor createGuidelineFromRight(androidx.ui.unit.Dp offset);
method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.VerticalAnchor.GuidelineAnchor createGuidelineFromRight(float percent);
- method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalAnchor.GuidelineAnchor createGuidelineFromTop(androidx.ui.core.Dp offset);
+ method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalAnchor.GuidelineAnchor createGuidelineFromTop(androidx.ui.unit.Dp offset);
method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalAnchor.GuidelineAnchor createGuidelineFromTop(float percent);
method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalChain createHorizontalChain(androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.ConstrainedLayoutReference![] elements, androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.ChainStyle chainStyle = ChainStyle.Spread);
method public androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.VerticalAnchor.BarrierAnchor createLeftBarrier(androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.ConstrainedLayoutReference... elements);
@@ -672,21 +672,21 @@
public static final class ConstraintSetBuilderScope.HorizontalAnchor.BarrierAnchor extends androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalAnchor {
method public int getIndex$lintWithKotlin();
- method public androidx.ui.core.Dp getMargin();
+ method public androidx.ui.unit.Dp getMargin();
method public androidx.constraintlayout.solver.state.State getState$lintWithKotlin();
method public Object getTag$lintWithKotlin();
- method public void setMargin(androidx.ui.core.Dp value);
- property public final androidx.ui.core.Dp margin;
+ method public void setMargin(androidx.ui.unit.Dp value);
+ property public final androidx.ui.unit.Dp margin;
}
public static final class ConstraintSetBuilderScope.HorizontalAnchor.ConstrainedLayoutAnchor extends androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalAnchor {
method public infix void constrainTo(androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.HorizontalAnchor other);
method public int getIndex$lintWithKotlin();
- method public androidx.ui.core.Dp getMargin();
+ method public androidx.ui.unit.Dp getMargin();
method public androidx.constraintlayout.solver.state.State getState$lintWithKotlin();
method public Object getTag$lintWithKotlin();
- method public void setMargin(androidx.ui.core.Dp value);
- property public final androidx.ui.core.Dp margin;
+ method public void setMargin(androidx.ui.unit.Dp value);
+ property public final androidx.ui.unit.Dp margin;
property public Object tag;
}
@@ -709,21 +709,21 @@
public static final class ConstraintSetBuilderScope.VerticalAnchor.BarrierAnchor extends androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.VerticalAnchor {
method public int getIndex$lintWithKotlin();
- method public androidx.ui.core.Dp getMargin();
+ method public androidx.ui.unit.Dp getMargin();
method public androidx.constraintlayout.solver.state.State getState$lintWithKotlin();
method public Object getTag$lintWithKotlin();
- method public void setMargin(androidx.ui.core.Dp value);
- property public final androidx.ui.core.Dp margin;
+ method public void setMargin(androidx.ui.unit.Dp value);
+ property public final androidx.ui.unit.Dp margin;
}
public static final class ConstraintSetBuilderScope.VerticalAnchor.ConstrainedLayoutAnchor extends androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.VerticalAnchor {
method public infix void constrainTo(androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope.VerticalAnchor other);
method public int getIndex$lintWithKotlin();
- method public androidx.ui.core.Dp getMargin();
+ method public androidx.ui.unit.Dp getMargin();
method public androidx.constraintlayout.solver.state.State getState$lintWithKotlin();
method public Object getTag$lintWithKotlin();
- method public void setMargin(androidx.ui.core.Dp value);
- property public final androidx.ui.core.Dp margin;
+ method public void setMargin(androidx.ui.unit.Dp value);
+ property public final androidx.ui.unit.Dp margin;
property public Object tag;
}
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 7a3690b4..2e0fd92 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
@@ -20,39 +20,39 @@
import androidx.compose.Composable
import androidx.compose.Model
import androidx.compose.onCommit
+import androidx.compose.remember
import androidx.ui.core.Alignment
import androidx.ui.core.Constraints
import androidx.ui.core.Draw
import androidx.ui.core.FirstBaseline
import androidx.ui.core.HorizontalAlignmentLine
-import androidx.ui.core.IntPx
-import androidx.ui.core.IntPxSize
import androidx.ui.core.Layout
import androidx.ui.core.Text
import androidx.ui.core.VerticalAlignmentLine
import androidx.ui.core.WithConstraints
import androidx.ui.core.constrain
-import androidx.ui.core.dp
-import androidx.ui.core.ipx
-import androidx.ui.core.max
-import androidx.ui.core.sp
-import androidx.ui.core.toRect
import androidx.ui.graphics.Color
import androidx.ui.graphics.Paint
import androidx.ui.layout.Align
-import androidx.ui.layout.LayoutAlign
import androidx.ui.layout.AlignmentLineOffset
import androidx.ui.layout.Column
+import androidx.ui.layout.LayoutAlign
import androidx.ui.layout.LayoutGravity
import androidx.ui.layout.LayoutPadding
import androidx.ui.layout.Padding
import androidx.ui.layout.Row
import androidx.ui.layout.Stack
-import androidx.compose.remember
import androidx.ui.layout.Wrap
import androidx.ui.layout.samples.DrawRectangle
import androidx.ui.layout.samples.SizedRectangle
import androidx.ui.text.TextStyle
+import androidx.ui.unit.IntPx
+import androidx.ui.unit.IntPxSize
+import androidx.ui.unit.dp
+import androidx.ui.unit.ipx
+import androidx.ui.unit.max
+import androidx.ui.unit.sp
+import androidx.ui.unit.toRect
/**
* A composable that forces its only child to be as wide as its min intrinsic width.
diff --git a/ui/ui-layout/integration-tests/layout-demos/src/main/java/androidx/ui/layout/demos/ConstraintLayoutActivity.kt b/ui/ui-layout/integration-tests/layout-demos/src/main/java/androidx/ui/layout/demos/ConstraintLayoutActivity.kt
index b24948e..01dd8b3 100644
--- a/ui/ui-layout/integration-tests/layout-demos/src/main/java/androidx/ui/layout/demos/ConstraintLayoutActivity.kt
+++ b/ui/ui-layout/integration-tests/layout-demos/src/main/java/androidx/ui/layout/demos/ConstraintLayoutActivity.kt
@@ -22,16 +22,16 @@
import androidx.ui.core.Draw
import androidx.ui.core.LayoutTag
import androidx.ui.core.Text
-import androidx.ui.core.dp
import androidx.ui.core.setContent
-import androidx.ui.core.sp
-import androidx.ui.core.toRect
import androidx.ui.graphics.Color
import androidx.ui.graphics.Paint
import androidx.ui.layout.constraintlayout.ConstraintLayout
import androidx.ui.layout.constraintlayout.ConstraintSet
import androidx.ui.layout.constraintlayout.ConstraintSetBuilderScope
import androidx.ui.text.TextStyle
+import androidx.ui.unit.dp
+import androidx.ui.unit.sp
+import androidx.ui.unit.toRect
/**
* Simple ConstraintLayout demo
diff --git a/ui/ui-layout/integration-tests/layout-demos/src/main/java/androidx/ui/layout/demos/LayoutActivity.kt b/ui/ui-layout/integration-tests/layout-demos/src/main/java/androidx/ui/layout/demos/LayoutActivity.kt
index 8e5ab43..7287d7f 100644
--- a/ui/ui-layout/integration-tests/layout-demos/src/main/java/androidx/ui/layout/demos/LayoutActivity.kt
+++ b/ui/ui-layout/integration-tests/layout-demos/src/main/java/androidx/ui/layout/demos/LayoutActivity.kt
@@ -18,25 +18,25 @@
import android.app.Activity
import android.os.Bundle
-import androidx.ui.core.Dp
-import androidx.ui.core.Text
-import androidx.ui.core.dp
-import androidx.ui.layout.Column
-import androidx.ui.layout.Container
-import androidx.ui.layout.LayoutHeight
-import androidx.ui.layout.Spacer
-import androidx.ui.layout.Row
-import androidx.ui.layout.LayoutWidth
-import androidx.ui.layout.Wrap
-import androidx.ui.graphics.Color
-import androidx.ui.text.TextStyle
import androidx.compose.Composable
import androidx.ui.core.Modifier
+import androidx.ui.core.Text
import androidx.ui.core.setContent
-import androidx.ui.core.sp
+import androidx.ui.graphics.Color
import androidx.ui.layout.Arrangement
+import androidx.ui.layout.Column
+import androidx.ui.layout.Container
import androidx.ui.layout.LayoutGravity
+import androidx.ui.layout.LayoutHeight
+import androidx.ui.layout.LayoutWidth
+import androidx.ui.layout.Row
+import androidx.ui.layout.Spacer
+import androidx.ui.layout.Wrap
import androidx.ui.layout.samples.DrawRectangle
+import androidx.ui.text.TextStyle
+import androidx.ui.unit.Dp
+import androidx.ui.unit.dp
+import androidx.ui.unit.sp
class LayoutActivity : Activity() {
diff --git a/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/AlignSample.kt b/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/AlignSample.kt
index 8abbe94..c85e53b 100644
--- a/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/AlignSample.kt
+++ b/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/AlignSample.kt
@@ -19,16 +19,16 @@
import androidx.annotation.Sampled
import androidx.compose.Composable
import androidx.ui.core.Alignment
-import androidx.ui.core.dp
import androidx.ui.graphics.Color
import androidx.ui.layout.Align
-import androidx.ui.layout.LayoutAlign
import androidx.ui.layout.Center
import androidx.ui.layout.Column
+import androidx.ui.layout.LayoutAlign
import androidx.ui.layout.LayoutGravity
import androidx.ui.layout.LayoutHeight
import androidx.ui.layout.LayoutWidth
import androidx.ui.layout.Row
+import androidx.ui.unit.dp
@Sampled
@Composable
diff --git a/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/AspectRatioSample.kt b/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/AspectRatioSample.kt
index 55151bc..13a5d76 100644
--- a/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/AspectRatioSample.kt
+++ b/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/AspectRatioSample.kt
@@ -18,12 +18,12 @@
import androidx.annotation.Sampled
import androidx.compose.Composable
-import androidx.ui.core.dp
import androidx.ui.foundation.ColoredRect
import androidx.ui.graphics.Color
-import androidx.ui.layout.LayoutAspectRatio
import androidx.ui.layout.Container
import androidx.ui.layout.DpConstraints
+import androidx.ui.layout.LayoutAspectRatio
+import androidx.ui.unit.dp
@Sampled
@Composable
diff --git a/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/FlexSample.kt b/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/FlexSample.kt
index 92b377d..18f02be1 100644
--- a/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/FlexSample.kt
+++ b/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/FlexSample.kt
@@ -20,8 +20,6 @@
import androidx.compose.Composable
import androidx.ui.core.FirstBaseline
import androidx.ui.core.Text
-import androidx.ui.core.dp
-import androidx.ui.core.ipx
import androidx.ui.graphics.Color
import androidx.ui.layout.Column
import androidx.ui.layout.Container
@@ -29,6 +27,8 @@
import androidx.ui.layout.LayoutHeight
import androidx.ui.layout.Row
import androidx.ui.text.TextStyle
+import androidx.ui.unit.dp
+import androidx.ui.unit.ipx
@Sampled
@Composable
diff --git a/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/FlowSample.kt b/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/FlowSample.kt
index d7cfac0..09695db 100644
--- a/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/FlowSample.kt
+++ b/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/FlowSample.kt
@@ -18,10 +18,10 @@
import androidx.annotation.Sampled
import androidx.compose.Composable
-import androidx.ui.core.dp
import androidx.ui.graphics.Color
import androidx.ui.layout.FlowColumn
import androidx.ui.layout.FlowRow
+import androidx.ui.unit.dp
val sizes = listOf(
50.dp, 50.dp, 50.dp, 30.dp, 40.dp, 110.dp, 100.dp, 40.dp, 30.dp,
diff --git a/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/IntrinsicSample.kt b/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/IntrinsicSample.kt
index ad740f9b..ec52991 100644
--- a/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/IntrinsicSample.kt
+++ b/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/IntrinsicSample.kt
@@ -19,7 +19,6 @@
import androidx.annotation.Sampled
import androidx.compose.Composable
import androidx.ui.core.Text
-import androidx.ui.core.dp
import androidx.ui.foundation.shape.DrawShape
import androidx.ui.foundation.shape.RectangleShape
import androidx.ui.graphics.Color
@@ -35,6 +34,7 @@
import androidx.ui.layout.MinIntrinsicWidth
import androidx.ui.layout.Row
import androidx.ui.layout.Wrap
+import androidx.ui.unit.dp
/**
* Builds a layout containing three [Container] having the same width as the widest one.
diff --git a/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/LayoutPaddingSample.kt b/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/LayoutPaddingSample.kt
index 37210ce5..7e33a32 100644
--- a/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/LayoutPaddingSample.kt
+++ b/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/LayoutPaddingSample.kt
@@ -19,13 +19,13 @@
import androidx.annotation.Sampled
import androidx.compose.Composable
import androidx.ui.core.Alignment
-import androidx.ui.core.dp
import androidx.ui.graphics.Color
import androidx.ui.layout.Align
import androidx.ui.layout.Container
import androidx.ui.layout.EdgeInsets
import androidx.ui.layout.LayoutPadding
import androidx.ui.layout.Padding
+import androidx.ui.unit.dp
@Sampled
@Composable
diff --git a/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/LayoutSample.kt b/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/LayoutSample.kt
index b30d4ac..b0c6a29 100644
--- a/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/LayoutSample.kt
+++ b/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/LayoutSample.kt
@@ -17,16 +17,16 @@
package androidx.ui.layout.samples
import androidx.compose.Composable
-import androidx.ui.core.Dp
import androidx.ui.core.Layout
import androidx.ui.core.Modifier
import androidx.ui.core.VerticalAlignmentLine
-import androidx.ui.core.ipx
-import androidx.ui.core.max
-import androidx.ui.core.min
import androidx.ui.foundation.shape.DrawShape
import androidx.ui.foundation.shape.RectangleShape
import androidx.ui.graphics.Color
+import androidx.ui.unit.Dp
+import androidx.ui.unit.ipx
+import androidx.ui.unit.max
+import androidx.ui.unit.min
/**
* A rectangle layout that tries to size itself to specified width and height, subject to
diff --git a/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/SizeModifierSample.kt b/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/SizeModifierSample.kt
index 97b2453..18d0b56 100644
--- a/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/SizeModifierSample.kt
+++ b/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/SizeModifierSample.kt
@@ -19,18 +19,18 @@
import androidx.annotation.Sampled
import androidx.compose.Composable
import androidx.ui.core.Alignment
-import androidx.ui.core.dp
import androidx.ui.foundation.ColoredRect
import androidx.ui.foundation.shape.DrawShape
import androidx.ui.foundation.shape.RectangleShape
import androidx.ui.graphics.Color
import androidx.ui.layout.Align
-import androidx.ui.layout.LayoutAspectRatio
import androidx.ui.layout.Center
import androidx.ui.layout.Container
+import androidx.ui.layout.LayoutAspectRatio
import androidx.ui.layout.LayoutHeight
import androidx.ui.layout.LayoutSize
import androidx.ui.layout.LayoutWidth
+import androidx.ui.unit.dp
@Sampled
@Composable
diff --git a/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/SpacerSample.kt b/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/SpacerSample.kt
index 6a8ca70..ec217bc 100644
--- a/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/SpacerSample.kt
+++ b/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/SpacerSample.kt
@@ -18,11 +18,11 @@
import androidx.annotation.Sampled
import androidx.compose.Composable
-import androidx.ui.core.dp
import androidx.ui.graphics.Color
+import androidx.ui.layout.LayoutWidth
import androidx.ui.layout.Row
import androidx.ui.layout.Spacer
-import androidx.ui.layout.LayoutWidth
+import androidx.ui.unit.dp
@Sampled
@Composable
diff --git a/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/StackSample.kt b/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/StackSample.kt
index 67afd8d..812a860 100644
--- a/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/StackSample.kt
+++ b/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/StackSample.kt
@@ -18,12 +18,12 @@
import androidx.annotation.Sampled
import androidx.compose.Composable
-import androidx.ui.core.dp
import androidx.ui.graphics.Color
import androidx.ui.layout.LayoutGravity
import androidx.ui.layout.LayoutPadding
import androidx.ui.layout.LayoutSize
import androidx.ui.layout.Stack
+import androidx.ui.unit.dp
@Sampled
@Composable
diff --git a/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/TableSample.kt b/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/TableSample.kt
index 8ecdd34..9907ea0 100644
--- a/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/TableSample.kt
+++ b/ui/ui-layout/integration-tests/samples/src/main/java/androidx/ui/layout/samples/TableSample.kt
@@ -18,8 +18,6 @@
import androidx.annotation.Sampled
import androidx.compose.Composable
-import androidx.ui.core.Dp
-import androidx.ui.core.dp
import androidx.ui.foundation.shape.DrawShape
import androidx.ui.foundation.shape.corner.CircleShape
import androidx.ui.graphics.Color
@@ -27,6 +25,8 @@
import androidx.ui.layout.Padding
import androidx.ui.layout.Table
import androidx.ui.layout.TableColumnWidth
+import androidx.ui.unit.Dp
+import androidx.ui.unit.dp
@Sampled
@Composable
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 be70f48..40558f3e 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
@@ -16,28 +16,28 @@
package androidx.ui.layout.test
-import androidx.test.filters.SmallTest
import androidx.compose.Composable
+import androidx.test.filters.SmallTest
import androidx.ui.core.Alignment
import androidx.ui.core.Constraints
-import androidx.ui.core.IntPx
-import androidx.ui.core.IntPxPosition
-import androidx.ui.core.IntPxSize
import androidx.ui.core.Layout
-import androidx.ui.core.PxPosition
-import androidx.ui.core.PxSize
import androidx.ui.core.Ref
-import androidx.ui.core.dp
-import androidx.ui.core.ipx
-import androidx.ui.core.px
-import androidx.ui.core.withDensity
import androidx.ui.layout.Align
+import androidx.ui.layout.Container
import androidx.ui.layout.LayoutAlign
import androidx.ui.layout.LayoutAspectRatio
-import androidx.ui.layout.Container
import androidx.ui.layout.LayoutHeight
import androidx.ui.layout.LayoutSize
import androidx.ui.layout.LayoutWidth
+import androidx.ui.unit.IntPx
+import androidx.ui.unit.IntPxPosition
+import androidx.ui.unit.IntPxSize
+import androidx.ui.unit.PxPosition
+import androidx.ui.unit.PxSize
+import androidx.ui.unit.dp
+import androidx.ui.unit.ipx
+import androidx.ui.unit.px
+import androidx.ui.unit.withDensity
import org.junit.Assert.assertEquals
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/AlignmentLineTest.kt b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/AlignmentLineTest.kt
index 13b60d17..9fb2e20 100644
--- a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/AlignmentLineTest.kt
+++ b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/AlignmentLineTest.kt
@@ -20,21 +20,21 @@
import androidx.ui.core.Constraints
import androidx.ui.core.HorizontalAlignmentLine
import androidx.ui.core.Layout
-import androidx.ui.core.PxPosition
-import androidx.ui.core.PxSize
import androidx.ui.core.Ref
import androidx.ui.core.VerticalAlignmentLine
import androidx.ui.core.WithConstraints
-import androidx.ui.core.dp
-import androidx.ui.core.ipx
-import androidx.ui.core.min
-import androidx.ui.core.px
-import androidx.ui.core.toPx
-import androidx.ui.core.withDensity
+import androidx.ui.unit.dp
+import androidx.ui.unit.ipx
+import androidx.ui.unit.min
+import androidx.ui.unit.px
+import androidx.ui.unit.toPx
+import androidx.ui.unit.withDensity
import androidx.ui.layout.AlignmentLineOffset
import androidx.ui.layout.CenterAlignmentLine
import androidx.ui.layout.DpConstraints
import androidx.ui.layout.Wrap
+import androidx.ui.unit.PxPosition
+import androidx.ui.unit.PxSize
import org.junit.Assert
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/AspectRatioModifierTest.kt b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/AspectRatioModifierTest.kt
index ef08953..9472e05 100644
--- a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/AspectRatioModifierTest.kt
+++ b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/AspectRatioModifierTest.kt
@@ -19,21 +19,20 @@
import androidx.compose.Composable
import androidx.test.filters.SmallTest
import androidx.ui.core.Constraints
-import androidx.ui.core.IntPx
import androidx.ui.core.Layout
-import androidx.ui.core.PxPosition
-import androidx.ui.core.PxSize
import androidx.ui.core.Ref
-import androidx.ui.core.dp
-import androidx.ui.core.ipx
-import androidx.ui.core.px
-import androidx.ui.core.withDensity
import androidx.ui.layout.Container
import androidx.ui.layout.LayoutAspectRatio
+import androidx.ui.unit.IntPx
+import androidx.ui.unit.PxPosition
+import androidx.ui.unit.PxSize
+import androidx.ui.unit.dp
+import androidx.ui.unit.ipx
+import androidx.ui.unit.px
+import androidx.ui.unit.withDensity
import org.junit.Test
import org.junit.runner.RunWith
import org.junit.runners.JUnit4
-import java.lang.IllegalArgumentException
import java.util.concurrent.CountDownLatch
import java.util.concurrent.TimeUnit
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 14f820f..03cffcdc 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
@@ -21,23 +21,23 @@
import androidx.compose.Composable
import androidx.test.filters.SmallTest
-import androidx.ui.core.Layout
-import androidx.ui.core.OnChildPositioned
-import androidx.ui.core.PxPosition
-import androidx.ui.core.PxSize
-import androidx.ui.core.Ref
-import androidx.ui.core.dp
-import androidx.ui.core.ipx
-import androidx.ui.core.px
-import androidx.ui.core.withDensity
-import androidx.ui.layout.Align
-import androidx.ui.layout.Container
import androidx.ui.core.Alignment
import androidx.ui.core.Constraints
-import androidx.ui.core.IntPx
-import androidx.ui.core.toPx
+import androidx.ui.core.Layout
+import androidx.ui.core.OnChildPositioned
+import androidx.ui.core.Ref
+import androidx.ui.layout.Align
import androidx.ui.layout.AspectRatio
+import androidx.ui.layout.Container
import androidx.ui.layout.DpConstraints
+import androidx.ui.unit.IntPx
+import androidx.ui.unit.PxPosition
+import androidx.ui.unit.PxSize
+import androidx.ui.unit.dp
+import androidx.ui.unit.ipx
+import androidx.ui.unit.px
+import androidx.ui.unit.toPx
+import androidx.ui.unit.withDensity
import org.junit.Assert.assertEquals
import org.junit.Assert.assertNotNull
import org.junit.Assert.assertTrue
diff --git a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/ContainerTest.kt b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/ContainerTest.kt
index d8b5a30..531d7d2 100644
--- a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/ContainerTest.kt
+++ b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/ContainerTest.kt
@@ -16,34 +16,33 @@
package androidx.ui.layout.test
+import androidx.compose.Composable
+import androidx.compose.Model
import androidx.test.filters.SmallTest
-import androidx.ui.core.Dp
+import androidx.ui.core.Alignment
import androidx.ui.core.Layout
import androidx.ui.core.LayoutCoordinates
import androidx.ui.core.OnChildPositioned
import androidx.ui.core.OnPositioned
-import androidx.ui.core.PxPosition
-import androidx.ui.core.PxSize
import androidx.ui.core.Ref
-import androidx.ui.core.coerceIn
-import androidx.ui.core.dp
-import androidx.ui.core.px
-import androidx.ui.core.round
-import androidx.ui.core.toPx
-import androidx.ui.core.withDensity
import androidx.ui.layout.Align
import androidx.ui.layout.Container
import androidx.ui.layout.DpConstraints
import androidx.ui.layout.EdgeInsets
import androidx.ui.layout.LayoutSize
-import androidx.ui.layout.Spacer
import androidx.ui.layout.Row
+import androidx.ui.layout.Spacer
import androidx.ui.layout.Wrap
-import androidx.compose.Composable
-import androidx.compose.Model
-import androidx.ui.core.Alignment
-import androidx.ui.core.IntPx
-import androidx.ui.core.ipx
+import androidx.ui.unit.Dp
+import androidx.ui.unit.IntPx
+import androidx.ui.unit.PxPosition
+import androidx.ui.unit.PxSize
+import androidx.ui.unit.dp
+import androidx.ui.unit.ipx
+import androidx.ui.unit.px
+import androidx.ui.unit.round
+import androidx.ui.unit.toPx
+import androidx.ui.unit.withDensity
import org.junit.Assert.assertEquals
import org.junit.Assert.assertTrue
import org.junit.Test
diff --git a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/ExpandedModifierTest.kt b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/ExpandedModifierTest.kt
index 74aea49..d2bdbc4 100644
--- a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/ExpandedModifierTest.kt
+++ b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/ExpandedModifierTest.kt
@@ -20,24 +20,24 @@
import androidx.compose.Composable
import androidx.test.filters.SmallTest
import androidx.ui.core.Alignment
-import androidx.ui.core.IntPx
import androidx.ui.core.Layout
import androidx.ui.core.Modifier
-import androidx.ui.core.PxPosition
-import androidx.ui.core.PxSize
import androidx.ui.core.Ref
-import androidx.ui.core.dp
-import androidx.ui.core.ipx
-import androidx.ui.core.min
-import androidx.ui.core.toRect
-import androidx.ui.core.withDensity
-import androidx.ui.engine.geometry.Rect
+import androidx.ui.geometry.Rect
import androidx.ui.layout.Align
-import androidx.ui.layout.LayoutAspectRatio
import androidx.ui.layout.Container
+import androidx.ui.layout.LayoutAspectRatio
import androidx.ui.layout.LayoutHeight
import androidx.ui.layout.LayoutSize
import androidx.ui.layout.LayoutWidth
+import androidx.ui.unit.IntPx
+import androidx.ui.unit.PxPosition
+import androidx.ui.unit.PxSize
+import androidx.ui.unit.dp
+import androidx.ui.unit.ipx
+import androidx.ui.unit.min
+import androidx.ui.unit.toRect
+import androidx.ui.unit.withDensity
import org.junit.Assert
import org.junit.Test
import org.junit.runner.RunWith
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 6967b59..cddeba8 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
@@ -16,47 +16,47 @@
package androidx.ui.layout.test
-import androidx.test.filters.SmallTest
-import androidx.ui.core.IntPx
-import androidx.ui.core.LayoutCoordinates
-import androidx.ui.core.PxPosition
-import androidx.ui.core.PxSize
-import androidx.ui.core.Ref
-import androidx.ui.core.dp
-import androidx.ui.core.ipx
-import androidx.ui.core.px
-import androidx.ui.core.round
-import androidx.ui.core.toPx
-import androidx.ui.core.withDensity
-import androidx.ui.layout.DpConstraints
import androidx.compose.Composable
+import androidx.test.filters.SmallTest
import androidx.ui.core.Alignment
import androidx.ui.core.Constraints
-import androidx.ui.core.Dp
import androidx.ui.core.FirstBaseline
import androidx.ui.core.HorizontalAlignmentLine
import androidx.ui.core.Layout
+import androidx.ui.core.LayoutCoordinates
import androidx.ui.core.Modifier
import androidx.ui.core.OnChildPositioned
import androidx.ui.core.OnPositioned
+import androidx.ui.core.Ref
import androidx.ui.core.VerticalAlignmentLine
import androidx.ui.core.WithConstraints
import androidx.ui.core.globalPosition
-import androidx.ui.core.max
-import androidx.ui.core.min
import androidx.ui.layout.Align
import androidx.ui.layout.Arrangement
-import androidx.ui.layout.LayoutAspectRatio
import androidx.ui.layout.Center
import androidx.ui.layout.Column
import androidx.ui.layout.Container
+import androidx.ui.layout.DpConstraints
+import androidx.ui.layout.LayoutAspectRatio
import androidx.ui.layout.LayoutGravity
import androidx.ui.layout.LayoutHeight
-import androidx.ui.layout.Row
import androidx.ui.layout.LayoutSize
import androidx.ui.layout.LayoutWidth
+import androidx.ui.layout.Row
import androidx.ui.layout.Spacer
import androidx.ui.layout.Wrap
+import androidx.ui.unit.Dp
+import androidx.ui.unit.IntPx
+import androidx.ui.unit.PxPosition
+import androidx.ui.unit.PxSize
+import androidx.ui.unit.dp
+import androidx.ui.unit.ipx
+import androidx.ui.unit.max
+import androidx.ui.unit.min
+import androidx.ui.unit.px
+import androidx.ui.unit.round
+import androidx.ui.unit.toPx
+import androidx.ui.unit.withDensity
import org.junit.Assert
import org.junit.Assert.assertNotNull
import org.junit.Assert.assertTrue
diff --git a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/FlowTest.kt b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/FlowTest.kt
index 0948b75..d10aba4 100644
--- a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/FlowTest.kt
+++ b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/FlowTest.kt
@@ -18,13 +18,8 @@
import androidx.test.filters.SmallTest
import androidx.ui.core.Alignment
-import androidx.ui.core.IntPx
import androidx.ui.core.OnChildPositioned
-import androidx.ui.core.PxPosition
-import androidx.ui.core.PxSize
import androidx.ui.core.Ref
-import androidx.ui.core.ipx
-import androidx.ui.core.withDensity
import androidx.ui.layout.Align
import androidx.ui.layout.Container
import androidx.ui.layout.DpConstraints
@@ -33,6 +28,11 @@
import androidx.ui.layout.FlowMainAxisAlignment
import androidx.ui.layout.FlowRow
import androidx.ui.layout.SizeMode
+import androidx.ui.unit.IntPx
+import androidx.ui.unit.PxPosition
+import androidx.ui.unit.PxSize
+import androidx.ui.unit.ipx
+import androidx.ui.unit.withDensity
import org.junit.Assert.assertTrue
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/IntrinsicTest.kt b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/IntrinsicTest.kt
index 3a2130c..dd014a6 100644
--- a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/IntrinsicTest.kt
+++ b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/IntrinsicTest.kt
@@ -19,23 +19,22 @@
import androidx.compose.Composable
import androidx.test.filters.SmallTest
import androidx.ui.core.Alignment
-import androidx.ui.core.Dp
import androidx.ui.core.Layout
import androidx.ui.core.OnChildPositioned
-import androidx.ui.core.PxPosition
-import androidx.ui.core.PxSize
import androidx.ui.core.Ref
-import androidx.ui.core.coerceIn
-import androidx.ui.core.dp
-import androidx.ui.core.ipx
-import androidx.ui.core.px
-import androidx.ui.core.withDensity
import androidx.ui.layout.Align
import androidx.ui.layout.DpConstraints
import androidx.ui.layout.MaxIntrinsicHeight
import androidx.ui.layout.MaxIntrinsicWidth
import androidx.ui.layout.MinIntrinsicHeight
import androidx.ui.layout.MinIntrinsicWidth
+import androidx.ui.unit.Dp
+import androidx.ui.unit.PxPosition
+import androidx.ui.unit.PxSize
+import androidx.ui.unit.dp
+import androidx.ui.unit.ipx
+import androidx.ui.unit.px
+import androidx.ui.unit.withDensity
import org.junit.Test
import org.junit.runner.RunWith
import org.junit.runners.JUnit4
diff --git a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/LayoutPaddingTest.kt b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/LayoutPaddingTest.kt
index 3b48a15..4fed663 100644
--- a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/LayoutPaddingTest.kt
+++ b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/LayoutPaddingTest.kt
@@ -16,26 +16,26 @@
package androidx.ui.layout.test
+import androidx.compose.Composable
import androidx.test.filters.SmallTest
-import androidx.ui.core.Dp
-import androidx.ui.core.IntPx
+import androidx.ui.core.Layout
+import androidx.ui.core.Modifier
import androidx.ui.core.OnPositioned
-import androidx.ui.core.PxPosition
-import androidx.ui.core.PxSize
-import androidx.ui.core.dp
-import androidx.ui.core.ipx
-import androidx.ui.core.px
-import androidx.ui.core.toPx
-import androidx.ui.core.withDensity
import androidx.ui.layout.Center
import androidx.ui.layout.Container
import androidx.ui.layout.DpConstraints
-import androidx.compose.Composable
-import androidx.ui.core.Layout
-import androidx.ui.core.Modifier
-import androidx.ui.core.min
import androidx.ui.layout.LayoutAspectRatio
import androidx.ui.layout.LayoutPadding
+import androidx.ui.unit.Dp
+import androidx.ui.unit.IntPx
+import androidx.ui.unit.PxPosition
+import androidx.ui.unit.PxSize
+import androidx.ui.unit.dp
+import androidx.ui.unit.ipx
+import androidx.ui.unit.min
+import androidx.ui.unit.px
+import androidx.ui.unit.toPx
+import androidx.ui.unit.withDensity
import org.junit.Assert
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/LayoutTest.kt b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/LayoutTest.kt
index ab964ac..140e8fe 100644
--- a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/LayoutTest.kt
+++ b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/LayoutTest.kt
@@ -21,28 +21,27 @@
import android.view.View
import android.view.ViewGroup
import android.view.ViewTreeObserver
-import androidx.test.rule.ActivityTestRule
-import androidx.ui.core.AndroidComposeView
-import androidx.ui.core.Density
-import androidx.ui.core.OnPositioned
-import androidx.ui.core.PxPosition
-import androidx.ui.core.PxSize
-import androidx.ui.core.Ref
-import androidx.ui.core.px
import androidx.compose.Composable
+import androidx.test.rule.ActivityTestRule
import androidx.ui.core.AlignmentLine
+import androidx.ui.core.AndroidComposeView
import androidx.ui.core.Constraints
-import androidx.ui.core.IntPx
import androidx.ui.core.Layout
import androidx.ui.core.Modifier
-import androidx.ui.core.coerceIn
+import androidx.ui.core.OnPositioned
+import androidx.ui.core.Ref
import androidx.ui.core.enforce
-import androidx.ui.core.ipx
-import androidx.ui.core.round
import androidx.ui.core.setContent
-import androidx.ui.core.toPx
import androidx.ui.layout.Constraints
import androidx.ui.layout.DpConstraints
+import androidx.ui.unit.Density
+import androidx.ui.unit.IntPx
+import androidx.ui.unit.PxPosition
+import androidx.ui.unit.PxSize
+import androidx.ui.unit.ipx
+import androidx.ui.unit.px
+import androidx.ui.unit.round
+import androidx.ui.unit.toPx
import org.junit.Assert.assertEquals
import org.junit.Assert.assertNotNull
import org.junit.Assert.assertTrue
diff --git a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/OnPositionedTest.kt b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/OnPositionedTest.kt
index 7b3aeba..80510fb 100644
--- a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/OnPositionedTest.kt
+++ b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/OnPositionedTest.kt
@@ -25,21 +25,21 @@
import androidx.ui.core.LayoutCoordinates
import androidx.ui.core.OnChildPositioned
import androidx.ui.core.OnPositioned
-import androidx.ui.core.Px
-import androidx.ui.core.PxPosition
import androidx.ui.core.VerticalAlignmentLine
-import androidx.ui.core.dp
-import androidx.ui.core.ipx
-import androidx.ui.core.min
import androidx.ui.core.positionInRoot
-import androidx.ui.core.px
import androidx.ui.core.setContent
-import androidx.ui.core.withDensity
import androidx.ui.layout.Align
import androidx.ui.layout.Center
import androidx.ui.layout.Container
import androidx.ui.layout.Padding
import androidx.ui.layout.Row
+import androidx.ui.unit.Px
+import androidx.ui.unit.PxPosition
+import androidx.ui.unit.dp
+import androidx.ui.unit.ipx
+import androidx.ui.unit.min
+import androidx.ui.unit.px
+import androidx.ui.unit.withDensity
import com.google.common.truth.Truth.assertThat
import org.junit.Assert
import org.junit.Assert.assertTrue
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 ed08e0e..840fff8 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
@@ -16,24 +16,24 @@
package androidx.ui.layout.test
+import androidx.compose.Composable
import androidx.test.filters.SmallTest
-import androidx.ui.core.Dp
-import androidx.ui.core.IntPx
import androidx.ui.core.OnPositioned
-import androidx.ui.core.PxPosition
-import androidx.ui.core.PxSize
-import androidx.ui.core.dp
-import androidx.ui.core.ipx
-import androidx.ui.core.px
-import androidx.ui.core.toPx
-import androidx.ui.core.withDensity
import androidx.ui.layout.Center
import androidx.ui.layout.Container
import androidx.ui.layout.DpConstraints
import androidx.ui.layout.EdgeInsets
-import androidx.ui.layout.Padding
-import androidx.compose.Composable
import androidx.ui.layout.LayoutAspectRatio
+import androidx.ui.layout.Padding
+import androidx.ui.unit.Dp
+import androidx.ui.unit.IntPx
+import androidx.ui.unit.PxPosition
+import androidx.ui.unit.PxSize
+import androidx.ui.unit.dp
+import androidx.ui.unit.ipx
+import androidx.ui.unit.px
+import androidx.ui.unit.toPx
+import androidx.ui.unit.withDensity
import org.junit.Test
import org.junit.runner.RunWith
import org.junit.runners.JUnit4
diff --git a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/SizeModifiersTest.kt b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/SizeModifiersTest.kt
index 2e4951e..94106ad 100644
--- a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/SizeModifiersTest.kt
+++ b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/SizeModifiersTest.kt
@@ -19,15 +19,8 @@
import androidx.compose.Composable
import androidx.test.filters.SmallTest
import androidx.ui.core.Alignment
-import androidx.ui.core.Dp
-import androidx.ui.core.IntPx
import androidx.ui.core.OnChildPositioned
-import androidx.ui.core.PxPosition
-import androidx.ui.core.PxSize
import androidx.ui.core.Ref
-import androidx.ui.core.dp
-import androidx.ui.core.ipx
-import androidx.ui.core.withDensity
import androidx.ui.layout.Align
import androidx.ui.layout.Column
import androidx.ui.layout.Container
@@ -36,6 +29,13 @@
import androidx.ui.layout.LayoutSize
import androidx.ui.layout.LayoutWidth
import androidx.ui.layout.Row
+import androidx.ui.unit.Dp
+import androidx.ui.unit.IntPx
+import androidx.ui.unit.PxPosition
+import androidx.ui.unit.PxSize
+import androidx.ui.unit.dp
+import androidx.ui.unit.ipx
+import androidx.ui.unit.withDensity
import org.junit.Test
import org.junit.runner.RunWith
import org.junit.runners.JUnit4
diff --git a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/SpacerTest.kt b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/SpacerTest.kt
index 31f942b..558e8cf 100644
--- a/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/SpacerTest.kt
+++ b/ui/ui-layout/src/androidTest/java/androidx/ui/layout/test/SpacerTest.kt
@@ -18,18 +18,18 @@
import androidx.test.filters.MediumTest
import androidx.ui.core.OnChildPositioned
-import androidx.ui.core.PxSize
-import androidx.ui.core.dp
-import androidx.ui.core.ipx
-import androidx.ui.core.round
-import androidx.ui.core.withDensity
import androidx.ui.layout.Center
import androidx.ui.layout.Container
import androidx.ui.layout.DpConstraints
import androidx.ui.layout.LayoutHeight
-import androidx.ui.layout.Spacer
import androidx.ui.layout.LayoutSize
import androidx.ui.layout.LayoutWidth
+import androidx.ui.layout.Spacer
+import androidx.ui.unit.PxSize
+import androidx.ui.unit.dp
+import androidx.ui.unit.ipx
+import androidx.ui.unit.round
+import androidx.ui.unit.withDensity
import com.google.common.truth.Truth
import org.junit.Test
import org.junit.runner.RunWith
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 e71fba4..866c7fa 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
@@ -19,15 +19,8 @@
import androidx.compose.Composable
import androidx.test.filters.SmallTest
import androidx.ui.core.Alignment
-import androidx.ui.core.IntPx
import androidx.ui.core.OnChildPositioned
-import androidx.ui.core.PxPosition
-import androidx.ui.core.PxSize
import androidx.ui.core.Ref
-import androidx.ui.core.dp
-import androidx.ui.core.ipx
-import androidx.ui.core.px
-import androidx.ui.core.withDensity
import androidx.ui.layout.Align
import androidx.ui.layout.Container
import androidx.ui.layout.DpConstraints
@@ -36,6 +29,13 @@
import androidx.ui.layout.LayoutPadding
import androidx.ui.layout.LayoutSize
import androidx.ui.layout.Stack
+import androidx.ui.unit.IntPx
+import androidx.ui.unit.PxPosition
+import androidx.ui.unit.PxSize
+import androidx.ui.unit.dp
+import androidx.ui.unit.ipx
+import androidx.ui.unit.px
+import androidx.ui.unit.withDensity
import org.junit.Test
import org.junit.runner.RunWith
import org.junit.runners.JUnit4
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 fb75304..7b58d35 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
@@ -19,24 +19,23 @@
import androidx.compose.Composable
import androidx.test.filters.SmallTest
import androidx.ui.core.Alignment
-import androidx.ui.core.Density
-import androidx.ui.core.IntPx
import androidx.ui.core.OnChildPositioned
-import androidx.ui.core.PxPosition
-import androidx.ui.core.PxSize
import androidx.ui.core.Ref
-import androidx.ui.core.coerceAtLeast
-import androidx.ui.core.ipx
-import androidx.ui.core.max
-import androidx.ui.core.min
-import androidx.ui.core.withDensity
import androidx.ui.layout.Align
-import androidx.ui.layout.LayoutAspectRatio
import androidx.ui.layout.Container
import androidx.ui.layout.DpConstraints
+import androidx.ui.layout.LayoutAspectRatio
import androidx.ui.layout.Table
import androidx.ui.layout.TableColumnWidth
import androidx.ui.layout.TableMeasurable
+import androidx.ui.unit.Density
+import androidx.ui.unit.IntPx
+import androidx.ui.unit.PxPosition
+import androidx.ui.unit.PxSize
+import androidx.ui.unit.ipx
+import androidx.ui.unit.max
+import androidx.ui.unit.min
+import androidx.ui.unit.withDensity
import org.junit.Test
import org.junit.runner.RunWith
import org.junit.runners.JUnit4
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 a718ed0..baf3c92 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
@@ -16,29 +16,29 @@
package androidx.ui.layout.test
+import androidx.compose.Composable
import androidx.test.filters.SmallTest
+import androidx.ui.core.Alignment
+import androidx.ui.core.Constraints
+import androidx.ui.core.Layout
import androidx.ui.core.OnChildPositioned
-import androidx.ui.core.PxPosition
-import androidx.ui.core.PxSize
+import androidx.ui.core.OnPositioned
import androidx.ui.core.Ref
-import androidx.ui.core.dp
-import androidx.ui.core.px
-import androidx.ui.core.withDensity
+import androidx.ui.core.enforce
import androidx.ui.layout.Align
import androidx.ui.layout.Container
import androidx.ui.layout.DpConstraints
-import androidx.ui.layout.Wrap
-import androidx.compose.Composable
-import androidx.ui.core.Alignment
-import androidx.ui.core.Constraints
-import androidx.ui.core.IntPx
-import androidx.ui.core.Layout
-import androidx.ui.core.OnPositioned
-import androidx.ui.core.enforce
import androidx.ui.layout.LayoutAlign
import androidx.ui.layout.LayoutAspectRatio
import androidx.ui.layout.LayoutSize
import androidx.ui.layout.LayoutWrapped
+import androidx.ui.layout.Wrap
+import androidx.ui.unit.IntPx
+import androidx.ui.unit.PxPosition
+import androidx.ui.unit.PxSize
+import androidx.ui.unit.dp
+import androidx.ui.unit.px
+import androidx.ui.unit.withDensity
import org.junit.Test
import org.junit.runner.RunWith
import org.junit.runners.JUnit4
diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/Align.kt b/ui/ui-layout/src/main/java/androidx/ui/layout/Align.kt
index 8beb58b..63ee82d 100644
--- a/ui/ui-layout/src/main/java/androidx/ui/layout/Align.kt
+++ b/ui/ui-layout/src/main/java/androidx/ui/layout/Align.kt
@@ -16,17 +16,17 @@
package androidx.ui.layout
-import androidx.ui.core.IntPxSize
-import androidx.ui.core.Layout
-import androidx.ui.core.isFinite
-import androidx.ui.core.looseMin
import androidx.compose.Composable
import androidx.ui.core.Alignment
import androidx.ui.core.Constraints
-import androidx.ui.core.DensityScope
-import androidx.ui.core.IntPxPosition
+import androidx.ui.core.Layout
import androidx.ui.core.LayoutModifier
-import androidx.ui.core.ipx
+import androidx.ui.core.looseMin
+import androidx.ui.unit.DensityScope
+import androidx.ui.unit.IntPxPosition
+import androidx.ui.unit.IntPxSize
+import androidx.ui.unit.ipx
+import androidx.ui.unit.isFinite
/**
* A layout that takes a child and aligns it within itself, according to the alignment parameter.
diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/AlignmentLine.kt b/ui/ui-layout/src/main/java/androidx/ui/layout/AlignmentLine.kt
index 4811a65..f371d2e 100644
--- a/ui/ui-layout/src/main/java/androidx/ui/layout/AlignmentLine.kt
+++ b/ui/ui-layout/src/main/java/androidx/ui/layout/AlignmentLine.kt
@@ -19,14 +19,13 @@
import androidx.compose.Composable
import androidx.ui.core.Alignment
import androidx.ui.core.AlignmentLine
-import androidx.ui.core.Dp
-import androidx.ui.core.IntPxSize
import androidx.ui.core.Layout
-import androidx.ui.core.coerceIn
-import androidx.ui.core.dp
-import androidx.ui.core.ipx
-import androidx.ui.core.isFinite
-import androidx.ui.core.max
+import androidx.ui.unit.Dp
+import androidx.ui.unit.IntPxSize
+import androidx.ui.unit.dp
+import androidx.ui.unit.ipx
+import androidx.ui.unit.isFinite
+import androidx.ui.unit.max
/**
* Layout composable that takes a child and tries to position it within itself according to
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 d39f868..247117c 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
@@ -19,15 +19,15 @@
import androidx.annotation.FloatRange
import androidx.compose.Composable
import androidx.ui.core.Constraints
-import androidx.ui.core.DensityScope
-import androidx.ui.core.IntPx
-import androidx.ui.core.IntPxSize
import androidx.ui.core.Layout
import androidx.ui.core.LayoutModifier
import androidx.ui.core.Measurable
-import androidx.ui.core.ipx
-import androidx.ui.core.isFinite
import androidx.ui.core.satisfiedBy
+import androidx.ui.unit.DensityScope
+import androidx.ui.unit.IntPx
+import androidx.ui.unit.IntPxSize
+import androidx.ui.unit.ipx
+import androidx.ui.unit.isFinite
/**
* A layout modifier that attempts to size a layout to match a specified aspect ratio. The layout
diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/ConstraintLayout.kt b/ui/ui-layout/src/main/java/androidx/ui/layout/ConstraintLayout.kt
index 29cdffa..5f790f2 100644
--- a/ui/ui-layout/src/main/java/androidx/ui/layout/ConstraintLayout.kt
+++ b/ui/ui-layout/src/main/java/androidx/ui/layout/ConstraintLayout.kt
@@ -30,22 +30,22 @@
import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure
import androidx.ui.core.AlignmentLine
import androidx.ui.core.Constraints
-import androidx.ui.core.DensityScope
-import androidx.ui.core.Dp
import androidx.ui.core.FirstBaseline
-import androidx.ui.core.IntPx
-import androidx.ui.core.IntPxSize
import androidx.ui.core.Layout
import androidx.ui.core.LayoutModifier
import androidx.ui.core.Measurable
import androidx.ui.core.ParentDataModifier
import androidx.ui.core.Placeable
import androidx.ui.core.Placeable.PlacementScope.place
-import androidx.ui.core.dp
import androidx.ui.core.hasBoundedHeight
import androidx.ui.core.hasBoundedWidth
-import androidx.ui.core.ipx
import androidx.ui.core.tag
+import androidx.ui.unit.DensityScope
+import androidx.ui.unit.Dp
+import androidx.ui.unit.IntPx
+import androidx.ui.unit.IntPxSize
+import androidx.ui.unit.dp
+import androidx.ui.unit.ipx
/**
* Layout that positions its children according to the constraints between them.
diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/Container.kt b/ui/ui-layout/src/main/java/androidx/ui/layout/Container.kt
index eb3700a..6eec551 100644
--- a/ui/ui-layout/src/main/java/androidx/ui/layout/Container.kt
+++ b/ui/ui-layout/src/main/java/androidx/ui/layout/Container.kt
@@ -16,24 +16,24 @@
package androidx.ui.layout
+import androidx.compose.Composable
import androidx.ui.core.Alignment
import androidx.ui.core.Constraints
-import androidx.ui.core.Dp
-import androidx.ui.core.IntPxSize
import androidx.ui.core.Layout
+import androidx.ui.core.Modifier
import androidx.ui.core.Placeable
-import androidx.ui.core.dp
import androidx.ui.core.enforce
import androidx.ui.core.hasTightHeight
import androidx.ui.core.hasTightWidth
-import androidx.ui.core.ipx
-import androidx.ui.core.isFinite
import androidx.ui.core.looseMin
-import androidx.ui.core.max
import androidx.ui.core.offset
import androidx.ui.core.withTight
-import androidx.compose.Composable
-import androidx.ui.core.Modifier
+import androidx.ui.unit.Dp
+import androidx.ui.unit.IntPxSize
+import androidx.ui.unit.dp
+import androidx.ui.unit.ipx
+import androidx.ui.unit.isFinite
+import androidx.ui.unit.max
/**
* A convenience composable that combines common layout composables for one child:
diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/DpConstraints.kt b/ui/ui-layout/src/main/java/androidx/ui/layout/DpConstraints.kt
index c1f33aa2..16787c6 100644
--- a/ui/ui-layout/src/main/java/androidx/ui/layout/DpConstraints.kt
+++ b/ui/ui-layout/src/main/java/androidx/ui/layout/DpConstraints.kt
@@ -18,12 +18,12 @@
import androidx.compose.Immutable
import androidx.ui.core.Constraints
-import androidx.ui.core.DensityScope
-import androidx.ui.core.Dp
-import androidx.ui.core.coerceAtLeast
-import androidx.ui.core.coerceIn
-import androidx.ui.core.dp
-import androidx.ui.core.isFinite
+import androidx.ui.unit.DensityScope
+import androidx.ui.unit.Dp
+import androidx.ui.unit.coerceAtLeast
+import androidx.ui.unit.coerceIn
+import androidx.ui.unit.dp
+import androidx.ui.unit.isFinite
/**
* Similar to [Constraints], but with constraint values expressed in [Dp].
diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/Flex.kt b/ui/ui-layout/src/main/java/androidx/ui/layout/Flex.kt
index 81a34bd..76e5fae 100644
--- a/ui/ui-layout/src/main/java/androidx/ui/layout/Flex.kt
+++ b/ui/ui-layout/src/main/java/androidx/ui/layout/Flex.kt
@@ -22,24 +22,24 @@
import androidx.ui.core.Alignment
import androidx.ui.core.AlignmentLine
import androidx.ui.core.Constraints
-import androidx.ui.core.DensityScope
import androidx.ui.core.HorizontalAlignmentLine
-import androidx.ui.core.IntPx
-import androidx.ui.core.IntPxSize
-import androidx.ui.core.Placeable
-import androidx.ui.core.ipx
-import androidx.ui.core.max
import androidx.ui.core.IntrinsicMeasurable
import androidx.ui.core.IntrinsicMeasureBlock
import androidx.ui.core.Layout
import androidx.ui.core.Modifier
import androidx.ui.core.ParentData
import androidx.ui.core.ParentDataModifier
+import androidx.ui.core.Placeable
import androidx.ui.core.VerticalAlignmentLine
-import androidx.ui.core.isFinite
-import androidx.ui.core.px
-import androidx.ui.core.round
-import androidx.ui.core.toPx
+import androidx.ui.unit.DensityScope
+import androidx.ui.unit.IntPx
+import androidx.ui.unit.IntPxSize
+import androidx.ui.unit.ipx
+import androidx.ui.unit.isFinite
+import androidx.ui.unit.max
+import androidx.ui.unit.px
+import androidx.ui.unit.round
+import androidx.ui.unit.toPx
/**
* Collects information about the children of a [FlexColumn] or [FlexColumn]
diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/Flow.kt b/ui/ui-layout/src/main/java/androidx/ui/layout/Flow.kt
index fcfe41d..220f9fa 100644
--- a/ui/ui-layout/src/main/java/androidx/ui/layout/Flow.kt
+++ b/ui/ui-layout/src/main/java/androidx/ui/layout/Flow.kt
@@ -19,14 +19,14 @@
import androidx.compose.Composable
import androidx.ui.core.Alignment
import androidx.ui.core.Constraints
-import androidx.ui.core.Dp
-import androidx.ui.core.IntPx
-import androidx.ui.core.IntPxSize
import androidx.ui.core.Layout
import androidx.ui.core.Placeable
-import androidx.ui.core.dp
-import androidx.ui.core.isFinite
-import androidx.ui.core.max
+import androidx.ui.unit.Dp
+import androidx.ui.unit.IntPx
+import androidx.ui.unit.IntPxSize
+import androidx.ui.unit.dp
+import androidx.ui.unit.isFinite
+import androidx.ui.unit.max
/**
* A composable that places its children in a horizontal flow. Unlike [Row], if the
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 f062534..de48dc3 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
@@ -20,7 +20,7 @@
import androidx.ui.core.Constraints
import androidx.ui.core.Layout
import androidx.ui.core.enforce
-import androidx.ui.core.ipx
+import androidx.ui.unit.ipx
/**
* Layout composable that forces its child to be as wide as its min intrinsic width.
diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/Padding.kt b/ui/ui-layout/src/main/java/androidx/ui/layout/Padding.kt
index 6bf7452..b97ea47 100644
--- a/ui/ui-layout/src/main/java/androidx/ui/layout/Padding.kt
+++ b/ui/ui-layout/src/main/java/androidx/ui/layout/Padding.kt
@@ -16,19 +16,18 @@
package androidx.ui.layout
-import androidx.ui.core.Dp
-import androidx.ui.core.dp
-import androidx.ui.core.min
-import androidx.ui.core.offset
import androidx.compose.Composable
import androidx.compose.Immutable
import androidx.ui.core.Constraints
-import androidx.ui.core.DensityScope
-import androidx.ui.core.IntPxPosition
-import androidx.ui.core.IntPxSize
import androidx.ui.core.Layout
import androidx.ui.core.LayoutModifier
-import androidx.ui.core.coerceIn
+import androidx.ui.core.offset
+import androidx.ui.unit.DensityScope
+import androidx.ui.unit.Dp
+import androidx.ui.unit.IntPxPosition
+import androidx.ui.unit.IntPxSize
+import androidx.ui.unit.dp
+import androidx.ui.unit.min
/**
* Layout modifier that applies whitespace spacing on specified sides of the target layout.
diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/SizeModifiers.kt b/ui/ui-layout/src/main/java/androidx/ui/layout/SizeModifiers.kt
index e03e497..3179784 100644
--- a/ui/ui-layout/src/main/java/androidx/ui/layout/SizeModifiers.kt
+++ b/ui/ui-layout/src/main/java/androidx/ui/layout/SizeModifiers.kt
@@ -18,17 +18,16 @@
import androidx.compose.Stable
import androidx.ui.core.Constraints
-import androidx.ui.core.DensityScope
-import androidx.ui.core.Dp
-import androidx.ui.core.IntPx
import androidx.ui.core.LayoutModifier
import androidx.ui.core.Measurable
-import androidx.ui.core.coerceIn
import androidx.ui.core.enforce
import androidx.ui.core.hasBoundedHeight
import androidx.ui.core.hasBoundedWidth
-import androidx.ui.core.isFinite
import androidx.ui.core.withTight
+import androidx.ui.unit.DensityScope
+import androidx.ui.unit.Dp
+import androidx.ui.unit.IntPx
+import androidx.ui.unit.isFinite
private data class SizeModifier(private val modifierConstraints: DpConstraints) : LayoutModifier {
override fun DensityScope.modifyConstraints(constraints: Constraints) =
diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/Stack.kt b/ui/ui-layout/src/main/java/androidx/ui/layout/Stack.kt
index 5879f40..a4099a6 100644
--- a/ui/ui-layout/src/main/java/androidx/ui/layout/Stack.kt
+++ b/ui/ui-layout/src/main/java/androidx/ui/layout/Stack.kt
@@ -16,20 +16,20 @@
package androidx.ui.layout
-import androidx.ui.core.Constraints
-import androidx.ui.core.IntPx
-import androidx.ui.core.IntPxSize
-import androidx.ui.core.Measurable
-import androidx.ui.core.Placeable
-import androidx.ui.core.looseMin
-import androidx.ui.core.max
import androidx.compose.Composable
import androidx.ui.core.Alignment
-import androidx.ui.core.DensityScope
+import androidx.ui.core.Constraints
import androidx.ui.core.Layout
+import androidx.ui.core.Measurable
import androidx.ui.core.Modifier
import androidx.ui.core.ParentDataModifier
-import androidx.ui.core.isFinite
+import androidx.ui.core.Placeable
+import androidx.ui.core.looseMin
+import androidx.ui.unit.DensityScope
+import androidx.ui.unit.IntPx
+import androidx.ui.unit.IntPxSize
+import androidx.ui.unit.isFinite
+import androidx.ui.unit.max
/**
* A composable that positions its children relative to its edges.
diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/Table.kt b/ui/ui-layout/src/main/java/androidx/ui/layout/Table.kt
index 0bc5010..12e6b35 100644
--- a/ui/ui-layout/src/main/java/androidx/ui/layout/Table.kt
+++ b/ui/ui-layout/src/main/java/androidx/ui/layout/Table.kt
@@ -21,21 +21,21 @@
import androidx.compose.state
import androidx.ui.core.Alignment
import androidx.ui.core.Constraints
-import androidx.ui.core.Density
-import androidx.ui.core.DensityScope
-import androidx.ui.core.Dp
-import androidx.ui.core.IntPx
-import androidx.ui.core.IntPxSize
import androidx.ui.core.IntrinsicMeasurable
import androidx.ui.core.IntrinsicMeasureBlock
import androidx.ui.core.Layout
import androidx.ui.core.ParentData
import androidx.ui.core.Placeable
import androidx.ui.core.constrain
-import androidx.ui.core.isFinite
-import androidx.ui.core.max
-import androidx.ui.core.min
-import androidx.ui.core.withDensity
+import androidx.ui.unit.Density
+import androidx.ui.unit.DensityScope
+import androidx.ui.unit.Dp
+import androidx.ui.unit.IntPx
+import androidx.ui.unit.IntPxSize
+import androidx.ui.unit.isFinite
+import androidx.ui.unit.max
+import androidx.ui.unit.min
+import androidx.ui.unit.withDensity
/**
* Collects information about the children of a [Table] when
diff --git a/ui/ui-layout/src/main/java/androidx/ui/layout/Wrap.kt b/ui/ui-layout/src/main/java/androidx/ui/layout/Wrap.kt
index aff79be..fe392c6 100644
--- a/ui/ui-layout/src/main/java/androidx/ui/layout/Wrap.kt
+++ b/ui/ui-layout/src/main/java/androidx/ui/layout/Wrap.kt
@@ -16,17 +16,17 @@
package androidx.ui.layout
-import androidx.ui.core.IntPxSize
-import androidx.ui.core.Layout
-import androidx.ui.core.ipx
-import androidx.ui.core.looseMin
-import androidx.ui.core.max
import androidx.compose.Composable
import androidx.ui.core.Alignment
import androidx.ui.core.Constraints
-import androidx.ui.core.DensityScope
-import androidx.ui.core.IntPxPosition
+import androidx.ui.core.Layout
import androidx.ui.core.LayoutModifier
+import androidx.ui.core.looseMin
+import androidx.ui.unit.DensityScope
+import androidx.ui.unit.IntPxPosition
+import androidx.ui.unit.IntPxSize
+import androidx.ui.unit.ipx
+import androidx.ui.unit.max
/**
* A layout that expects a child and places it within itself. The child will be measured
diff --git a/ui/ui-layout/src/test/java/androidx/ui/layout/test/DpConstraintsTest.kt b/ui/ui-layout/src/test/java/androidx/ui/layout/test/DpConstraintsTest.kt
index 8af20f8..1e4c879 100644
--- a/ui/ui-layout/src/test/java/androidx/ui/layout/test/DpConstraintsTest.kt
+++ b/ui/ui-layout/src/test/java/androidx/ui/layout/test/DpConstraintsTest.kt
@@ -16,8 +16,6 @@
package androidx.ui.layout.test
-import androidx.ui.core.Dp
-import androidx.ui.core.dp
import androidx.ui.layout.DpConstraints
import androidx.ui.layout.enforce
import androidx.ui.layout.hasBoundedHeight
@@ -32,6 +30,8 @@
import androidx.ui.layout.tightMax
import androidx.ui.layout.tightMin
import androidx.ui.layout.withTight
+import androidx.ui.unit.Dp
+import androidx.ui.unit.dp
import org.junit.Assert.assertFalse
import org.junit.Assert.assertTrue
import org.junit.Assert.fail