From 92a8b5e37cc97c05087326b47413f604c6badf61 Mon Sep 17 00:00:00 2001
From: Ashish Kumar <ashishkumar468@gmail.com>
Date: Fri, 7 Sep 2018 05:17:23 +0530
Subject: [PATCH] =?UTF-8?q?Added=20views=20for=20button=20skipLogin=20in?=
 =?UTF-8?q?=20layout-land=20and=20layout-xLarge,=20bu=E2=80=A6=20(#1865)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Added views for button skipLogin in layout-land and layout-xLarge, bug fix issue#1864

* xml improvisations

* Fixed string nominated_see_more [CDATA was used inappropriately]
---
 .../main/res/layout-land/activity_login.xml   | 33 +++++++++++++------
 .../main/res/layout-xlarge/activity_login.xml | 33 +++++++++++++------
 2 files changed, 46 insertions(+), 20 deletions(-)

diff --git a/app/src/main/res/layout-land/activity_login.xml b/app/src/main/res/layout-land/activity_login.xml
index deb295438..ed1c8a578 100644
--- a/app/src/main/res/layout-land/activity_login.xml
+++ b/app/src/main/res/layout-land/activity_login.xml
@@ -4,6 +4,10 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <LinearLayout
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:orientation="vertical">
     <FrameLayout
         android:layout_width="400sp"
         android:layout_height="wrap_content"
@@ -198,16 +202,15 @@
                     android:text="@string/forgot_password"
                     android:textColor="@color/status_bar_blue"/>
 
-                <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_below="@id/forgotPassword"
-                    android:layout_centerHorizontal="true"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_marginBottom="@dimen/standard_gap"
-                    android:text="@string/about_privacy_policy" />
+              <fr.free.nrw.commons.ui.widget.HtmlTextView
+                android:id="@+id/skipLogin"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/standard_gap"
+                android:layout_below="@id/forgotPassword"
+                android:gravity="center_horizontal"
+                android:text="@string/skip_login"
+                android:visibility="visible"/>
 
             </RelativeLayout>
         </android.support.v7.widget.CardView>
@@ -230,5 +233,15 @@
             tools:ignore="UnusedAttribute" />
 
     </FrameLayout>
+      <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_marginBottom="@dimen/standard_gap"
+        android:layout_below="@id/forgotPassword"
+        android:layout_gravity="center_horizontal"
+        android:text="@string/about_privacy_policy"/>
+    </LinearLayout>
 
 </ScrollView>
diff --git a/app/src/main/res/layout-xlarge/activity_login.xml b/app/src/main/res/layout-xlarge/activity_login.xml
index 819260920..1fe7acf64 100644
--- a/app/src/main/res/layout-xlarge/activity_login.xml
+++ b/app/src/main/res/layout-xlarge/activity_login.xml
@@ -4,6 +4,11 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <LinearLayout
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:orientation="vertical">
+
     <FrameLayout
         android:layout_width="400sp"
         android:layout_height="wrap_content"
@@ -198,16 +203,15 @@
                     android:text="@string/forgot_password"
                     android:textColor="@color/status_bar_blue" />
 
-                <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_below="@id/forgotPassword"
-                    android:layout_centerHorizontal="true"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_marginBottom="@dimen/standard_gap"
-                    android:text="@string/about_privacy_policy" />
+              <fr.free.nrw.commons.ui.widget.HtmlTextView
+                android:id="@+id/skipLogin"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/standard_gap"
+                android:layout_below="@id/forgotPassword"
+                android:gravity="center_horizontal"
+                android:text="@string/skip_login"
+                android:visibility="visible"/>
 
             </RelativeLayout>
         </android.support.v7.widget.CardView>
@@ -230,5 +234,14 @@
             tools:ignore="UnusedAttribute" />
 
     </FrameLayout>
+      <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_marginBottom="@dimen/standard_gap"
+        android:layout_gravity="center_horizontal"
+        android:text="@string/about_privacy_policy"/>
+    </LinearLayout>
 
 </ScrollView>