From c65f80f079331580d341c5799d060cf11b51f85a Mon Sep 17 00:00:00 2001
From: Yoshi <dleonavichus@mail.ru>
Date: Mon, 2 Oct 2023 22:55:43 +0300
Subject: [PATCH] widget fix

---
 .../main/java/com/yoshi/rain/OreoWidget.kt    |  4 +-
 .../src/main/res/layout/oreo_widget_big.xml   | 54 +++++++++++++++++++
 android/app/src/main/res/values/dimens.xml    |  8 +--
 android/app/src/main/res/values/strings.xml   |  1 +
 pubspec.lock                                  |  8 +++
 pubspec.yaml                                  |  1 +
 6 files changed, 71 insertions(+), 5 deletions(-)
 create mode 100644 android/app/src/main/res/layout/oreo_widget_big.xml

diff --git a/android/app/src/main/java/com/yoshi/rain/OreoWidget.kt b/android/app/src/main/java/com/yoshi/rain/OreoWidget.kt
index c76a99a..ae61f58 100644
--- a/android/app/src/main/java/com/yoshi/rain/OreoWidget.kt
+++ b/android/app/src/main/java/com/yoshi/rain/OreoWidget.kt
@@ -25,12 +25,14 @@ class OreoWidget : HomeWidgetProvider() {
                 SizeFCompat(40.0f, 0.0f),
                 SizeFCompat(100.0f, 0.0f),
                 SizeFCompat(230.0f, 0.0f),
+                SizeFCompat(280.0f, 0.0f),
             )
             appWidgetManager.updateAppWidget(appWidgetId, supportedSizes) {
                 val layoutId = when (it) {
                     supportedSizes[0] -> R.layout.oreo_widget_mini
                     supportedSizes[1] -> R.layout.oreo_widget_small
-                    else -> R.layout.oreo_widget_medium
+                    supportedSizes[2] -> R.layout.oreo_widget_medium
+                    else -> R.layout.oreo_widget_big
                 }
                 RemoteViews(context.packageName, layoutId).apply {
                     val pendingIntent = HomeWidgetLaunchIntent.getActivity(
diff --git a/android/app/src/main/res/layout/oreo_widget_big.xml b/android/app/src/main/res/layout/oreo_widget_big.xml
new file mode 100644
index 0000000..42ddbae
--- /dev/null
+++ b/android/app/src/main/res/layout/oreo_widget_big.xml
@@ -0,0 +1,54 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    style="@style/Widget.Android.AppWidget.Container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:theme="@style/Theme.Android.AppWidgetContainer"
+    android:id="@+id/widget_day_oreo">
+
+    <LinearLayout
+        android:id="@+id/widget_day_weather"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:orientation="horizontal"
+        android:gravity="center_vertical">
+
+        <TextClock
+            android:id="@+id/widget_day_time"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:fontFamily="@font/ubuntu"
+            android:format12Hour="@string/date_format_widget_oreo_big_style"
+            android:format24Hour="@string/date_format_widget_oreo_big_style"
+            android:shadowDx="1"
+            android:shadowDy="1"
+            android:shadowRadius="1"
+            android:textSize="@dimen/widget_large_title_text_size"
+            tools:ignore="ObsoleteLayoutParam"
+            tools:text="Saturday, September 30 │ " />
+
+        <ImageView
+            android:id="@+id/widget_day_icon"
+            android:layout_width="@dimen/widget_mini_weather_icon_size"
+            android:layout_height="@dimen/widget_mini_weather_icon_size"
+            android:src="@drawable/cloud"
+            tools:ignore="ContentDescription,ImageContrastCheck" />
+
+        <TextView
+            android:id="@+id/widget_day_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/little_margin"
+            android:fontFamily="@font/ubuntu"
+            android:shadowDx="1"
+            android:shadowDy="1"
+            android:shadowRadius="1"
+            android:textAppearance="@android:style/TextAppearance.Material.Large"
+            android:textSize="@dimen/widget_large_title_text_size"
+            tools:text="28°" />
+
+    </LinearLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/android/app/src/main/res/values/dimens.xml b/android/app/src/main/res/values/dimens.xml
index b8414d0..3a20d53 100644
--- a/android/app/src/main/res/values/dimens.xml
+++ b/android/app/src/main/res/values/dimens.xml
@@ -34,8 +34,8 @@
     <!-- text. -->
     <dimen name="main_title_text_size">96sp</dimen>
     <dimen name="design_title_text_size">48sp</dimen>
-    <dimen name="large_title_text_size">20sp</dimen>
-    <dimen name="title_text_size">16sp</dimen>
+    <dimen name="large_title_text_size">22sp</dimen>
+    <dimen name="title_text_size">18sp</dimen>
     <dimen name="content_text_size">14sp</dimen>
     <dimen name="subtitle_text_size">12sp</dimen>
 
@@ -49,8 +49,8 @@
     56dp. -->
     <dimen name="widget_standard_weather_icon_size">48dp</dimen>
     <dimen name="widget_little_weather_icon_size">36dp</dimen>
-    <dimen name="widget_mini_weather_icon_size">24dp</dimen>
-    <dimen name="widget_design_title_text_size">28sp</dimen>
+    <dimen name="widget_mini_weather_icon_size">28dp</dimen>
+    <dimen name="widget_design_title_text_size">24sp</dimen>
     <dimen name="widget_large_title_text_size">@dimen/large_title_text_size</dimen> <!-- 20sp. -->
     <dimen name="widget_title_text_size">@dimen/title_text_size</dimen> <!-- 16sp. -->
     <dimen name="widget_subtitle_text_size">@dimen/subtitle_text_size</dimen> <!-- 12sp. -->
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index ec50bfd..93bed36 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -2,4 +2,5 @@
 <resources>
     <string name="app_widget_description">Oreo Widget</string>
     <string name="date_format_widget_oreo_style">EEE, d MMM │</string>
+    <string name="date_format_widget_oreo_big_style">EEEE, d MMM │</string>
 </resources>
\ No newline at end of file
diff --git a/pubspec.lock b/pubspec.lock
index 8c8d214..71efb8f 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -1058,6 +1058,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "5.0.9"
+  workmanager:
+    dependency: "direct main"
+    description:
+      name: workmanager
+      sha256: ed13530cccd28c5c9959ad42d657cd0666274ca74c56dea0ca183ddd527d3a00
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.5.2"
   xdg_directories:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 92996c3..0fecdfd 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -23,6 +23,7 @@ dependencies:
   geocoding: ^2.1.0
   geolocator: ^10.1.0
   home_widget: ^0.3.0
+  workmanager: ^0.5.2
   google_fonts: ^6.1.0
   flutter_glow: ^0.3.0
   time_machine: ^0.9.17