From cbc68f5a4b94efccb5eba59163bbf048bf202514 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Fri, 12 Apr 2019 09:37:42 +0200
Subject: [PATCH] Added scrollview around about page

---
 app/src/main/res/layout-land/about.xml | 288 +++++++++++++------------
 app/src/main/res/layout/about.xml      | 253 +++++++++++-----------
 2 files changed, 285 insertions(+), 256 deletions(-)

diff --git a/app/src/main/res/layout-land/about.xml b/app/src/main/res/layout-land/about.xml
index 564269fb1..c892516d5 100644
--- a/app/src/main/res/layout-land/about.xml
+++ b/app/src/main/res/layout-land/about.xml
@@ -5,152 +5,168 @@
     android:background="?attr/backgroundColor"
     android:orientation="vertical">
 
-    <LinearLayout
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_gravity="center"
-        android:layout_weight="1"
-        android:background="@color/dark_grey_color"
-        android:baselineAligned="false"
-        android:orientation="horizontal">
+        android:layout_height="match_parent">
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_weight="1"
-            android:gravity="center"
+            android:layout_height="match_parent"
             android:orientation="vertical">
 
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="60dp"
-                android:layout_gravity="center"
-                android:src="@drawable/splashscreen" />
-
-            <TextView
-                android:textColor="?attr/secondaryTextColor"
-                android:textAllCaps="true"
-                android:textSize="16sp"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:paddingTop="5dp"
-                android:text="@string/app_name"
-                android:visibility="gone" />
-
-            <TextView
-                android:textSize="13sp"
-                android:textColor="?accentColor"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="@string/app_description" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/about_android_version"
-                style="@style/about_version_font"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="left"
-                android:text="@string/about_version" />
-
-            <TextView
-                android:id="@+id/about_liblinphone_sdk_version"
-                style="@style/about_version_font"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="left"
-                android:text="@string/about_liblinphone_sdk_version" />
-        </LinearLayout>
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_gravity="center"
-        android:layout_weight="1"
-        android:background="?attr/backgroundColor"
-        android:orientation="vertical"
-        android:padding="10dp">
-
-        <TextView
-            android:id="@+id/about_link"
-            style="@style/link_font"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:autoLink="web"
-            android:gravity="center"
-            android:text="@string/about_link"
-            android:textColorLink="@color/primary_color" />
-
-        <TextView
-            android:id="@+id/privaci_policy_link"
-            style="@style/link_font"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:autoLink="web"
-            android:paddingTop="10dp"
-            android:gravity="center"
-            android:text="@string/about_privacy_policy"
-            android:textColorLink="@color/primary_color"/>
-
-        <TextView
-            android:id="@+id/about_text"
-            style="@style/about_license_font"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:gravity="center"
-            android:paddingTop="10dp"
-            android:paddingBottom="20dp"
-            android:text="@string/about_text" />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="?attr/dividerColor" />
-
-        <LinearLayout
-            android:background="?attr/backgroundColor"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:paddingTop="20dp"
-            android:orientation="horizontal">
-
-            <Button
-                android:id="@+id/send_log"
-                style="android:attr/buttonBarButtonStyleStyle"
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_margin="5dp"
-                android:background="?attr/button_background_drawable"
-                android:text="@string/menu_send_log" />
+                android:layout_height="match_parent"
+                android:layout_gravity="center"
+                android:layout_weight="1"
+                android:background="@color/dark_grey_color"
+                android:baselineAligned="false"
+                android:padding="20dp"
+                android:orientation="horizontal">
 
-            <Button
-                android:id="@+id/reset_log"
-                style="android:attr/buttonBarButtonStyleStyle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="5dp"
-                android:background="?attr/button_background_drawable"
-                android:text="@string/menu_reset_log" />
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:orientation="vertical">
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="60dp"
+                        android:layout_gravity="center"
+                        android:src="@drawable/splashscreen" />
+
+                    <TextView
+                        android:textColor="?attr/secondaryTextColor"
+                        android:textAllCaps="true"
+                        android:textSize="16sp"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:paddingTop="5dp"
+                        android:text="@string/app_name"
+                        android:visibility="gone" />
+
+                    <TextView
+                        android:textSize="13sp"
+                        android:textColor="?accentColor"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:text="@string/app_description" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:id="@+id/about_android_version"
+                        style="@style/about_version_font"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="left"
+                        android:text="@string/about_version" />
+
+                    <TextView
+                        android:id="@+id/about_liblinphone_sdk_version"
+                        style="@style/about_version_font"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="left"
+                        android:text="@string/about_liblinphone_sdk_version" />
+                </LinearLayout>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_gravity="center"
+                android:layout_weight="1"
+                android:background="?attr/backgroundColor"
+                android:orientation="vertical"
+                android:padding="10dp">
+
+                <TextView
+                    android:id="@+id/about_link"
+                    style="@style/link_font"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:autoLink="web"
+                    android:gravity="center"
+                    android:text="@string/about_link"
+                    android:textColorLink="@color/primary_color" />
+
+                <TextView
+                    android:id="@+id/privaci_policy_link"
+                    style="@style/link_font"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:autoLink="web"
+                    android:paddingTop="10dp"
+                    android:gravity="center"
+                    android:text="@string/about_privacy_policy"
+                    android:textColorLink="@color/primary_color"/>
+
+                <TextView
+                    android:id="@+id/about_text"
+                    style="@style/about_license_font"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:gravity="center"
+                    android:paddingTop="10dp"
+                    android:paddingBottom="20dp"
+                    android:text="@string/about_text" />
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="?attr/dividerColor" />
+
+                <LinearLayout
+                    android:background="?attr/backgroundColor"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:paddingTop="20dp"
+                    android:orientation="horizontal">
+
+                    <Button
+                        android:id="@+id/send_log"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="5dp"
+                        android:background="@drawable/assistant_button"
+                        android:textColor="@drawable/assistant_button_text_color"
+                        style="@style/button_font"
+                        android:text="@string/menu_send_log" />
+
+                    <Button
+                        android:id="@+id/reset_log"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="5dp"
+                        android:background="@drawable/assistant_button"
+                        android:textColor="@drawable/assistant_button_text_color"
+                        style="@style/button_font"
+                        android:text="@string/menu_reset_log" />
+
+                </LinearLayout>
+
+            </LinearLayout>
 
         </LinearLayout>
 
-    </LinearLayout>
+    </ScrollView>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/about.xml b/app/src/main/res/layout/about.xml
index 9064f6f4b..b681505f2 100644
--- a/app/src/main/res/layout/about.xml
+++ b/app/src/main/res/layout/about.xml
@@ -5,134 +5,147 @@
     android:background="?attr/backgroundColor"
     android:orientation="vertical">
 
-    <LinearLayout
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_gravity="center"
-        android:layout_weight="1"
-        android:background="?attr/backgroundContastColor"
-        android:gravity="center"
-        android:orientation="vertical"
-        android:padding="10dp">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="80dp"
-            android:layout_gravity="center"
-            android:src="@drawable/splashscreen" />
-
-        <TextView
-            android:textSize="13sp"
-            android:textColor="?accentColor"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:text="@string/app_description" />
-
-        <TextView
-            android:id="@+id/about_android_version"
-            style="@style/about_version_font"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:gravity="center"
-            android:paddingTop="20dp"
-            android:textColorLink="?attr/secondaryTextColor"
-            android:text="@string/about_version" />
-
-        <TextView
-            android:id="@+id/about_liblinphone_sdk_version"
-            style="@style/about_version_font"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:gravity="center"
-            android:textColorLink="?attr/secondaryTextColor"
-            android:text="@string/about_liblinphone_sdk_version" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_gravity="center"
-        android:layout_weight="1"
-        android:orientation="vertical"
-        android:background="?attr/backgroundColor"
-        android:padding="10dp">
-
-        <TextView
-            android:id="@+id/about_link"
-            style="@style/link_font"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:autoLink="web"
-            android:gravity="center"
-            android:paddingTop="20dp"
-            android:text="@string/about_link"
-            android:textColorLink="@color/primary_color" />
-
-        <TextView
-            android:id="@+id/privaci_policy_link"
-            style="@style/link_font"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:autoLink="web"
-            android:paddingTop="10dp"
-            android:gravity="center"
-            android:text="@string/about_privacy_policy"
-            android:textColorLink="@color/primary_color" />
-
-        <TextView
-            android:id="@+id/about_text"
-            style="@style/about_license_font"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:gravity="center"
-            android:paddingTop="10dp"
-            android:paddingBottom="20dp"
-            android:text="@string/about_text" />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="?attr/dividerColor" />
+        android:layout_height="match_parent">
 
         <LinearLayout
-            android:background="?attr/backgroundColor"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:paddingTop="20dp"
-            android:orientation="horizontal">
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
 
-            <Button
-                android:id="@+id/send_log"
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_margin="5dp"
-                android:background="@drawable/assistant_button"
-                android:textColor="@drawable/assistant_button_text_color"
-                style="@style/button_font"
-                android:padding="10dp"
-                android:text="@string/menu_send_log" />
+                android:layout_height="match_parent"
+                android:layout_gravity="center"
+                android:layout_weight="1"
+                android:background="?attr/backgroundContastColor"
+                android:gravity="center"
+                android:orientation="vertical"
+                android:padding="20dp">
 
-            <Button
-                android:id="@+id/reset_log"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="5dp"
-                android:background="@drawable/assistant_button"
-                android:textColor="@drawable/assistant_button_text_color"
-                style="@style/button_font"
-                android:padding="10dp"
-                android:text="@string/menu_reset_log" />
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="80dp"
+                    android:layout_gravity="center"
+                    android:src="@drawable/splashscreen" />
+
+                <TextView
+                    android:textSize="13sp"
+                    android:textColor="?accentColor"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:text="@string/app_description" />
+
+                <TextView
+                    android:id="@+id/about_android_version"
+                    style="@style/about_version_font"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:gravity="center"
+                    android:paddingTop="20dp"
+                    android:textColorLink="?attr/secondaryTextColor"
+                    android:text="@string/about_version" />
+
+                <TextView
+                    android:id="@+id/about_liblinphone_sdk_version"
+                    style="@style/about_version_font"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:gravity="center"
+                    android:textColorLink="?attr/secondaryTextColor"
+                    android:text="@string/about_liblinphone_sdk_version" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_gravity="center"
+                android:layout_weight="1"
+                android:orientation="vertical"
+                android:background="?attr/backgroundColor"
+                android:padding="10dp">
+
+                <TextView
+                    android:id="@+id/about_link"
+                    style="@style/link_font"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:autoLink="web"
+                    android:gravity="center"
+                    android:paddingTop="20dp"
+                    android:text="@string/about_link"
+                    android:textColorLink="@color/primary_color" />
+
+                <TextView
+                    android:id="@+id/privaci_policy_link"
+                    style="@style/link_font"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:autoLink="web"
+                    android:paddingTop="10dp"
+                    android:gravity="center"
+                    android:text="@string/about_privacy_policy"
+                    android:textColorLink="@color/primary_color" />
+
+                <TextView
+                    android:id="@+id/about_text"
+                    style="@style/about_license_font"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:gravity="center"
+                    android:paddingTop="10dp"
+                    android:paddingBottom="20dp"
+                    android:text="@string/about_text" />
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="?attr/dividerColor" />
+
+                <LinearLayout
+                    android:background="?attr/backgroundColor"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:paddingTop="20dp"
+                    android:orientation="horizontal">
+
+                    <Button
+                        android:id="@+id/send_log"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="5dp"
+                        android:background="@drawable/assistant_button"
+                        android:textColor="@drawable/assistant_button_text_color"
+                        style="@style/button_font"
+                        android:padding="10dp"
+                        android:text="@string/menu_send_log" />
+
+                    <Button
+                        android:id="@+id/reset_log"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="5dp"
+                        android:background="@drawable/assistant_button"
+                        android:textColor="@drawable/assistant_button_text_color"
+                        style="@style/button_font"
+                        android:padding="10dp"
+                        android:text="@string/menu_reset_log" />
+
+                </LinearLayout>
+
+            </LinearLayout>
 
         </LinearLayout>
 
-    </LinearLayout>
+    </ScrollView>
 
 </LinearLayout>