Skip to content

Commit f34bba2

Browse files
authored
Merge pull request #57 from cheonjaeung/remove-deprecated
Remove deprecated Horizontal/VerticalGrid with alignment parameter
2 parents 4d4a9e7 + 9c05e5c commit f34bba2

File tree

3 files changed

+0
-66
lines changed

3 files changed

+0
-66
lines changed

grid/api/android/grid.api

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,7 @@ public abstract interface class com/cheonjaeung/compose/grid/GridItemSpanScope {
5151

5252
public final class com/cheonjaeung/compose/grid/GridKt {
5353
public static final fun BoxGrid-YlGCr2M (Lcom/cheonjaeung/compose/grid/SimpleGridCells;Lcom/cheonjaeung/compose/grid/SimpleGridCells;Landroidx/compose/ui/Modifier;FFLandroidx/compose/ui/Alignment;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V
54-
public static final fun HorizontalGrid (Lcom/cheonjaeung/compose/grid/SimpleGridCells;Landroidx/compose/ui/Modifier;Landroidx/compose/foundation/layout/Arrangement$Horizontal;Landroidx/compose/foundation/layout/Arrangement$Vertical;Landroidx/compose/ui/Alignment;Lkotlin/Unit;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V
5554
public static final fun HorizontalGrid (Lcom/cheonjaeung/compose/grid/SimpleGridCells;Landroidx/compose/ui/Modifier;Landroidx/compose/foundation/layout/Arrangement$Horizontal;Landroidx/compose/foundation/layout/Arrangement$Vertical;Landroidx/compose/ui/Alignment;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V
56-
public static final fun VerticalGrid (Lcom/cheonjaeung/compose/grid/SimpleGridCells;Landroidx/compose/ui/Modifier;Landroidx/compose/foundation/layout/Arrangement$Horizontal;Landroidx/compose/foundation/layout/Arrangement$Vertical;Landroidx/compose/ui/Alignment;Lkotlin/Unit;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V
5755
public static final fun VerticalGrid (Lcom/cheonjaeung/compose/grid/SimpleGridCells;Landroidx/compose/ui/Modifier;Landroidx/compose/foundation/layout/Arrangement$Horizontal;Landroidx/compose/foundation/layout/Arrangement$Vertical;Landroidx/compose/ui/Alignment;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V
5856
}
5957

grid/api/jvm/grid.api

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,7 @@ public abstract interface class com/cheonjaeung/compose/grid/GridItemSpanScope {
5151

5252
public final class com/cheonjaeung/compose/grid/GridKt {
5353
public static final fun BoxGrid-YlGCr2M (Lcom/cheonjaeung/compose/grid/SimpleGridCells;Lcom/cheonjaeung/compose/grid/SimpleGridCells;Landroidx/compose/ui/Modifier;FFLandroidx/compose/ui/Alignment;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V
54-
public static final fun HorizontalGrid (Lcom/cheonjaeung/compose/grid/SimpleGridCells;Landroidx/compose/ui/Modifier;Landroidx/compose/foundation/layout/Arrangement$Horizontal;Landroidx/compose/foundation/layout/Arrangement$Vertical;Landroidx/compose/ui/Alignment;Lkotlin/Unit;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V
5554
public static final fun HorizontalGrid (Lcom/cheonjaeung/compose/grid/SimpleGridCells;Landroidx/compose/ui/Modifier;Landroidx/compose/foundation/layout/Arrangement$Horizontal;Landroidx/compose/foundation/layout/Arrangement$Vertical;Landroidx/compose/ui/Alignment;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V
56-
public static final fun VerticalGrid (Lcom/cheonjaeung/compose/grid/SimpleGridCells;Landroidx/compose/ui/Modifier;Landroidx/compose/foundation/layout/Arrangement$Horizontal;Landroidx/compose/foundation/layout/Arrangement$Vertical;Landroidx/compose/ui/Alignment;Lkotlin/Unit;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V
5755
public static final fun VerticalGrid (Lcom/cheonjaeung/compose/grid/SimpleGridCells;Landroidx/compose/ui/Modifier;Landroidx/compose/foundation/layout/Arrangement$Horizontal;Landroidx/compose/foundation/layout/Arrangement$Vertical;Landroidx/compose/ui/Alignment;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V
5856
}
5957

grid/src/commonMain/kotlin/com/cheonjaeung/compose/grid/Grid.kt

Lines changed: 0 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -68,37 +68,6 @@ inline fun BoxGrid(
6868
)
6969
}
7070

71-
/**
72-
* A layout composable that places its children sequentially in a grid.
73-
*
74-
* @param rows The class that determines the sizes and the number of grid cells.
75-
* @param modifier The modifier to be applied to this layout.
76-
* @param horizontalArrangement The horizontal arrangement of the grid cells.
77-
* @param verticalArrangement The vertical arrangement of the grid cells.
78-
* @param alignment The default alignment of the grid cells.
79-
* @param content The children of this layout.
80-
*/
81-
@Composable
82-
@Deprecated("Parameter 'alignment' is renamed to 'contentAlignment'.")
83-
inline fun HorizontalGrid(
84-
rows: SimpleGridCells,
85-
modifier: Modifier = Modifier,
86-
horizontalArrangement: Arrangement.Horizontal = Arrangement.Start,
87-
verticalArrangement: Arrangement.Vertical = Arrangement.Top,
88-
alignment: Alignment = Alignment.TopStart,
89-
conflictResolver: Unit = Unit,
90-
content: @Composable GridScope.() -> Unit
91-
) {
92-
HorizontalGrid(
93-
rows = rows,
94-
modifier = modifier,
95-
horizontalArrangement = horizontalArrangement,
96-
verticalArrangement = verticalArrangement,
97-
contentAlignment = alignment,
98-
content = content
99-
)
100-
}
101-
10271
/**
10372
* A layout composable that places its children in a grid.
10473
*
@@ -141,37 +110,6 @@ inline fun HorizontalGrid(
141110
)
142111
}
143112

144-
/**
145-
* A layout composable that places its children sequentially in a grid.
146-
*
147-
* @param columns The class that determines the sizes and the number of grid cells.
148-
* @param modifier The modifier to be applied to this layout.
149-
* @param horizontalArrangement The horizontal arrangement of the grid cells.
150-
* @param verticalArrangement The vertical arrangement of the grid cells.
151-
* @param alignment The default alignment of the grid cells.
152-
* @param content The children of this layout.
153-
*/
154-
@Composable
155-
@Deprecated("Parameter 'alignment' is renamed to 'contentAlignment'.")
156-
inline fun VerticalGrid(
157-
columns: SimpleGridCells,
158-
modifier: Modifier = Modifier,
159-
horizontalArrangement: Arrangement.Horizontal = Arrangement.Start,
160-
verticalArrangement: Arrangement.Vertical = Arrangement.Top,
161-
alignment: Alignment = Alignment.TopStart,
162-
conflictResolver: Unit = Unit,
163-
content: @Composable GridScope.() -> Unit
164-
) {
165-
VerticalGrid(
166-
columns = columns,
167-
modifier = modifier,
168-
horizontalArrangement = horizontalArrangement,
169-
verticalArrangement = verticalArrangement,
170-
contentAlignment = alignment,
171-
content = content
172-
)
173-
}
174-
175113
/**
176114
* A layout composable that places its children in a grid.
177115
*

0 commit comments

Comments
 (0)