issue-714: Merged issue #717 branch, fixed conflicts

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"

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">

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="1"
+    android:previewImage="@drawable/large_forecast_widget_preview"
+    android:resizeMode="none"
+    android:updatePeriodMillis="0"
+    android:widgetCategory="home_screen">
+</appwidget-provider>

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>

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>

android/app/src/main/res/xml/large_widget_provider_info.xml

@@ -2,12 +2,10 @@
 <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:minWidth="226dp"
+    android:maxHeight="144dp"
     android:previewImage="@drawable/large_forecast_widget_preview"
     android:resizeMode="none"
-    android:targetCellWidth="4"
-    android:targetCellHeight="2"
     android:updatePeriodMillis="0"
     android:widgetCategory="home_screen">
 </appwidget-provider>

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>

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>