From 9e8b7a767776dabfe2e5e4c4dbf36bc966a9170c Mon Sep 17 00:00:00 2001
From: MM20 <15646950+MM2-0@users.noreply.github.com>
Date: Wed, 8 May 2024 18:10:35 +0200
Subject: [PATCH] Fix clock widget 12-hour format

---
 .../ui/launcher/widgets/clock/clocks/DigitalClock1.kt         | 2 +-
 .../ui/launcher/widgets/clock/clocks/SegmentClock.kt          | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/clocks/DigitalClock1.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/clocks/DigitalClock1.kt
index 469835a3..04cb2eee 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/clocks/DigitalClock1.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/clocks/DigitalClock1.kt
@@ -47,7 +47,7 @@ fun DigitalClock1(
                 "HH mm"
             }
             verticalLayout -> {
-                "HH\nmm"
+                "hh\nmm"
             }
             else -> {
                 "hh mm"
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/clocks/SegmentClock.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/clocks/SegmentClock.kt
index ce499669..5120ca28 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/clocks/SegmentClock.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/clocks/SegmentClock.kt
@@ -2,6 +2,7 @@ package de.mm20.launcher2.ui.launcher.widgets.clock.clocks
 
 import android.os.Handler
 import android.os.Looper
+import android.text.format.DateFormat
 import android.util.Log
 import androidx.compose.animation.core.Animatable
 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.vector.ImageVector
 import androidx.compose.ui.graphics.vector.path
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.Lifecycle
@@ -54,7 +56,7 @@ fun SegmentClock(
     darkColors: Boolean,
 ) {
     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 second = parsed.second