fix: widget color issues (closes #91)

you-apps · Apr 17, 2024 · ee5e444 · ee5e444
1 parent 539193e
commit ee5e444
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 33 deletions.
diff --git a/app/src/main/res/drawable/widget_shape.xml b/app/src/main/res/drawable/widget_shape.xml
@@ -1,13 +1,8 @@
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle" >
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+        android:shape="rectangle">
 
-    <solid
-        android:color="?attr/colorSecondaryContainer" >
-    </solid>
+    <solid android:color="?attr/colorSurfaceContainer" />
 
-    <corners
-        android:radius="60dp"   >
-    </corners>
+    <corners android:radius="60dp" />
 
 </shape>
diff --git a/app/src/main/res/layout-v31/analog_clock.xml b/app/src/main/res/layout-v31/analog_clock.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:theme="@style/Theme.Material3.DynamicColors.DayNight">
+
+    <AnalogClock
+            android:id="@+id/analog_clock"
+            android:layout_gravity="center"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:hand_hourTint="?attr/colorSecondary"
+            android:hand_minuteTint="?attr/colorPrimary"
+            android:dialTint="?attr/colorSurfaceContainer" />
+
+</FrameLayout>
diff --git a/app/src/main/res/layout/analog_clock.xml b/app/src/main/res/layout/analog_clock.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" >
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:theme="@style/Theme.Material3.DynamicColors.DayNight">
 
     <AnalogClock
-        android:id="@+id/analog_clock"
-        android:layout_gravity="center"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
+            android:id="@+id/analog_clock"
+            android:layout_gravity="center"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
 
 </FrameLayout>
diff --git a/app/src/main/res/layout/digital_clock.xml b/app/src/main/res/layout/digital_clock.xml
@@ -19,7 +19,7 @@
         <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textColor="@color/widgetSecondaryTextColor"
+                android:textColor="?attr/colorSecondary"
                 android:text="America"
                 android:visibility="gone"
                 android:textSize="@dimen/_8sdp"
@@ -30,7 +30,7 @@
                 android:layout_height="wrap_content"
                 android:format12Hour="EE, MMM dd"
                 android:format24Hour="EE, MMM dd"
-                android:textColor="@color/widgetSecondaryTextColor"
+                android:textColor="?attr/colorSecondary"
                 android:text="Today"
                 android:textSize="@dimen/_8sdp"
                 android:id="@+id/textClock" />
@@ -41,7 +41,7 @@
                 android:layout_marginTop="@dimen/_minus2sdp"
                 android:format12Hour="hh:mm"
                 android:format24Hour="kk:mm"
-                android:textColor="@color/widgetPrimaryTextColor"
+                android:textColor="?attr/colorPrimary"
                 android:textSize="@dimen/_40sdp"
                 android:textStyle="bold"
                 android:text="12:34"

diff --git a/app/src/main/res/layout/vertical_clock.xml b/app/src/main/res/layout/vertical_clock.xml
@@ -22,7 +22,7 @@
                 android:format24Hour="EE, MMM dd"
                 android:text="Today"
                 android:textSize="@dimen/_8sdp"
-                android:textColor="@color/widgetSecondaryTextColor" />
+                android:textColor="?attr/colorSecondary" />
 
         <TextClock
                 android:layout_width="wrap_content"
@@ -33,7 +33,7 @@
                 android:format24Hour="kk"
                 android:text="12"
                 android:textStyle="bold"
-                android:textColor="@color/widgetPrimaryTextColor"
+                android:textColor="?attr/colorPrimary"
                 android:textSize="@dimen/_60sdp" />
 
         <TextClock
@@ -43,7 +43,7 @@
                 android:format12Hour="mm"
                 android:format24Hour="mm"
                 android:text="34"
-                android:textColor="@color/widgetPrimaryTextColor"
+                android:textColor="?attr/colorPrimary"
                 android:textSize="@dimen/_60sdp"
                 android:textStyle="bold"
                 android:layout_marginTop="@dimen/_minus25sdp" />

diff --git a/app/src/main/res/values-night-v31/colors.xml b/app/src/main/res/values-night-v31/colors.xml
diff --git a/app/src/main/res/values-v31/colors.xml b/app/src/main/res/values-v31/colors.xml
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="windowBackground">#FFFFFFFF</color>
-    <color name="widgetPrimaryTextColor">?attr/colorOnSecondaryContainer</color>
-    <color name="widgetSecondaryTextColor">?attr/colorOnSecondaryContainer</color>
 </resources>