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

Fix clock widget 12-hour format

Browse Source
This commit is contained in:
MM20 2024-05-08 18:10:35 +02:00
parent b32f3a05c5
commit 9e8b7a7677
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/clocks/DigitalClock1.kt
View File

@ -47,7 +47,7 @@ fun DigitalClock1(
"HH mm" "HH mm"
} }
verticalLayout -> { verticalLayout -> {
"HH\nmm" "hh\nmm"
} }
else -> { else -> {
"hh mm" "hh mm"

4
app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/clocks/SegmentClock.kt
View File

@ -2,6 +2,7 @@ package de.mm20.launcher2.ui.launcher.widgets.clock.clocks
import android.os.Handler import android.os.Handler
import android.os.Looper import android.os.Looper
import android.text.format.DateFormat
import android.util.Log import android.util.Log
import androidx.compose.animation.core.Animatable import androidx.compose.animation.core.Animatable
import androidx.compose.animation.core.RepeatMode import androidx.compose.animation.core.RepeatMode
@ -35,6 +36,7 @@ import androidx.compose.ui.graphics.PathFillType
import androidx.compose.ui.graphics.SolidColor import androidx.compose.ui.graphics.SolidColor
import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.graphics.vector.path import androidx.compose.ui.graphics.vector.path
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalLifecycleOwner import androidx.compose.ui.platform.LocalLifecycleOwner
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.lifecycle.Lifecycle import androidx.lifecycle.Lifecycle
@ -54,7 +56,7 @@ fun SegmentClock(
darkColors: Boolean, darkColors: Boolean,
) { ) {
val parsed = Instant.ofEpochMilli(time).atZone(ZoneId.systemDefault()) val parsed = Instant.ofEpochMilli(time).atZone(ZoneId.systemDefault())
val hour = parsed.hour val hour = if (DateFormat.is24HourFormat(LocalContext.current)) parsed.hour else (((parsed.hour + 11) % 12) + 1)
val minute = parsed.minute val minute = parsed.minute
val second = parsed.second val second = parsed.second