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

Fix clock disappearing when fill screen height is disabled

Browse Source
This commit is contained in:
MM20 2024-01-28 23:05:01 +01:00
parent 33eff8499e
commit 837cd63191
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
3 changed files with 4 additions and 1 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/launcher/PagerScaffold.kt
View File

@ -495,6 +495,7 @@ fun PagerScaffold(
.then(clockHeight?.let { Modifier.height(it) } ?: Modifier) .then(clockHeight?.let { Modifier.height(it) } ?: Modifier)
.padding(bottom = clockPadding), .padding(bottom = clockPadding),
editMode = isWidgetEditMode, editMode = isWidgetEditMode,
fillScreenHeight = fillClockHeight,
) )
WidgetColumn( WidgetColumn(

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

@ -472,6 +472,7 @@ fun PullDownScaffold(
.then(clockHeight?.let { Modifier.height(it) } ?: Modifier) .then(clockHeight?.let { Modifier.height(it) } ?: Modifier)
.padding(bottom = clockPadding), .padding(bottom = clockPadding),
editMode = isWidgetEditMode, editMode = isWidgetEditMode,
fillScreenHeight = fillClockHeight,
) )
WidgetColumn( WidgetColumn(

3
app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/ClockWidget.kt
View File

@ -82,6 +82,7 @@ import de.mm20.launcher2.ui.settings.clockwidget.ClockWidgetSettingsScreenVM
@Composable @Composable
fun ClockWidget( fun ClockWidget(
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
fillScreenHeight: Boolean,
editMode: Boolean = false, editMode: Boolean = false,
) { ) {
val viewModel: ClockWidgetVM = viewModel() val viewModel: ClockWidgetVM = viewModel()
@ -153,7 +154,7 @@ fun ClockWidget(
Column(modifier = modifier) { Column(modifier = modifier) {
Box( Box(
modifier = Modifier modifier = Modifier
.weight(1f) .then(if(fillScreenHeight) Modifier.weight(1f) else Modifier)
.fillMaxWidth(), .fillMaxWidth(),
contentAlignment = when (alignment) { contentAlignment = when (alignment) {
ClockWidgetAlignment.Center -> Alignment.Center ClockWidgetAlignment.Center -> Alignment.Center