From 14a045029da03d0459517b5c8bbd1eca08f1bebf Mon Sep 17 00:00:00 2001
From: mueller-ma <mueller-ma@users.noreply.github.com>
Date: Fri, 27 Dec 2024 16:54:57 +0100
Subject: [PATCH] Show date in DayDream

Signed-off-by: mueller-ma <mueller-ma@users.noreply.github.com>
---
 mobile/src/main/AndroidManifest.xml                |  4 +++-
 .../main/java/org/openhab/habdroid/ui/DayDream.kt  | 11 +++++++++++
 mobile/src/main/res/layout/daydream.xml            | 14 ++++++++++++++
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/mobile/src/main/AndroidManifest.xml b/mobile/src/main/AndroidManifest.xml
index 226fda3ae3..8433818daf 100644
--- a/mobile/src/main/AndroidManifest.xml
+++ b/mobile/src/main/AndroidManifest.xml
@@ -92,9 +92,11 @@
             </intent-filter>
         </activity>
 
+        <!-- DayDreamPreferencesActivity only calls PreferencesActivity, so don't keep it in history -->
         <activity
             android:name=".ui.preference.DayDreamPreferencesActivity"
-            android:exported="true" />
+            android:exported="true"
+            android:noHistory="true" />
         <activity
             android:name=".ui.AboutActivity"
             android:label="@string/about_title"
diff --git a/mobile/src/main/java/org/openhab/habdroid/ui/DayDream.kt b/mobile/src/main/java/org/openhab/habdroid/ui/DayDream.kt
index 58d23e1670..40b3707351 100644
--- a/mobile/src/main/java/org/openhab/habdroid/ui/DayDream.kt
+++ b/mobile/src/main/java/org/openhab/habdroid/ui/DayDream.kt
@@ -19,11 +19,14 @@ import android.graphics.Rect
 import android.os.Handler
 import android.os.Looper
 import android.service.dreams.DreamService
+import android.text.format.DateFormat
 import android.util.Log
 import android.view.View
 import android.widget.FrameLayout
 import android.widget.LinearLayout
+import android.widget.TextClock
 import android.widget.TextView
+import java.util.Locale
 import kotlin.coroutines.CoroutineContext
 import kotlin.random.Random
 import kotlin.time.Duration.Companion.minutes
@@ -65,12 +68,20 @@ class DayDream : DreamService(), CoroutineScope {
         textView = findViewById(R.id.text)
         wrapper = findViewById(R.id.wrapper)
         container = findViewById(R.id.container)
+        setupDateView()
 
         launch {
             item?.let { listenForTextItem(it) }
         }
     }
 
+    private fun setupDateView() {
+        val dateView: TextClock = findViewById(R.id.date)
+        val pattern = DateFormat.getBestDateTimePattern(Locale.getDefault(), "EEEE, MMMM d, yyyy")
+        dateView.format12Hour = pattern
+        dateView.format24Hour = pattern
+    }
+
     override fun onConfigurationChanged(newConfig: Configuration) {
         super.onConfigurationChanged(newConfig)
         moveTextIfRequired()
diff --git a/mobile/src/main/res/layout/daydream.xml b/mobile/src/main/res/layout/daydream.xml
index 955661f926..8e5bfbb372 100644
--- a/mobile/src/main/res/layout/daydream.xml
+++ b/mobile/src/main/res/layout/daydream.xml
@@ -16,14 +16,28 @@
             android:id="@+id/clock"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:fontFamily="sans-serif-light"
             android:textAppearance="@style/TextAppearance.Material3.DisplayLarge" />
 
+        <TextClock
+            android:id="@+id/date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:gravity="center_horizontal"
+            android:fontFamily="sans-serif-light"
+            android:textAppearance="@style/TextAppearance.Material3.DisplaySmall"
+            tools:format12Hour="EEEE, MMMM d, yyyy"
+            tools:format24Hour="EEEE, MMMM d, yyyy" />
+
         <TextView
             android:id="@+id/text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:paddingTop="64dp"
+            android:fontFamily="sans-serif-light"
             android:textAppearance="@style/TextAppearance.Material3.DisplayMedium"
             tools:text="Temperature: 19 °C" />
     </LinearLayout>