Skip to content

Commit d7f11cf

Browse files
committed
Merge remote-tracking branch 'origin/0.5.x' into 0.5.x
2 parents c9ba839 + f2f58aa commit d7f11cf

4 files changed

Lines changed: 4 additions & 8 deletions

File tree

compose-dnd/src/commonMain/kotlin/com/mohamedrejeb/compose/dnd/drag/DraggableItemModifier.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,7 @@ fun <T> Modifier.draggableItem(
9292
sizeDropAnimationSpec = sizeDropAnimationSpec,
9393
draggableContent = draggableContent,
9494
)
95-
)
96-
.pointerInput(
95+
).pointerInput(
9796
key,
9897
enabled,
9998
state,

compose-dnd/src/commonMain/kotlin/com/mohamedrejeb/compose/dnd/reorder/ReorderableItemModifier.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,7 @@ fun <T> Modifier.reorderableItem(
9898
dropAnimationSpec = dropAnimationSpec,
9999
sizeDropAnimationSpec = sizeDropAnimationSpec,
100100
draggableContent = draggableContent,
101-
)
102-
.dropTarget(
101+
).dropTarget(
103102
key = key,
104103
state = state,
105104
zIndex = zIndex,

sample/common/src/commonMain/kotlin/ui/ItemToItemOneDirectionScreen.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,7 @@ private fun ItemToItemOneDirectionScreenContent(
126126
draggableContent = {
127127
RedBox(modifier = Modifier.size(200.dp))
128128
},
129-
)
130-
.size(200.dp),
129+
).size(200.dp),
131130
)
132131
}
133132
}

sample/common/src/commonMain/kotlin/ui/ReorderListScreen.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,7 @@ private fun ReorderScreenContent(
115115
.height(60.dp),
116116
)
117117
},
118-
)
119-
.fillMaxWidth()
118+
).fillMaxWidth()
120119
.height(60.dp),
121120
)
122121
}

0 commit comments

Comments
 (0)