diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index 6d0ee1c2..d4b7accb 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/component/BottomSheetDialog.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/component/BottomSheetDialog.kt index 92183abf..a96e4648 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/component/BottomSheetDialog.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/component/BottomSheetDialog.kt @@ -149,7 +149,7 @@ fun BottomSheetDialog( override suspend fun onPreFling(available: Velocity): Velocity { val toFling = Offset(available.x, available.y).toFloat() - return if (toFling < 0 && draggableState.offset > draggableState.anchors.minAnchor()) { + return if (toFling < 0 && draggableState.offset > draggableState.anchors.minPosition()) { draggableState.settle(velocity = toFling) // since we go to the anchor with tween settling, consume all for the best UX available diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/component/dragndrop/DragAndDropGrid.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/component/dragndrop/DragAndDropGrid.kt index b4398efc..52538476 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/component/dragndrop/DragAndDropGrid.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/component/dragndrop/DragAndDropGrid.kt @@ -296,7 +296,7 @@ fun LazyGridItemScope.DraggableItem( val isDragged = state.draggedItem?.key == key || state.droppedItemKey == key Box( modifier = modifier - .then(if (isDragged) Modifier else Modifier.animateItemPlacement()) + .then(if (isDragged) Modifier else Modifier.animateItem()) .zIndex(if (isDragged) 1f else 0f) .absoluteOffset { if (state.draggedItem?.key == key) { diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/component/dragndrop/DragAndDropList.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/component/dragndrop/DragAndDropList.kt index a907c96b..2fe755b6 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/component/dragndrop/DragAndDropList.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/component/dragndrop/DragAndDropList.kt @@ -342,7 +342,7 @@ fun LazyItemScope.DraggableItem( val isDragged = state.draggedItem?.key == key || state.droppedItemKey == key Box( modifier = modifier - .then(if (isDragged) Modifier else Modifier.animateItemPlacement()) + .then(if (isDragged) Modifier else Modifier.animateItem()) .zIndex(if (isDragged) 1f else 0f) .offset { if (state.draggedItem?.key == key) { diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/WidgetPickerSheet.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/WidgetPickerSheet.kt index e502c207..d200f2b9 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/WidgetPickerSheet.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/WidgetPickerSheet.kt @@ -387,7 +387,7 @@ fun WidgetPickerSheet( viewModel.toggleGroup(group.packageName) } .padding(horizontal = 16.dp, vertical = 12.dp) - .animateItemPlacement(), + .animateItem(), verticalAlignment = Alignment.CenterVertically, ) { Text( @@ -417,7 +417,7 @@ fun WidgetPickerSheet( modifier = Modifier .fillMaxWidth() .padding(horizontal = 16.dp, vertical = 4.dp) - .animateItemPlacement(), + .animateItem(), onClick = { bindAppWidgetStarter.launch(it) }) { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index eb3cd7aa..e6d14c02 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -11,22 +11,23 @@ pluginSdk = "2.1.1" gradle = "8.1.2" android-gradle-plugin = "8.2.2" -ksp-gradle-plugin = "2.0.0-1.0.21" +ksp-gradle-plugin = "2.0.20-1.0.25" -kotlin = "2.0.0" -kotlinx-coroutines = "1.8.0" +kotlin = "2.0.20" +kotlinx-coroutines = "1.8.1" kotlinx-immutable = "0.3.5" -kotlinx-serialization = "1.6.3" +kotlinx-serialization = "1.7.2" jetbrains-markdown = "0.5.2" -androidx-compose = "1.7.0-beta05" -androidx-compose-material3 = "1.3.0-beta04" +androidx-compose = "1.8.0-alpha01" +androidx-compose-material3 = "1.3.0" +androidx-compose-materialicons = "1.7.1" androidx-lifecycle = "2.8.2" androidx-core = "1.14.0-alpha01" androidx-appcompat = "1.7.0" -androidx-activity = "1.9.0" -androidx-work = "2.9.0" +androidx-activity = "1.9.2" +androidx-work = "2.9.1" androidx-browser = "1.8.0" androidx-palette = "1.0.0" androidx-media2 = "1.3.0" @@ -63,7 +64,7 @@ androidx-compose-foundationlayout = { group = "androidx.compose.foundation", nam androidx-compose-ui = { group = "androidx.compose.ui", name = "ui", version.ref = "androidx-compose" } androidx-compose-uitooling = { group = "androidx.compose.ui", name = "ui-tooling", version.ref = "androidx-compose" } androidx-compose-material = { group = "androidx.compose.material", name = "material", version.ref = "androidx-compose" } -androidx-compose-materialicons = { group = "androidx.compose.material", name = "material-icons-extended", version.ref = "androidx-compose" } +androidx-compose-materialicons = { group = "androidx.compose.material", name = "material-icons-extended", version.ref = "androidx-compose-materialicons" } androidx-compose-animation = { group = "androidx.compose.animation", name = "animation", version.ref = "androidx-compose" } androidx-compose-animationgraphics = { group = "androidx.compose.animation", name = "animation-graphics", version.ref = "androidx-compose" } androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "androidx-compose-material3" }