From 6d385e4e87927313f964028c2593eb0adbea9dd9 Mon Sep 17 00:00:00 2001
From: Josia Pietsch <git@jrpie.de>
Date: Wed, 22 Jan 2025 02:17:46 +0100
Subject: [PATCH] use TextClock instead of custom solution

---
 .../jrpie/android/launcher/ui/HomeActivity.kt | 44 ++++---------------
 app/src/main/res/layout/home.xml              |  4 +-
 2 files changed, 11 insertions(+), 37 deletions(-)

diff --git a/app/src/main/java/de/jrpie/android/launcher/ui/HomeActivity.kt b/app/src/main/java/de/jrpie/android/launcher/ui/HomeActivity.kt
index b1a5cc0..1d5381d 100644
--- a/app/src/main/java/de/jrpie/android/launcher/ui/HomeActivity.kt
+++ b/app/src/main/java/de/jrpie/android/launcher/ui/HomeActivity.kt
@@ -21,8 +21,6 @@ import de.jrpie.android.launcher.actions.LauncherAction
 import de.jrpie.android.launcher.databinding.HomeBinding
 import de.jrpie.android.launcher.preferences.LauncherPreferences
 import de.jrpie.android.launcher.ui.tutorial.TutorialActivity
-import java.text.SimpleDateFormat
-import java.util.Date
 import java.util.Locale
 import java.util.Timer
 import kotlin.concurrent.fixedRateTimer
@@ -65,8 +63,6 @@ class HomeActivity : UIObject, AppCompatActivity(),
 
     private lateinit var mDetector: GestureDetectorCompat
 
-    // timers
-    private var clockTimer = Timer()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super<AppCompatActivity>.onCreate(savedInstanceState)
@@ -100,30 +96,24 @@ class HomeActivity : UIObject, AppCompatActivity(),
 
     }
 
-    private fun updateClock() {
-        clockTimer.cancel()
+    private fun initClock() {
         val locale = Locale.getDefault()
         val dateVisible = LauncherPreferences.clock().dateVisible()
         val timeVisible = LauncherPreferences.clock().timeVisible()
 
         var dateFMT = "yyyy-MM-dd"
         var timeFMT = "HH:mm"
-        val period = 100L
         if (LauncherPreferences.clock().showSeconds()) {
             timeFMT += ":ss"
         }
-        /*
-         I thought about adding an option to show microseconds as well ( timeFMT += ".SSS" ).
-         However setting period ot 1L (or even 10L) causes high CPU load,
-         so that doesn't seem to be a good idea.
-         */
+
         if (LauncherPreferences.clock().localized()) {
             dateFMT = android.text.format.DateFormat.getBestDateTimePattern(locale, dateFMT)
             timeFMT = android.text.format.DateFormat.getBestDateTimePattern(locale, timeFMT)
         }
 
-        var upperFormat = SimpleDateFormat(dateFMT, locale)
-        var lowerFormat = SimpleDateFormat(timeFMT, locale)
+        var upperFormat = dateFMT
+        var lowerFormat = timeFMT
         var upperVisible = dateVisible
         var lowerVisible = timeVisible
 
@@ -138,21 +128,10 @@ class HomeActivity : UIObject, AppCompatActivity(),
         binding.homeUpperView.setTextColor(LauncherPreferences.clock().color())
         binding.homeLowerView.setTextColor(LauncherPreferences.clock().color())
 
-
-        clockTimer = fixedRateTimer("clockTimer", true, 0L, period) {
-            this@HomeActivity.runOnUiThread {
-                if (lowerVisible) {
-                    val t = lowerFormat.format(Date())
-                    if (binding.homeLowerView.text != t)
-                        binding.homeLowerView.text = t
-                }
-                if (upperVisible) {
-                    val d = upperFormat.format(Date())
-                    if (binding.homeUpperView.text != d)
-                        binding.homeUpperView.text = d
-                }
-            }
-        }
+        binding.homeLowerView.format24Hour = lowerFormat
+        binding.homeUpperView.format24Hour = upperFormat
+        binding.homeLowerView.format12Hour = lowerFormat
+        binding.homeUpperView.format12Hour = upperFormat
     }
 
     override fun getTheme(): Resources.Theme {
@@ -172,12 +151,7 @@ class HomeActivity : UIObject, AppCompatActivity(),
 
         edgeWidth = LauncherPreferences.enabled_gestures().edgeSwipeEdgeWidth() / 100f
 
-        updateClock()
-    }
-
-    override fun onPause() {
-        super.onPause()
-        clockTimer.cancel()
+        initClock()
     }
 
     override fun onDestroy() {
diff --git a/app/src/main/res/layout/home.xml b/app/src/main/res/layout/home.xml
index 5f34412..f59b211 100644
--- a/app/src/main/res/layout/home.xml
+++ b/app/src/main/res/layout/home.xml
@@ -10,7 +10,7 @@
     android:fitsSystemWindows="true"
     tools:context=".ui.HomeActivity">
 
-    <TextView
+    <TextClock
         android:id="@+id/home_upper_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -23,7 +23,7 @@
         app:layout_constraintVertical_bias="0.45"
         tools:text="2024-12-24" />
 
-    <TextView
+    <TextClock
         android:id="@+id/home_lower_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"