From 7c93796a0f2a59d3fa3426fc1b4678b7cbfd9ee4 Mon Sep 17 00:00:00 2001
From: Andreas Schildbach <andreas@schildbach.de>
Date: Wed, 3 Feb 2021 15:03:29 +0100
Subject: [PATCH] For Android 10 and later, add light mode to appwidget.

---
 oeffi/res/layout/station_widget_content.xml    | 10 +++++-----
 oeffi/res/layout/station_widget_entry.xml      | 18 +++++++++---------
 .../layout/station_widget_entry_loading.xml    |  2 +-
 oeffi/res/values-notnight-v29/colors.xml       | 14 ++++++++++++++
 oeffi/res/values/colors.xml                    |  6 ++++++
 5 files changed, 35 insertions(+), 15 deletions(-)
 create mode 100644 oeffi/res/values-notnight-v29/colors.xml

diff --git a/oeffi/res/layout/station_widget_content.xml b/oeffi/res/layout/station_widget_content.xml
index 9685f48..413ae65 100644
--- a/oeffi/res/layout/station_widget_content.xml
+++ b/oeffi/res/layout/station_widget_content.xml
@@ -4,7 +4,7 @@
     android:id="@+id/station_widget_content"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#ff202020"
+    android:background="@color/bg_level0_darkdefault"
     android:focusable="true"
     android:orientation="vertical">
 
@@ -22,7 +22,7 @@
             android:layout_alignParentLeft="true"
             android:layout_margin="2dp"
             android:singleLine="true"
-            android:textColor="#888"
+            android:textColor="@color/fg_less_significant_darkdefault"
             android:textStyle="bold" />
 
         <TextView
@@ -34,7 +34,7 @@
             android:gravity="center_horizontal"
             android:ellipsize="middle"
             android:singleLine="true"
-            android:textColor="#fff"
+            android:textColor="@color/fg_significant_darkdefault"
             android:textStyle="bold" />
 
         <TextView
@@ -43,7 +43,7 @@
             android:layout_height="wrap_content"
             android:layout_margin="2dp"
             android:singleLine="true"
-            android:textColor="#888"
+            android:textColor="@color/fg_less_significant_darkdefault"
             android:textSize="@dimen/font_size_tiny"
             android:textStyle="bold" />
     </LinearLayout>
@@ -70,7 +70,7 @@
             android:layout_marginLeft="24dp"
             android:layout_marginRight="24dp"
             android:gravity="center"
-            android:textColor="#fff"
+            android:textColor="@color/fg_significant_darkdefault"
             android:textStyle="bold"
             android:visibility="gone" />
     </FrameLayout>
diff --git a/oeffi/res/layout/station_widget_entry.xml b/oeffi/res/layout/station_widget_entry.xml
index 6ea33e1..69b608a 100644
--- a/oeffi/res/layout/station_widget_entry.xml
+++ b/oeffi/res/layout/station_widget_entry.xml
@@ -15,10 +15,10 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="2dp"
-        android:background="#666"
+        android:background="@color/bg_divider"
         android:paddingLeft="3dp"
         android:paddingRight="3dp"
-        android:textColor="#fff"
+        android:textColor="@color/fg_significant_darkdefault"
         android:textStyle="bold" />
 
     <TextView
@@ -29,19 +29,19 @@
         android:layout_weight="1"
         android:ellipsize="middle"
         android:singleLine="true"
-        android:textColor="#fff" />
+        android:textColor="@color/fg_significant_darkdefault" />
 
     <TextView
         android:id="@+id/station_widget_entry_msg"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="2dp"
-        android:background="#f44"
+        android:background="@color/bg_highlighted_darkdefault"
         android:paddingLeft="3dp"
         android:paddingRight="3dp"
         android:singleLine="true"
         android:text="!"
-        android:textColor="#fff"
+        android:textColor="@color/fg_significant_darkdefault"
         android:textStyle="bold"
         android:visibility="gone"
         tools:ignore="HardcodedText" />
@@ -51,11 +51,11 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="2dp"
-        android:background="#bbb"
+        android:background="@color/bg_position_darkdefault"
         android:paddingLeft="3dp"
         android:paddingRight="3dp"
         android:singleLine="true"
-        android:textColor="#000"
+        android:textColor="@color/bg_level0_darkdefault"
         android:textStyle="bold"
         android:visibility="gone" />
 
@@ -65,7 +65,7 @@
         android:layout_height="wrap_content"
         android:layout_margin="2dp"
         android:singleLine="true"
-        android:textColor="#f55"
+        android:textColor="@color/fg_highlighted_darkdefault"
         android:textStyle="bold"
         android:visibility="gone" />
 
@@ -75,6 +75,6 @@
         android:layout_height="wrap_content"
         android:layout_margin="2dp"
         android:singleLine="true"
-        android:textColor="#fff" />
+        android:textColor="@color/fg_significant_darkdefault" />
 
 </LinearLayout>
diff --git a/oeffi/res/layout/station_widget_entry_loading.xml b/oeffi/res/layout/station_widget_entry_loading.xml
index 0fed0a0..7b55718 100644
--- a/oeffi/res/layout/station_widget_entry_loading.xml
+++ b/oeffi/res/layout/station_widget_entry_loading.xml
@@ -7,4 +7,4 @@
     android:gravity="center_horizontal"
     android:singleLine="true"
     android:text=""
-    android:textColor="#888" />
+    android:textColor="@color/fg_less_significant_darkdefault" />
diff --git a/oeffi/res/values-notnight-v29/colors.xml b/oeffi/res/values-notnight-v29/colors.xml
new file mode 100644
index 0000000..b655926
--- /dev/null
+++ b/oeffi/res/values-notnight-v29/colors.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- foreground -->
+    <color name="fg_significant_darkdefault">#000000</color>
+    <color name="fg_less_significant_darkdefault">#999999</color>
+    <color name="fg_highlighted_darkdefault">#dd9055</color>
+
+    <!-- background -->
+    <color name="bg_level0_darkdefault">#f7f7f7</color>
+    <color name="bg_position_darkdefault">#757575</color>
+    <color name="bg_highlighted_darkdefault">#ffaaaa</color>
+
+</resources>
diff --git a/oeffi/res/values/colors.xml b/oeffi/res/values/colors.xml
index c977528..af73168 100644
--- a/oeffi/res/values/colors.xml
+++ b/oeffi/res/values/colors.xml
@@ -3,9 +3,12 @@
 
     <!-- foreground -->
     <color name="fg_significant">#000000</color>
+    <color name="fg_significant_darkdefault">#ffffff</color>
     <color name="fg_less_significant">#999999</color>
+    <color name="fg_less_significant_darkdefault">#aaaaaa</color>
     <color name="fg_insignificant">#bbbbbb</color>
     <color name="fg_highlighted">#dd9055</color>
+    <color name="fg_highlighted_darkdefault">#ff9966</color>
     <color name="fg_arrow">#aa0000</color>
     <color name="fg_position">#ffffff</color>
     <color name="fg_significant_on_dark">#ffffff</color>
@@ -13,6 +16,7 @@
 
     <!-- background -->
     <color name="bg_level0">#f7f7f7</color>
+    <color name="bg_level0_darkdefault">#222222</color>
     <color name="bg_level1">#ffffff</color>
     <color name="bg_divider">#dddddd</color>
     <color name="bg_action_bar">#555555</color>
@@ -24,6 +28,8 @@
     <color name="bg_delayed">#cccccc</color>
     <color name="bg_current_time">#eebb00</color>
     <color name="bg_position">#757575</color>
+    <color name="bg_position_darkdefault">#bbbbbb</color>
+    <color name="bg_highlighted_darkdefault">#ff4444</color>
     <color name="bg_status_bar">#44000000</color>
     <color name="bg_navigation_bar">@android:color/black</color>
     <color name="bg_navigation_bar_fullscreen">#44000000</color>