Skip to content

Commit 84a6a71

Browse files
authored
Merge branch 'MM2-0:main' into main
2 parents 68de386 + c425b2d commit 84a6a71

File tree

7 files changed

+22
-15
lines changed

7 files changed

+22
-15
lines changed

.idea/kotlinc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/ui/src/main/java/de/mm20/launcher2/ui/component/BottomSheetDialog.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ fun BottomSheetDialog(
149149

150150
override suspend fun onPreFling(available: Velocity): Velocity {
151151
val toFling = Offset(available.x, available.y).toFloat()
152-
return if (toFling < 0 && draggableState.offset > draggableState.anchors.minAnchor()) {
152+
return if (toFling < 0 && draggableState.offset > draggableState.anchors.minPosition()) {
153153
draggableState.settle(velocity = toFling)
154154
// since we go to the anchor with tween settling, consume all for the best UX
155155
available

app/ui/src/main/java/de/mm20/launcher2/ui/component/dragndrop/DragAndDropGrid.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ fun LazyGridItemScope.DraggableItem(
296296
val isDragged = state.draggedItem?.key == key || state.droppedItemKey == key
297297
Box(
298298
modifier = modifier
299-
.then(if (isDragged) Modifier else Modifier.animateItemPlacement())
299+
.then(if (isDragged) Modifier else Modifier.animateItem())
300300
.zIndex(if (isDragged) 1f else 0f)
301301
.absoluteOffset {
302302
if (state.draggedItem?.key == key) {

app/ui/src/main/java/de/mm20/launcher2/ui/component/dragndrop/DragAndDropList.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ fun LazyItemScope.DraggableItem(
342342
val isDragged = state.draggedItem?.key == key || state.droppedItemKey == key
343343
Box(
344344
modifier = modifier
345-
.then(if (isDragged) Modifier else Modifier.animateItemPlacement())
345+
.then(if (isDragged) Modifier else Modifier.animateItem())
346346
.zIndex(if (isDragged) 1f else 0f)
347347
.offset {
348348
if (state.draggedItem?.key == key) {

app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/WidgetPickerSheet.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ fun WidgetPickerSheet(
387387
viewModel.toggleGroup(group.packageName)
388388
}
389389
.padding(horizontal = 16.dp, vertical = 12.dp)
390-
.animateItemPlacement(),
390+
.animateItem(),
391391
verticalAlignment = Alignment.CenterVertically,
392392
) {
393393
Text(
@@ -417,7 +417,7 @@ fun WidgetPickerSheet(
417417
modifier = Modifier
418418
.fillMaxWidth()
419419
.padding(horizontal = 16.dp, vertical = 4.dp)
420-
.animateItemPlacement(),
420+
.animateItem(),
421421
onClick = {
422422
bindAppWidgetStarter.launch(it)
423423
}) {

core/i18n/src/main/res/values-be/strings.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -310,4 +310,10 @@
310310
<string name="preference_icon_shape_hexagon">Шасцівугольнік</string>
311311
<string name="preference_cards_shape">Фігура</string>
312312
<string name="preference_cards_shape_cut">Абрэзаная</string>
313+
<string name="preference_category_searchbar">Поле пошуку</string>
314+
<string name="preference_screen_integrations">Інтэграцыі</string>
315+
<string name="preference_screen_plugins">Плагіны</string>
316+
<string name="preference_screen_plugins_summary">Кіраванне ўсталяванымі пашырэннямі</string>
317+
<string name="no_plugins_installed">Плагінаў не ўсталявана</string>
318+
<string name="preference_theme_system">Як у сістэме</string>
313319
</resources>

gradle/libs.versions.toml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,23 @@ pluginSdk = "2.1.1"
1111

1212
gradle = "8.1.2"
1313
android-gradle-plugin = "8.2.2"
14-
ksp-gradle-plugin = "2.0.0-1.0.21"
14+
ksp-gradle-plugin = "2.0.20-1.0.25"
1515

16-
kotlin = "2.0.0"
17-
kotlinx-coroutines = "1.8.0"
16+
kotlin = "2.0.20"
17+
kotlinx-coroutines = "1.8.1"
1818
kotlinx-immutable = "0.3.5"
19-
kotlinx-serialization = "1.6.3"
19+
kotlinx-serialization = "1.7.2"
2020

2121
jetbrains-markdown = "0.5.2"
2222

23-
androidx-compose = "1.7.0-beta05"
24-
androidx-compose-material3 = "1.3.0-beta04"
23+
androidx-compose = "1.8.0-alpha01"
24+
androidx-compose-material3 = "1.3.0"
25+
androidx-compose-materialicons = "1.7.1"
2526
androidx-lifecycle = "2.8.2"
2627
androidx-core = "1.14.0-alpha01"
2728
androidx-appcompat = "1.7.0"
28-
androidx-activity = "1.9.0"
29-
androidx-work = "2.9.0"
29+
androidx-activity = "1.9.2"
30+
androidx-work = "2.9.1"
3031
androidx-browser = "1.8.0"
3132
androidx-palette = "1.0.0"
3233
androidx-media2 = "1.3.0"
@@ -64,7 +65,7 @@ androidx-compose-foundationlayout = { group = "androidx.compose.foundation", nam
6465
androidx-compose-ui = { group = "androidx.compose.ui", name = "ui", version.ref = "androidx-compose" }
6566
androidx-compose-uitooling = { group = "androidx.compose.ui", name = "ui-tooling", version.ref = "androidx-compose" }
6667
androidx-compose-material = { group = "androidx.compose.material", name = "material", version.ref = "androidx-compose" }
67-
androidx-compose-materialicons = { group = "androidx.compose.material", name = "material-icons-extended", version.ref = "androidx-compose" }
68+
androidx-compose-materialicons = { group = "androidx.compose.material", name = "material-icons-extended", version.ref = "androidx-compose-materialicons" }
6869
androidx-compose-animation = { group = "androidx.compose.animation", name = "animation", version.ref = "androidx-compose" }
6970
androidx-compose-animationgraphics = { group = "androidx.compose.animation", name = "animation-graphics", version.ref = "androidx-compose" }
7071
androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "androidx-compose-material3" }

0 commit comments

Comments
 (0)