From 1fea51e28ac94f033eefab81062c821f096d2293 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pekka=20Ker=C3=A4nen?= <pekka.keranen@geosaaga.fi>
Date: Wed, 11 Dec 2024 12:49:45 +0200
Subject: [PATCH 1/3] issue-717: Removed unnecessary files

---
 .../app/src/main/res/layout/weathercell.xml   | 30 ----------
 .../src/main/res/layout/weathercellsmall.xml  | 35 -----------
 android/app/src/main/res/layout/widgetng.xml  | 60 -------------------
 .../res/xml/large_widget_provider_info.xml    |  8 +--
 4 files changed, 4 insertions(+), 129 deletions(-)
 delete mode 100644 android/app/src/main/res/layout/weathercell.xml
 delete mode 100644 android/app/src/main/res/layout/weathercellsmall.xml
 delete mode 100644 android/app/src/main/res/layout/widgetng.xml

diff --git a/android/app/src/main/res/layout/weathercell.xml b/android/app/src/main/res/layout/weathercell.xml
deleted file mode 100644
index 1d7cc7b1..00000000
--- a/android/app/src/main/res/layout/weathercell.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="66dip"
-    android:layout_height="90dip"
-    android:layout_marginBottom="6dip"
-    android:orientation="vertical">
-
-    <TextView
-        android:id="@+id/timeTextView"
-        android:layout_width="40dip"
-        android:layout_height="wrap_content"
-        android:textAlignment="center"
-        android:textColor="@android:color/white"
-        android:textSize="14dp" />
-
-    <ImageView
-        android:id="@+id/weatherIconImageView"
-        android:layout_width="40dip"
-        android:layout_height="48dip"
-        android:src="@android:color/transparent" />
-
-    <TextView
-        android:id="@+id/temperatureTextView"
-        android:layout_width="40dip"
-        android:layout_height="wrap_content"
-        android:text="- "
-        android:textAlignment="center"
-        android:textColor="@android:color/white"
-        android:textSize="16dp" />
-</LinearLayout>
diff --git a/android/app/src/main/res/layout/weathercellsmall.xml b/android/app/src/main/res/layout/weathercellsmall.xml
deleted file mode 100644
index 8f20e6ef..00000000
--- a/android/app/src/main/res/layout/weathercellsmall.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="40dp"
-    android:layout_height="72dp"
-    android:orientation="vertical">
-
-    <TextView
-        android:id="@+id/timeTextView"
-        android:layout_width="40dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:includeFontPadding="true"
-        android:text=""
-        android:textAlignment="center"
-        android:textColor="@android:color/white"
-        android:textSize="13dp" />
-
-    <ImageView
-        android:id="@+id/weatherIconImageView"
-        android:layout_width="34dp"
-        android:layout_height="34dp"
-        android:layout_marginLeft="3dp"
-        android:src="@android:color/transparent" />
-
-    <TextView
-        android:id="@+id/temperatureTextView"
-        android:layout_width="40dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:includeFontPadding="true"
-        android:text="- "
-        android:textAlignment="center"
-        android:textColor="@android:color/white"
-        android:textSize="14dp" />
-</LinearLayout>
diff --git a/android/app/src/main/res/layout/widgetng.xml b/android/app/src/main/res/layout/widgetng.xml
deleted file mode 100644
index fd0fb872..00000000
--- a/android/app/src/main/res/layout/widgetng.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:tools="http://schemas.android.com/tools"
-	android:id="@+id/widget"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:background="@android:color/transparent">
-
-	<LinearLayout
-		android:id="@+id/mainLinearLayout"
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:orientation="vertical"
-		android:paddingBottom="6dp"
-		android:paddingLeft="6dp"
-		android:paddingRight="6dp"
-		android:paddingTop="6dp">
-
-		<TextView
-			android:id="@+id/locationTextView"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:ellipsize="end"
-			android:includeFontPadding="false"
-			android:singleLine="true"
-			android:text="@string/loading"
-			android:textColor="@android:color/white"
-			android:textSize="13dp"
-			android:textStyle="normal|bold" />
-
-		<LinearLayout
-			android:id="@+id/weatherRowLinearLayout"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:orientation="horizontal">
-
-		</LinearLayout>
-
-		<TextView
-			android:id="@+id/observationTitleTextView"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="12dp"
-			android:elevation="12dp"
-			android:ellipsize="end"
-			android:includeFontPadding="false"
-			android:maxLines="1"
-			android:textSize="13dp"
-			android:textColor="@android:color/white"
-			android:textStyle="normal|bold" />
-
-		<LinearLayout
-			android:id="@+id/observationsLinearLayout"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:orientation="horizontal"></LinearLayout>
-
-	</LinearLayout>
-</FrameLayout>
diff --git a/android/app/src/main/res/xml/large_widget_provider_info.xml b/android/app/src/main/res/xml/large_widget_provider_info.xml
index 43724d14..923e9f41 100644
--- a/android/app/src/main/res/xml/large_widget_provider_info.xml
+++ b/android/app/src/main/res/xml/large_widget_provider_info.xml
@@ -2,12 +2,12 @@
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
     android:configure="fi.fmi.mobileweather.LargeForecastWidgetConfigurationActivity"
     android:initialLayout="@layout/large_forecast_widget_layout"
-    android:minWidth="300dp"
-    android:minHeight="100dp"
-    android:previewImage="@drawable/large_forecast_widget_preview"
-    android:resizeMode="none"
     android:targetCellWidth="4"
     android:targetCellHeight="2"
+    android:minWidth="276dp"
+    android:minHeight="220dp"
+    android:previewImage="@drawable/large_forecast_widget_preview"
+    android:resizeMode="none"
     android:updatePeriodMillis="0"
     android:widgetCategory="home_screen">
 </appwidget-provider>

From 81135d5a6d37a94ee440374d3cf6571a2828a317 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pekka=20Ker=C3=A4nen?= <pekka.keranen@geosaaga.fi>
Date: Wed, 11 Dec 2024 13:59:21 +0200
Subject: [PATCH 2/3] issue-717: Layout experiments

---
 .../main/res/layout/large_forecast_widget_layout.xml  |  8 +++++++-
 .../main/res/xml-v31/large_widget_provider_info.xml   | 11 +++++++++++
 .../src/main/res/xml/large_widget_provider_info.xml   |  6 ++----
 3 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 android/app/src/main/res/xml-v31/large_widget_provider_info.xml

diff --git a/android/app/src/main/res/layout/large_forecast_widget_layout.xml b/android/app/src/main/res/layout/large_forecast_widget_layout.xml
index 38e02397..fd83d4c2 100644
--- a/android/app/src/main/res/layout/large_forecast_widget_layout.xml
+++ b/android/app/src/main/res/layout/large_forecast_widget_layout.xml
@@ -44,13 +44,15 @@
             android:id="@+id/hourForecastRowLayout"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:orientation="horizontal">
+            android:orientation="horizontal"
+            >
 
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="6dp"
                 android:layout_marginBottom="6dp"
+                android:paddingHorizontal="8dp"
                 android:orientation="vertical">
 
                 <TextView
@@ -90,6 +92,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="6dp"
                 android:layout_marginBottom="6dp"
+                android:paddingHorizontal="8dp"
                 android:orientation="vertical">
 
                 <TextView
@@ -128,6 +131,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="6dp"
                 android:layout_marginBottom="6dp"
+                android:paddingHorizontal="8dp"
                 android:orientation="vertical">
 
                 <TextView
@@ -166,6 +170,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="6dp"
                 android:layout_marginBottom="6dp"
+                android:paddingHorizontal="8dp"
                 android:orientation="vertical">
 
                 <TextView
@@ -204,6 +209,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="6dp"
                 android:layout_marginBottom="6dp"
+                android:paddingHorizontal="8dp"
                 android:orientation="vertical">
 
                 <TextView
diff --git a/android/app/src/main/res/xml-v31/large_widget_provider_info.xml b/android/app/src/main/res/xml-v31/large_widget_provider_info.xml
new file mode 100644
index 00000000..f5aa42c8
--- /dev/null
+++ b/android/app/src/main/res/xml-v31/large_widget_provider_info.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
+    android:configure="fi.fmi.mobileweather.LargeForecastWidgetConfigurationActivity"
+    android:initialLayout="@layout/large_forecast_widget_layout"
+    android:targetCellWidth="4"
+    android:targetCellHeight="2"
+    android:previewImage="@drawable/large_forecast_widget_preview"
+    android:resizeMode="none"
+    android:updatePeriodMillis="0"
+    android:widgetCategory="home_screen">
+</appwidget-provider>
diff --git a/android/app/src/main/res/xml/large_widget_provider_info.xml b/android/app/src/main/res/xml/large_widget_provider_info.xml
index 923e9f41..092b3c3c 100644
--- a/android/app/src/main/res/xml/large_widget_provider_info.xml
+++ b/android/app/src/main/res/xml/large_widget_provider_info.xml
@@ -2,10 +2,8 @@
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
     android:configure="fi.fmi.mobileweather.LargeForecastWidgetConfigurationActivity"
     android:initialLayout="@layout/large_forecast_widget_layout"
-    android:targetCellWidth="4"
-    android:targetCellHeight="2"
-    android:minWidth="276dp"
-    android:minHeight="220dp"
+    android:minWidth="226dp"
+    android:maxHeight="144dp"
     android:previewImage="@drawable/large_forecast_widget_preview"
     android:resizeMode="none"
     android:updatePeriodMillis="0"

From 1533172b3ba176fe8ff3af6a45029ad06fa40674 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pekka=20Ker=C3=A4nen?= <pekka.keranen@geosaaga.fi>
Date: Thu, 12 Dec 2024 09:34:46 +0200
Subject: [PATCH 3/3] issue-717: More widget size experiments

---
 .../layout/large_forecast_widget_layout.xml   | 25 +++++--------------
 .../res/layout/max_forecast_widget_layout.xml |  4 +--
 .../xml-v31/large_widget_provider_info.xml    |  2 +-
 .../res/xml-v31/max_widget_provider_info.xml  | 11 ++++++++
 .../xml-v31/small_widget_provider_info.xml    | 15 +++++++++++
 .../main/res/xml/max_widget_provider_info.xml |  2 --
 .../res/xml/small_widget_provider_info.xml    |  4 ---
 7 files changed, 35 insertions(+), 28 deletions(-)
 create mode 100644 android/app/src/main/res/xml-v31/max_widget_provider_info.xml
 create mode 100644 android/app/src/main/res/xml-v31/small_widget_provider_info.xml

diff --git a/android/app/src/main/res/layout/large_forecast_widget_layout.xml b/android/app/src/main/res/layout/large_forecast_widget_layout.xml
index fd83d4c2..ad92f87d 100644
--- a/android/app/src/main/res/layout/large_forecast_widget_layout.xml
+++ b/android/app/src/main/res/layout/large_forecast_widget_layout.xml
@@ -1,8 +1,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/mainLinearLayout"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:background="@android:color/white"
     android:orientation="vertical"
     android:padding="16dp">
@@ -17,7 +17,9 @@
             android:id="@+id/locationLayout"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:orientation="horizontal">
+            android:orientation="horizontal"
+            android:gravity="top"
+            >
 
             <TextView
                 android:id="@+id/locationNameTextView"
@@ -45,6 +47,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
+            android:gravity="bottom"
             >
 
             <LinearLayout
@@ -52,7 +55,6 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="6dp"
                 android:layout_marginBottom="6dp"
-                android:paddingHorizontal="8dp"
                 android:orientation="vertical">
 
                 <TextView
@@ -92,7 +94,6 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="6dp"
                 android:layout_marginBottom="6dp"
-                android:paddingHorizontal="8dp"
                 android:orientation="vertical">
 
                 <TextView
@@ -131,7 +132,6 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="6dp"
                 android:layout_marginBottom="6dp"
-                android:paddingHorizontal="8dp"
                 android:orientation="vertical">
 
                 <TextView
@@ -170,7 +170,6 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="6dp"
                 android:layout_marginBottom="6dp"
-                android:paddingHorizontal="8dp"
                 android:orientation="vertical">
 
                 <TextView
@@ -209,7 +208,6 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="6dp"
                 android:layout_marginBottom="6dp"
-                android:paddingHorizontal="8dp"
                 android:orientation="vertical">
 
                 <TextView
@@ -264,17 +262,6 @@
             tools:text="Viranomaistiedote: 13.11.2024 klo: 11.00: Alueella Lauttasaaren ranni..."
             tools:visibility="visible" />
 
-        <TextView
-            android:id="@+id/updateTimeTextView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:textColor="@android:color/black"
-            android:textSize="10sp"
-            android:visibility="visible"
-            tools:ignore="SmallSp"
-            tools:text="11.34.24" />
-
     </LinearLayout>
 
     <LinearLayout
diff --git a/android/app/src/main/res/layout/max_forecast_widget_layout.xml b/android/app/src/main/res/layout/max_forecast_widget_layout.xml
index 4618be98..c4bcca68 100644
--- a/android/app/src/main/res/layout/max_forecast_widget_layout.xml
+++ b/android/app/src/main/res/layout/max_forecast_widget_layout.xml
@@ -2,8 +2,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/mainLinearLayout"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:background="@android:color/white"
     android:orientation="vertical"
     android:padding="16dp">
diff --git a/android/app/src/main/res/xml-v31/large_widget_provider_info.xml b/android/app/src/main/res/xml-v31/large_widget_provider_info.xml
index f5aa42c8..7ca86ce5 100644
--- a/android/app/src/main/res/xml-v31/large_widget_provider_info.xml
+++ b/android/app/src/main/res/xml-v31/large_widget_provider_info.xml
@@ -3,7 +3,7 @@
     android:configure="fi.fmi.mobileweather.LargeForecastWidgetConfigurationActivity"
     android:initialLayout="@layout/large_forecast_widget_layout"
     android:targetCellWidth="4"
-    android:targetCellHeight="2"
+    android:targetCellHeight="1"
     android:previewImage="@drawable/large_forecast_widget_preview"
     android:resizeMode="none"
     android:updatePeriodMillis="0"
diff --git a/android/app/src/main/res/xml-v31/max_widget_provider_info.xml b/android/app/src/main/res/xml-v31/max_widget_provider_info.xml
new file mode 100644
index 00000000..c798f178
--- /dev/null
+++ b/android/app/src/main/res/xml-v31/max_widget_provider_info.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
+    android:configure="fi.fmi.mobileweather.MaxForecastWidgetConfigurationActivity"
+    android:initialLayout="@layout/max_forecast_widget_layout"
+    android:previewImage="@drawable/max_forecast_widget_preview"
+    android:resizeMode="none"
+    android:targetCellWidth="4"
+    android:targetCellHeight="2"
+    android:updatePeriodMillis="0"
+    android:widgetCategory="home_screen">
+</appwidget-provider>
diff --git a/android/app/src/main/res/xml-v31/small_widget_provider_info.xml b/android/app/src/main/res/xml-v31/small_widget_provider_info.xml
new file mode 100644
index 00000000..bd88c604
--- /dev/null
+++ b/android/app/src/main/res/xml-v31/small_widget_provider_info.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
+    android:configure="fi.fmi.mobileweather.SmallForecastWidgetConfigurationActivity"
+    android:initialLayout="@layout/xs_forecast_widget_layout"
+    android:maxResizeWidth="700dp"
+    android:maxResizeHeight="200dp"
+    android:minWidth="40dp"
+    android:minHeight="40dp"
+    android:previewImage="@drawable/small_widget_preview"
+    android:resizeMode="horizontal|vertical"
+    android:targetCellWidth="2"
+    android:targetCellHeight="2"
+    android:updatePeriodMillis="0"
+    android:widgetCategory="home_screen">
+</appwidget-provider>
diff --git a/android/app/src/main/res/xml/max_widget_provider_info.xml b/android/app/src/main/res/xml/max_widget_provider_info.xml
index e6099888..6d25b263 100644
--- a/android/app/src/main/res/xml/max_widget_provider_info.xml
+++ b/android/app/src/main/res/xml/max_widget_provider_info.xml
@@ -6,8 +6,6 @@
     android:minHeight="100dp"
     android:previewImage="@drawable/max_forecast_widget_preview"
     android:resizeMode="none"
-    android:targetCellWidth="4"
-    android:targetCellHeight="3"
     android:updatePeriodMillis="0"
     android:widgetCategory="home_screen">
 </appwidget-provider>
diff --git a/android/app/src/main/res/xml/small_widget_provider_info.xml b/android/app/src/main/res/xml/small_widget_provider_info.xml
index bd88c604..c74651b7 100644
--- a/android/app/src/main/res/xml/small_widget_provider_info.xml
+++ b/android/app/src/main/res/xml/small_widget_provider_info.xml
@@ -2,14 +2,10 @@
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
     android:configure="fi.fmi.mobileweather.SmallForecastWidgetConfigurationActivity"
     android:initialLayout="@layout/xs_forecast_widget_layout"
-    android:maxResizeWidth="700dp"
-    android:maxResizeHeight="200dp"
     android:minWidth="40dp"
     android:minHeight="40dp"
     android:previewImage="@drawable/small_widget_preview"
     android:resizeMode="horizontal|vertical"
-    android:targetCellWidth="2"
-    android:targetCellHeight="2"
     android:updatePeriodMillis="0"
     android:widgetCategory="home_screen">
 </appwidget-provider>