From 32ca93fce1164bca381d8ea1da75c27ffd4abe5a Mon Sep 17 00:00:00 2001
From: Finn M Glas <finn@finnmglas.com>
Date: Mon, 17 Aug 2020 13:41:35 +0200
Subject: [PATCH] Apply it to the Launcher clock / date display

---
 .../java/com/finnmglas/launcher/HomeActivity.kt    |  9 +++++++--
 .../settings/launcher/SettingsFragmentLauncher.kt  |  1 -
 app/src/main/res/layout/settings_launcher.xml      |  1 +
 app/src/main/res/values/strings.xml                | 14 ++++++++++++++
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/finnmglas/launcher/HomeActivity.kt b/app/src/main/java/com/finnmglas/launcher/HomeActivity.kt
index 7f144d6..09964de 100644
--- a/app/src/main/java/com/finnmglas/launcher/HomeActivity.kt
+++ b/app/src/main/java/com/finnmglas/launcher/HomeActivity.kt
@@ -105,8 +105,13 @@ class HomeActivity: UIObject, AppCompatActivity(),
         if (home_background_image != null && getSavedTheme(this) == "custom")
             home_background_image.setImageBitmap(background)
 
-        val dateFormat = SimpleDateFormat("yyyy-MM-dd", Locale.getDefault())
-        val timeFormat = SimpleDateFormat("HH:mm:ss", Locale.getDefault())
+        // Applying the date / time format (changeable in settings)
+        val dFormat = launcherPreferences.getInt(PREF_DATE_FORMAT, 0)
+        val upperFMT = resources.getStringArray(R.array.settings_time_formats_upper)
+        val lowerFMT = resources.getStringArray(R.array.settings_time_formats_lower)
+
+        val dateFormat = SimpleDateFormat(upperFMT[dFormat], Locale.getDefault())
+        val timeFormat = SimpleDateFormat(lowerFMT[dFormat], Locale.getDefault())
 
         clockTimer = fixedRateTimer("clockTimer", true, 0L, 100) {
             this@HomeActivity.runOnUiThread {
diff --git a/app/src/main/java/com/finnmglas/launcher/settings/launcher/SettingsFragmentLauncher.kt b/app/src/main/java/com/finnmglas/launcher/settings/launcher/SettingsFragmentLauncher.kt
index 9468361..ee5692e 100644
--- a/app/src/main/java/com/finnmglas/launcher/settings/launcher/SettingsFragmentLauncher.kt
+++ b/app/src/main/java/com/finnmglas/launcher/settings/launcher/SettingsFragmentLauncher.kt
@@ -185,7 +185,6 @@ class SettingsFragmentLauncher : Fragment(), UIObject {
 
         settings_launcher_format_spinner.setSelection(launcherPreferences.getInt(PREF_DATE_FORMAT, 0))
 
-
         settings_launcher_format_spinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
             override fun onItemSelected(parent: AdapterView<*>, view: View, position: Int, id: Long) {
                 launcherPreferences.edit()
diff --git a/app/src/main/res/layout/settings_launcher.xml b/app/src/main/res/layout/settings_launcher.xml
index b673dd5..4e9b595 100644
--- a/app/src/main/res/layout/settings_launcher.xml
+++ b/app/src/main/res/layout/settings_launcher.xml
@@ -153,6 +153,7 @@
         android:id="@+id/settings_launcher_format_spinner"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:entries="@array/settings_launcher_time_formats"
         android:spinnerMode="dropdown"
         app:layout_constraintBottom_toBottomOf="@id/settings_launcher_text_time_format"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 194b7df..f5a3793 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -58,6 +58,20 @@
         <item>german</item>
     </string-array>
 
+    <string-array name="settings_time_formats_upper">
+        <item>yyyy-MM-dd</item>
+        <item>HH:mm:ss</item>
+        <item>HH:mm:ss</item>
+        <item>HH:mm:ss</item>
+    </string-array>
+
+    <string-array name="settings_time_formats_lower">
+        <item>HH:mm:ss</item>
+        <item>yyyy-MM-dd</item>
+        <item> </item>
+        <item>dd.MM.yyyy</item>
+    </string-array>
+
     <string name="settings_footer_repo">https://github.com/finnmglas/Launcher#en</string>
     <string name="settings_footer_web">https://www.finnmglas.com</string>