From 92c20c62d46656fd3afb8f0fdd144448798718b9 Mon Sep 17 00:00:00 2001
From: Finn M Glas <finn@finnmglas.com>
Date: Mon, 12 Oct 2020 20:49:44 +0200
Subject: [PATCH] Fix date / time view actions

Close #69
---
 .../com/finnmglas/launcher/HomeActivity.kt    | 23 +++++++++++--------
 app/src/main/res/layout/home.xml              |  4 ++--
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/finnmglas/launcher/HomeActivity.kt b/app/src/main/java/com/finnmglas/launcher/HomeActivity.kt
index 054be5c..1171658 100644
--- a/app/src/main/java/com/finnmglas/launcher/HomeActivity.kt
+++ b/app/src/main/java/com/finnmglas/launcher/HomeActivity.kt
@@ -7,7 +7,6 @@ import android.os.AsyncTask
 import android.os.Bundle
 import android.provider.MediaStore
 import android.view.*
-import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.GestureDetectorCompat
 import com.finnmglas.launcher.tutorial.TutorialActivity
@@ -119,12 +118,12 @@ class HomeActivity: UIObject, AppCompatActivity(),
         clockTimer = fixedRateTimer("clockTimer", true, 0L, 100) {
             this@HomeActivity.runOnUiThread {
                 val t = timeFormat.format(Date())
-                if (home_time_view.text != t)
-                    home_time_view.text = t
+                if (home_lower_view.text != t)
+                    home_lower_view.text = t
 
                 val d = dateFormat.format(Date())
-                if (home_date_view.text != d)
-                    home_date_view.text = d
+                if (home_upper_view.text != d)
+                    home_upper_view.text = d
             }
         }
     }
@@ -260,12 +259,18 @@ class HomeActivity: UIObject, AppCompatActivity(),
             launch("launcher:settings", this, R.anim.bottom_up)
         }
 
-        home_date_view.setOnClickListener() {
-            launch(calendarApp, this)
+        home_upper_view.setOnClickListener() {
+            when (launcherPreferences.getInt(PREF_DATE_FORMAT, 0)) {
+                0 -> launch(calendarApp, this)
+                else -> launch(clockApp,this)
+            }
         }
 
-        home_time_view.setOnClickListener() {
-            launch(clockApp,this)
+        home_lower_view.setOnClickListener() {
+            when (launcherPreferences.getInt(PREF_DATE_FORMAT, 0)) {
+                0 -> launch(clockApp, this)
+                else -> launch(calendarApp,this)
+            }
         }
     }
 
diff --git a/app/src/main/res/layout/home.xml b/app/src/main/res/layout/home.xml
index d0c8275..8a9d41b 100644
--- a/app/src/main/res/layout/home.xml
+++ b/app/src/main/res/layout/home.xml
@@ -21,7 +21,7 @@
         tools:ignore="ContentDescription" />
 
     <TextView
-        android:id="@+id/home_date_view"
+        android:id="@+id/home_upper_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="start|center_vertical"
@@ -33,7 +33,7 @@
         app:layout_constraintVertical_bias="0.45" />
 
     <TextView
-        android:id="@+id/home_time_view"
+        android:id="@+id/home_lower_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="start|center_vertical"