lun_admin/NeoLaunch_From_Kvaesitso
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Respect app widget size constraints

Browse Source
This commit is contained in:
MM20 2024-04-18 00:56:58 +02:00
parent bf281e92c2
commit 708e302631
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
3 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/ui/src/main/java/de/mm20/launcher2/ui/component/DragResizeHandle.kt
View File

@ -38,6 +38,7 @@ enum class ResizeAxis {
Horizontal,
Vertical,
Both,
None,
}
@Composable

32
app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/ConfigureWidgetSheet.kt
View File

@ -92,6 +92,7 @@ import de.mm20.launcher2.ui.component.BottomSheetDialog
import de.mm20.launcher2.ui.component.DragResizeHandle
import de.mm20.launcher2.ui.component.LargeMessage
import de.mm20.launcher2.ui.component.MissingPermissionBanner
import de.mm20.launcher2.ui.component.ResizeAxis
import de.mm20.launcher2.ui.component.preferences.CheckboxPreference
import de.mm20.launcher2.ui.component.preferences.Preference
import de.mm20.launcher2.ui.component.preferences.SwitchPreference
@ -379,10 +380,41 @@ fun ColumnScope.ConfigureAppWidget(
useThemeColors = widget.config.themeColors,
onLightBackground = (!LocalDarkTheme.current && widget.config.background) || LocalPreferDarkContentOverWallpaper.current
)
val maxWidth = if (isAtLeastApiLevel(31)) {
widgetInfo.maxResizeWidth.takeIf { it > 0 }?.dp ?: Dp.Unspecified
} else Dp.Unspecified
val maxHeight = if (isAtLeastApiLevel(31)) {
widgetInfo.maxResizeHeight.takeIf { it > 0 }?.dp ?: 2000.dp
} else 2000.dp
val minWidth = if (widgetInfo.minResizeWidth in 1..widgetInfo.minWidth) {
widgetInfo.minResizeWidth.dp
} else {
widgetInfo.minWidth.dp
}
val minHeight = if (widgetInfo.minResizeHeight in 1..widgetInfo.minHeight) {
widgetInfo.minResizeHeight.dp
} else {
widgetInfo.minHeight.dp
}
DragResizeHandle(
alignment = Alignment.TopCenter,
height = resizeHeight,
width = resizeWidth,
minWidth = minWidth,
minHeight = minHeight,
maxWidth = maxWidth,
maxHeight = maxHeight,
resizeAxis = when(widgetInfo.resizeMode) {
AppWidgetProviderInfo.RESIZE_HORIZONTAL -> ResizeAxis.Horizontal
AppWidgetProviderInfo.RESIZE_VERTICAL -> ResizeAxis.Vertical
AppWidgetProviderInfo.RESIZE_BOTH -> ResizeAxis.Both
else -> ResizeAxis.None
},
snapToMeasuredWidth = true,
onResize = { w, h ->
resizeWidth = w

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

@ -235,6 +235,7 @@ private class BindAndConfigureAppWidgetContract(
id = UUID.randomUUID(),
config = AppWidgetConfig(
height = widgetProviderInfo.minHeight,
width = widgetProviderInfo.minWidth,
widgetId = widgetId,
),
)