Simplify and add Dark Mode to Calendar Widget on Android

TUM-Dev · Oct 17, 2024 · 63d7d50 · 63d7d50
1 parent 8db5691
commit 63d7d50
Show file tree

Hide file tree

Showing 17 changed files with 42 additions and 125 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -44,7 +44,7 @@ android {
 
     defaultConfig {
         applicationId "de.tum.in.tumcampus"
-        minSdkVersion 26
+        minSdkVersion 29
         targetSdkVersion flutter.targetSdkVersion
         ndkVersion "26.1.10909125"
         versionCode flutterVersionCode.toInteger()

diff --git a/android/app/src/main/res/color/widget_header_color.xml b/android/app/src/main/res/color/widget_header_color.xml
diff --git a/android/app/src/main/res/drawable-v21/app_widget_background.xml b/android/app/src/main/res/drawable-v21/app_widget_background.xml
diff --git a/android/app/src/main/res/drawable-v21/app_widget_inner_view_background.xml b/android/app/src/main/res/drawable-v21/app_widget_inner_view_background.xml
diff --git a/android/app/src/main/res/drawable/ic_filter_list.xml b/android/app/src/main/res/drawable/ic_filter_list.xml
diff --git a/android/app/src/main/res/drawable/widget_content_rounded_corners_background.xml b/android/app/src/main/res/drawable/widget_content_rounded_corners_background.xml
diff --git a/android/app/src/main/res/drawable/widget_header_rounded_corners_background.xml b/android/app/src/main/res/drawable/widget_header_rounded_corners_background.xml
diff --git a/android/app/src/main/res/layout/calendar_widget.xml b/android/app/src/main/res/layout/calendar_widget.xml
@@ -2,11 +2,12 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/calendar_widget"
+    style="@style/Widget.AppWidget.AppWidget.Container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/widget_content_rounded_corners_background"
     android:orientation="vertical"
-    android:padding="@dimen/widget_margin">
+    android:padding="@dimen/widget_margin"
+    android:theme="@style/Theme.AppWidget.AppWidgetContainer">
 
     <LinearLayout
         android:id="@+id/calendar_widget_header"
@@ -24,7 +25,7 @@
             android:layout_weight="1"
             android:fontFamily="sans-serif-medium"
             android:textAlignment="viewStart"
-            android:textColor="@color/text_primary"
+            android:textColor="?android:attr/textColorPrimary"
             android:textSize="16sp"
             tools:text="Date" />
 
@@ -34,7 +35,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:textAlignment="viewEnd"
-            android:textColor="@color/text_primary"
+            android:textColor="?android:attr/textColorPrimary"
             android:textSize="14sp"
             tools:text="Date" />
 
@@ -58,7 +59,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:text="@string/calendar_widget_no_lectures"
-            android:textColor="@color/text_dark_gray"
+            android:textColor="?android:attr/textColorPrimary"
             android:visibility="gone"
             tools:visibility="visible" />
 
@@ -69,7 +70,7 @@
             android:layout_gravity="center"
             android:text="@string/calendar_widget_old_data"
             android:textAlignment="center"
-            android:textColor="@color/text_primary"
+            android:textColor="?android:attr/textColorPrimary"
             android:visibility="gone"
             tools:visibility="visible" />
 

diff --git a/android/app/src/main/res/layout/calendar_widget_item.xml b/android/app/src/main/res/layout/calendar_widget_item.xml
@@ -12,6 +12,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="38dp"
+        android:textColor="?android:attr/textColorPrimary"
         android:visibility="gone"
         tools:text="Month"
         tools:visibility="visible" />
@@ -28,6 +29,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:background="@android:color/transparent"
+            android:textColor="?android:attr/textColorPrimary"
             android:textSize="18sp"
             android:textStyle="bold"
             tools:text="8" />
@@ -39,6 +41,7 @@
             android:layout_marginTop="-6dp"
             android:layout_weight="1"
             android:background="@android:color/transparent"
+            android:textColor="?android:attr/textColorPrimary"
             android:textSize="13sp"
             tools:text="Do." />
 

diff --git a/android/app/src/main/res/values-de/strings.xml b/android/app/src/main/res/values-de/strings.xml
@@ -12,23 +12,23 @@
     <string name="just_now">Gerade eben</string>
     <string name="yesterday">Gestern</string>
     <plurals name="yearsAgo">
-        <item quantity="one">Vor 1 Jahr</item>
+        <item quantity="one">Vor %d Jahr</item>
         <item quantity="other">Vor %d Jahren</item>
     </plurals>
     <plurals name="monthsAgo">
-        <item quantity="one">Vor 1 Monaten</item>
+        <item quantity="one">Vor %d Monaten</item>
         <item quantity="other">Vor %d Monaten</item>
     </plurals>
     <plurals name="daysAgo">
-        <item quantity="one">Vor 1 Tag</item>
+        <item quantity="one">Vor %d Tag</item>
         <item quantity="other">Vor %d Tagen</item>
     </plurals>
     <plurals name="hoursAgo">
-        <item quantity="one">Vor 1 Stunde</item>
+        <item quantity="one">Vor %d Stunde</item>
         <item quantity="other">Vor %d Stunden</item>
     </plurals>
     <plurals name="minutesAgo">
-        <item quantity="one">Vor 1 Minute</item>
+        <item quantity="one">Vor %d Minute</item>
         <item quantity="other">Vor %d Minuten</item>
     </plurals>
 </resources>
diff --git a/android/app/src/main/res/values-night-v31/themes.xml b/android/app/src/main/res/values-night-v31/themes.xml
diff --git a/android/app/src/main/res/values-v21/styles.xml b/android/app/src/main/res/values-v21/styles.xml
diff --git a/android/app/src/main/res/values-v31/styles.xml b/android/app/src/main/res/values-v31/styles.xml
diff --git a/android/app/src/main/res/values-v31/themes.xml b/android/app/src/main/res/values-v31/themes.xml
@@ -1,11 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2019 Google LLC.
+SPDX-License-Identifier: Apache-2.0 -->
 <resources>
-    <!--
-    Having themes.xml for v31 variant because @android:dimen/system_app_widget_background_radius
-     and @android:dimen/system_app_widget_internal_padding requires API level 31
-    -->
-    <style name="Theme.Android.AppWidgetContainerParent" parent="@android:style/Theme.DeviceDefault.DayNight">
-        <item name="appWidgetRadius">@android:dimen/system_app_widget_background_radius</item>
-        <item name="appWidgetInnerRadius">@android:dimen/system_app_widget_inner_radius</item>
+
+    <style name="Theme.AppWidget.AppWidgetContainerParent" parent="@android:style/Theme.DeviceDefault.DayNight">
+        <item name="appWidgetRadius">
+            @android:dimen/system_app_widget_background_radius
+        </item>
+        <item name="appWidgetInnerRadius">
+            @android:dimen/system_app_widget_inner_radius
+        </item>
     </style>
+
 </resources>
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
@@ -13,23 +13,23 @@
     <string name="yesterday">Yesterday</string>
     <string name="event_start_end_format_string" translatable="false">%1$s–%2$s</string>
     <plurals name="yearsAgo">
-        <item quantity="one">1 year ago</item>
+        <item quantity="one">%d year ago</item>
         <item quantity="other">%d years ago</item>
     </plurals>
     <plurals name="monthsAgo">
-        <item quantity="one">1 month ago</item>
+        <item quantity="one">%d month ago</item>
         <item quantity="other">%d months ago</item>
     </plurals>
     <plurals name="daysAgo">
-        <item quantity="one">1 day ago</item>
+        <item quantity="one">%d day ago</item>
         <item quantity="other">%d days ago</item>
     </plurals>
     <plurals name="hoursAgo">
-        <item quantity="one">1 hour ago</item>
+        <item quantity="one">%d hour ago</item>
         <item quantity="other">%d hours ago</item>
     </plurals>
     <plurals name="minutesAgo">
-        <item quantity="one">1 minute ago</item>
+        <item quantity="one">%d minute ago</item>
         <item quantity="other">%d minutes ago</item>
     </plurals>
 </resources>
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
@@ -16,13 +16,13 @@
         <item name="android:windowBackground">?android:colorBackground</item>
     </style>
 
-    <style name="Widget.Android.AppWidget.Container" parent="android:Widget">
+    <style name="Widget.AppWidget.AppWidget.Container" parent="android:Widget">
         <item name="android:id">@android:id/background</item>
         <item name="android:background">?android:attr/colorBackground</item>
     </style>
 
-    <style name="Widget.Android.AppWidget.InnerView" parent="android:Widget">
+    <style name="Widget.AppWidget.AppWidget.InnerView" parent="android:Widget">
+        <item name="android:padding">?attr/appWidgetPadding</item>
         <item name="android:background">?android:attr/colorBackground</item>
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
     </style>
 </resources>
diff --git a/android/app/src/main/res/values/themes.xml b/android/app/src/main/res/values/themes.xml
@@ -1,16 +1,16 @@
+<!-- Copyright 2019 Google LLC.
+SPDX-License-Identifier: Apache-2.0 -->
 <resources>
 
-    <style name="Theme.Android.AppWidgetContainerParent" parent="@android:style/Theme.DeviceDefault">
-        <!-- Radius of the outer bound of widgets to make the rounded corners -->
+    <style name="Theme.AppWidget.AppWidgetContainerParent" parent="@android:style/Theme.DeviceDefault">
+        <!-- Radius of the outer bound of widgets to make the rounded
+            corners -->
         <item name="appWidgetRadius">16dp</item>
-        <!--
-        Radius of the inner view's bound of widgets to make the rounded corners.
-        It needs to be 8dp or less than the value of appWidgetRadius
-        -->
+        <!-- Radius of the inner view's bound of widgets to make the rounded corners. It needs to be 8dp or less than the value of appWidgetRadius -->
         <item name="appWidgetInnerRadius">8dp</item>
     </style>
 
-    <style name="Theme.Android.AppWidgetContainer" parent="Theme.Android.AppWidgetContainerParent">
+    <style name="Theme.AppWidget.AppWidgetContainer" parent="Theme.AppWidget.AppWidgetContainerParent">
         <!-- Apply padding to avoid the content of the widget colliding with the rounded corners -->
         <item name="appWidgetPadding">16dp</item>
     </style>