From 660fb4a8d6fd8d639a797e763724b84be6eee82b Mon Sep 17 00:00:00 2001
From: knightshade <abhishekpoonia22@gmail.com>
Date: Sun, 25 Feb 2018 20:39:35 +0530
Subject: [PATCH] Add ScrollView in About activity. Fixes #1177

---
 app/src/main/res/layout/activity_about.xml | 232 ++++++++++-----------
 1 file changed, 115 insertions(+), 117 deletions(-)

diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index 82aa38919..f03ff9c76 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -5,137 +5,135 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <RelativeLayout
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="wrap_content">
 
-        <include
-            android:id="@+id/toolbar"
-            layout="@layout/toolbar"
+        <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content">
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_below="@id/toolbar"
-            android:layout_marginLeft="@dimen/activity_margin_horizontal"
-            android:layout_marginStart="@dimen/activity_margin_horizontal"
-            android:layout_marginRight="@dimen/activity_margin_horizontal"
-            android:layout_marginEnd="@dimen/activity_margin_horizontal"
-            android:gravity="center"
-            android:orientation="vertical">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_launcher"
-                android:contentDescription= "@string/commons_logo"
-                />
-
-            <TextView
-                style="?android:textAppearanceLarge"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/app_name" />
-
-            <TextView
-                android:id="@+id/about_version"
-                android:layout_width="wrap_content"
+            <include
+                android:id="@+id/toolbar"
+                layout="@layout/toolbar"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
 
-            <fr.free.nrw.commons.ui.widget.HtmlTextView
-                android:id="@+id/about_license"
-                style="?android:textAppearanceSmall"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/standard_gap"
-                android:gravity="center"
-                android:text="@string/about_license" />
-
-            <fr.free.nrw.commons.ui.widget.HtmlTextView
-                android:id="@+id/about_improve"
-                style="?android:textAppearanceSmall"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/small_gap"
-                android:gravity="center"
-                android:text="@string/about_improve" />
-
-
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:orientation="horizontal"
-                android:layout_marginLeft="@dimen/activity_margin_horizontal"
-                android:layout_marginStart="@dimen/activity_margin_horizontal"
-                android:layout_marginRight="@dimen/activity_margin_horizontal"
-                android:layout_marginTop="@dimen/activity_margin_horizontal"
+                android:layout_height="match_parent"
+                android:layout_below="@id/toolbar"
                 android:layout_marginEnd="@dimen/activity_margin_horizontal"
-                >
+                android:layout_marginLeft="@dimen/activity_margin_horizontal"
+                android:layout_marginRight="@dimen/activity_margin_horizontal"
+                android:layout_marginStart="@dimen/activity_margin_horizontal"
+                android:layout_marginTop="@dimen/activity_margin_vertical"
+                android:gravity="center"
+                android:orientation="vertical">
 
                 <ImageView
-                    android:id="@+id/website_launch_icon"
-                    android:layout_width="@dimen/overflow_icon_dimen"
-                    android:layout_height="@dimen/overflow_icon_dimen"
-                    app:srcCompat="@drawable/ic_action_website"
-                    android:contentDescription= "@string/commons_website"
-                    android:layout_margin="@dimen/activity_margin_horizontal"
-                    />
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:contentDescription="@string/commons_logo"
+                    android:src="@drawable/ic_launcher" />
 
-                <ImageView
-                    android:id="@+id/facebook_launch_icon"
-                    android:layout_width="@dimen/overflow_icon_dimen"
-                    android:layout_height="@dimen/overflow_icon_dimen"
-                    app:srcCompat="@drawable/ic_action_facebook"
-                    android:contentDescription= "@string/commons_facebook"
-                    android:layout_margin="@dimen/activity_margin_horizontal"
-                    />
+                <TextView
+                    style="?android:textAppearanceLarge"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/app_name" />
 
-                <ImageView
-                    android:id="@+id/github_launch_icon"
-                    android:layout_width="@dimen/overflow_icon_dimen"
-                    android:layout_height="@dimen/overflow_icon_dimen"
-                    app:srcCompat="@drawable/ic_action_github"
-                    android:contentDescription= "@string/commons_github"
-                    android:layout_margin="@dimen/activity_margin_horizontal"
-                    />
+                <TextView
+                    android:id="@+id/about_version"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content" />
+
+                <fr.free.nrw.commons.ui.widget.HtmlTextView
+                    android:id="@+id/about_license"
+                    style="?android:textAppearanceSmall"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/standard_gap"
+                    android:gravity="center"
+                    android:text="@string/about_license" />
+
+                <fr.free.nrw.commons.ui.widget.HtmlTextView
+                    android:id="@+id/about_improve"
+                    style="?android:textAppearanceSmall"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/small_gap"
+                    android:gravity="center"
+                    android:text="@string/about_improve" />
+
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="@dimen/activity_margin_horizontal"
+                    android:layout_marginLeft="@dimen/activity_margin_horizontal"
+                    android:layout_marginRight="@dimen/activity_margin_horizontal"
+                    android:layout_marginStart="@dimen/activity_margin_horizontal"
+                    android:layout_marginTop="@dimen/activity_margin_horizontal"
+                    android:gravity="center"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:id="@+id/website_launch_icon"
+                        android:layout_width="@dimen/overflow_icon_dimen"
+                        android:layout_height="@dimen/overflow_icon_dimen"
+                        android:layout_margin="@dimen/activity_margin_horizontal"
+                        android:contentDescription="@string/commons_website"
+                        app:srcCompat="@drawable/ic_action_website" />
+
+                    <ImageView
+                        android:id="@+id/facebook_launch_icon"
+                        android:layout_width="@dimen/overflow_icon_dimen"
+                        android:layout_height="@dimen/overflow_icon_dimen"
+                        android:layout_margin="@dimen/activity_margin_horizontal"
+                        android:contentDescription="@string/commons_facebook"
+                        app:srcCompat="@drawable/ic_action_facebook" />
+
+                    <ImageView
+                        android:id="@+id/github_launch_icon"
+                        android:layout_width="@dimen/overflow_icon_dimen"
+                        android:layout_height="@dimen/overflow_icon_dimen"
+                        android:layout_margin="@dimen/activity_margin_horizontal"
+                        android:contentDescription="@string/commons_github"
+                        app:srcCompat="@drawable/ic_action_github" />
+
+                </LinearLayout>
+
+                <fr.free.nrw.commons.ui.widget.HtmlTextView
+                    android:id="@+id/about_privacy_policy"
+                    style="?android:textAppearanceSmall"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/standard_gap"
+                    android:gravity="center"
+                    android:text="@string/about_privacy_policy" />
+
+                <fr.free.nrw.commons.ui.widget.HtmlTextView
+                    android:id="@+id/about_credits"
+                    style="?android:textAppearanceSmall"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/standard_gap"
+                    android:gravity="center"
+                    android:text="@string/about_credits" />
+
+                <TextView
+                    android:id="@+id/about_uploads_to"
+                    style="?android:textAppearanceSmall"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/large_gap"
+                    android:alpha="0.2"
+                    android:gravity="center" />
 
             </LinearLayout>
-
-            <TextView
-                android:id="@+id/about_privacy_policy"
-                style="?android:textAppearanceSmall"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/standard_gap"
-                android:gravity="center"
-                android:textColor="@color/primaryColor"
-                android:text="@string/about_privacy_policy" />
-
-            <TextView
-                android:id="@+id/about_credits"
-                style="?android:textAppearanceSmall"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/standard_gap"
-                android:gravity="center"
-                android:textColor="@color/primaryColor"
-                android:text="@string/about_credits"
-                />
-
-            <TextView
-                android:id="@+id/about_uploads_to"
-                style="?android:textAppearanceSmall"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/large_gap"
-                android:alpha="0.2"
-                android:gravity="center" />
-
-        </LinearLayout>
-    </RelativeLayout>
+        </RelativeLayout>
+    </ScrollView>
 
     <android.support.design.widget.NavigationView
         android:id="@+id/navigation_view"
@@ -143,6 +141,6 @@
         android:layout_height="match_parent"
         android:layout_gravity="start"
         app:headerLayout="@layout/drawer_header"
-        app:menu="@menu/drawer"/>
+        app:menu="@menu/drawer" />
 
 </android.support.v4.widget.DrawerLayout>
\ No newline at end of file