From 9d89e6ae92910da36607b3eeed7328fae58be0ae Mon Sep 17 00:00:00 2001
From: Phoebe <77941535+catgirlseraid@users.noreply.github.com>
Date: Sat, 25 May 2024 00:43:28 +1200
Subject: Add 24h time toggle (#1804)

Co-authored-by: SeRaid <77941535+SeRaid743@users.noreply.github.com>
---
 src/main/java/at/hannibal2/skyhanni/utils/SimpleTimeMark.kt | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'src/main/java/at/hannibal2/skyhanni/utils')

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/SimpleTimeMark.kt b/src/main/java/at/hannibal2/skyhanni/utils/SimpleTimeMark.kt
index d818facfe..66286a489 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/SimpleTimeMark.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/SimpleTimeMark.kt
@@ -1,5 +1,6 @@
 package at.hannibal2.skyhanni.utils
 
+import at.hannibal2.skyhanni.SkyHanniMod
 import java.time.Instant
 import java.time.LocalDateTime
 import java.time.ZoneId
@@ -36,9 +37,15 @@ value class SimpleTimeMark(private val millis: Long) : Comparable<SimpleTimeMark
     }
 
     fun formattedDate(pattern: String): String {
+        val newPattern = if (SkyHanniMod.feature.gui.timeFormat24h) {
+            pattern.replace("h", "H").replace("a", "")
+        } else {
+            pattern
+        }
+
         val instant = Instant.ofEpochMilli(millis)
         val localDateTime = LocalDateTime.ofInstant(instant, ZoneId.systemDefault())
-        val formatter = DateTimeFormatter.ofPattern(pattern)
+        val formatter = DateTimeFormatter.ofPattern(newPattern.trim())
         return localDateTime.format(formatter)
     }
 
-- 
cgit