From 7639babd145dc9e037c87f6129418443e040d9a5 Mon Sep 17 00:00:00 2001
From: ziem <zprzemek@vp.pl>
Date: Thu, 18 Nov 2021 20:17:31 +0100
Subject: [PATCH] Simplify welcome wizard layouts (fixes #1626, fixes #1723)
 (#1727)

---
 .../res/layout/activity_firststart_slide1.xml | 51 +++++++-------
 .../res/layout/activity_firststart_slide2.xml | 63 ++++++++---------
 .../res/layout/activity_firststart_slide3.xml | 67 +++++++++----------
 app/src/main/res/values/dimens.xml            |  1 +
 4 files changed, 82 insertions(+), 100 deletions(-)

diff --git a/app/src/main/res/layout/activity_firststart_slide1.xml b/app/src/main/res/layout/activity_firststart_slide1.xml
index 2319991d..545a3c97 100644
--- a/app/src/main/res/layout/activity_firststart_slide1.xml
+++ b/app/src/main/res/layout/activity_firststart_slide1.xml
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/bg_screen1">
+    android:background="@color/bg_screen1"
+    android:fillViewport="true"
+    android:paddingBottom="@dimen/dots_full_height">
 
     <LinearLayout
-        android:background="@color/bg_screen1"
-        android:gravity="center_horizontal"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
+        android:gravity="center"
         android:orientation="vertical">
 
         <TextView
             android:id="@+id/title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/welcome_title"
+            android:layout_margin="30dp"
             android:gravity="center"
+            android:text="@string/welcome_title"
             android:textColor="@android:color/white"
-            android:textSize="30sp"
-            android:layout_margin="30dp" />
+            android:textSize="30sp" />
 
         <ImageView
             android:layout_width="@dimen/img_width_height"
@@ -36,24 +36,19 @@
             android:textSize="@dimen/slide_title"
             android:textStyle="bold" />
 
-        <ScrollView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/desc_marginTop"
-                android:paddingLeft="@dimen/desc_padding"
-                android:paddingRight="@dimen/desc_padding"
-                android:paddingBottom="@dimen/desc_paddingBottom"
-                android:text="@string/welcome_text"
-                android:textAlignment="center"
-                android:layout_gravity="center_horizontal"
-                android:textColor="@android:color/white"
-                android:textSize="@dimen/slide_desc" />
-
-        </ScrollView>
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="@dimen/desc_marginTop"
+            android:paddingLeft="@dimen/desc_padding"
+            android:paddingRight="@dimen/desc_padding"
+            android:paddingBottom="@dimen/desc_paddingBottom"
+            android:text="@string/welcome_text"
+            android:textAlignment="center"
+            android:textColor="@android:color/white"
+            android:textSize="@dimen/slide_desc" />
 
     </LinearLayout>
-</RelativeLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_firststart_slide2.xml b/app/src/main/res/layout/activity_firststart_slide2.xml
index 2cc5bc4e..990035df 100644
--- a/app/src/main/res/layout/activity_firststart_slide2.xml
+++ b/app/src/main/res/layout/activity_firststart_slide2.xml
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/bg_screen2">
+    android:background="@color/bg_screen2"
+    android:fillViewport="true"
+    android:paddingBottom="@dimen/dots_full_height">
 
     <LinearLayout
-        android:background="@color/bg_screen2"
-        android:gravity="center_horizontal"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
+        android:gravity="center"
         android:orientation="vertical">
 
         <TextView
             android:id="@+id/title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/welcome_title"
+            android:layout_margin="30dp"
             android:gravity="center"
+            android:text="@string/welcome_title"
             android:textColor="@android:color/white"
-            android:textSize="30sp"
-            android:layout_margin="30dp" />
+            android:textSize="30sp" />
 
         <ImageView
             android:layout_width="@dimen/img_width_height"
@@ -33,14 +33,14 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:paddingEnd="40dp"
-            android:paddingLeft="40dp"
-            android:paddingRight="40dp"
-            android:paddingStart="40dp"
-            android:text="@string/grant_permission"
             android:contentDescription="@string/grant_permission"
-            android:drawableLeft="@android:drawable/ic_menu_save"
             android:drawableStart="@android:drawable/ic_menu_save"
+            android:drawableLeft="@android:drawable/ic_menu_save"
+            android:paddingStart="40dp"
+            android:paddingLeft="40dp"
+            android:paddingEnd="40dp"
+            android:paddingRight="40dp"
+            android:text="@string/grant_permission"
             android:textSize="12sp" />
 
         <TextView
@@ -51,26 +51,19 @@
             android:textSize="@dimen/slide_title"
             android:textStyle="bold" />
 
-        <ScrollView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/desc_marginTop"
-                android:paddingLeft="@dimen/desc_padding"
-                android:paddingRight="@dimen/desc_padding"
-                android:paddingBottom="@dimen/desc_paddingBottom"
-                android:text="@string/storage_permission_desc"
-                android:textAlignment="center"
-                android:layout_gravity="center_horizontal"
-                android:textColor="@android:color/white"
-                android:textSize="@dimen/slide_desc" />
-
-        </ScrollView>
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="@dimen/desc_marginTop"
+            android:paddingLeft="@dimen/desc_padding"
+            android:paddingRight="@dimen/desc_padding"
+            android:paddingBottom="@dimen/desc_paddingBottom"
+            android:text="@string/storage_permission_desc"
+            android:textAlignment="center"
+            android:textColor="@android:color/white"
+            android:textSize="@dimen/slide_desc" />
 
     </LinearLayout>
 
-
-</RelativeLayout>
+</ScrollView>
diff --git a/app/src/main/res/layout/activity_firststart_slide3.xml b/app/src/main/res/layout/activity_firststart_slide3.xml
index 2f719cb2..e6a32e8f 100644
--- a/app/src/main/res/layout/activity_firststart_slide3.xml
+++ b/app/src/main/res/layout/activity_firststart_slide3.xml
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/bg_screen3">
+    android:background="@color/bg_screen3"
+    android:fillViewport="true"
+    android:paddingBottom="@dimen/dots_full_height">
 
     <LinearLayout
-        android:background="@color/bg_screen3"
-        android:gravity="center_horizontal"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
+        android:gravity="center"
         android:orientation="vertical">
 
         <TextView
             android:id="@+id/title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/welcome_title"
+            android:layout_margin="30dp"
             android:gravity="center"
+            android:text="@string/welcome_title"
             android:textColor="@android:color/white"
-            android:textSize="30sp"
-            android:layout_margin="30dp" />
+            android:textSize="30sp" />
 
         <ImageView
             android:layout_width="@dimen/img_width_height"
@@ -33,14 +33,14 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:paddingEnd="40dp"
-            android:paddingLeft="40dp"
-            android:paddingRight="40dp"
-            android:paddingStart="40dp"
-            android:text="@string/grant_permission"
             android:contentDescription="@string/grant_permission"
-            android:drawableLeft="@android:drawable/ic_menu_mylocation"
             android:drawableStart="@android:drawable/ic_menu_mylocation"
+            android:drawableLeft="@android:drawable/ic_menu_mylocation"
+            android:paddingStart="40dp"
+            android:paddingLeft="40dp"
+            android:paddingEnd="40dp"
+            android:paddingRight="40dp"
+            android:text="@string/grant_permission"
             android:textSize="12sp" />
 
         <TextView
@@ -48,31 +48,24 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             android:text="@string/location_permission_title"
+            android:textAlignment="center"
             android:textColor="@android:color/white"
             android:textSize="@dimen/slide_title"
-            android:textStyle="bold"
+            android:textStyle="bold" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="@dimen/desc_marginTop"
+            android:paddingLeft="@dimen/desc_padding"
+            android:paddingRight="@dimen/desc_padding"
+            android:paddingBottom="@dimen/desc_paddingBottom"
+            android:text="@string/location_permission_desc"
             android:textAlignment="center"
-            />
-
-        <ScrollView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginTop="@dimen/desc_marginTop"
-                android:paddingLeft="@dimen/desc_padding"
-                android:paddingRight="@dimen/desc_padding"
-                android:paddingBottom="@dimen/desc_paddingBottom"
-                android:text="@string/location_permission_desc"
-                android:textAlignment="center"
-                android:textColor="@android:color/white"
-                android:textSize="@dimen/slide_desc" />
-
-        </ScrollView>
+            android:textColor="@android:color/white"
+            android:textSize="@dimen/slide_desc" />
 
     </LinearLayout>
 
-</RelativeLayout>
+</ScrollView>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 4c4328e7..b8950b12 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -6,6 +6,7 @@
     <!-- Default screen margins, per the Android Design guidelines. -->
     <dimen name="dots_height">30dp</dimen>
     <dimen name="dots_margin_bottom">20dp</dimen>
+    <dimen name="dots_full_height">50dp</dimen>
     <dimen name="img_width_height">120dp</dimen>
     <dimen name="slide_title">30sp</dimen>
     <dimen name="slide_desc">16sp</dimen>