From ef90d2da6029430c0928158a5371fa7f0df2e394 Mon Sep 17 00:00:00 2001
From: aumassart <aurelie.massart@student.uclouvain.be>
Date: Wed, 1 Nov 2017 10:59:47 +0100
Subject: [PATCH 1/2] adding a privacy policy statement to the login page

---
 app/src/main/res/layout/activity_login.xml | 23 ++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 660e02ecf..b1bc7152d 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -137,6 +137,7 @@
                 </android.support.design.widget.TextInputLayout>
 
                 <LinearLayout
+                    android:id="@+id/buttonFrame"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_below="@id/two_factor_container"
@@ -170,6 +171,28 @@
 
                 </LinearLayout>
 
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/buttonFrame"
+                    android:layout_marginBottom="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginRight="16dp"
+                    android:layout_marginStart="16dp">
+
+                    <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="16dp"
+                        android:layout_gravity="center_horizontal"
+                        android:text="@string/about_privacy_policy"
+                        android:layout_centerHorizontal="true"/>
+
+                </RelativeLayout>
+
             </RelativeLayout>
         </android.support.v7.widget.CardView>
 

From 91ddcc796c8fec7b9d332edfae307d5d3d050616 Mon Sep 17 00:00:00 2001
From: aumassart <aurelie.massart@student.uclouvain.be>
Date: Thu, 2 Nov 2017 10:05:57 +0100
Subject: [PATCH 2/2] adding privacy policy button for landscape and large
 modes too

---
 .../main/res/layout-land/activity_login.xml   | 23 +++++++++++++++++++
 .../main/res/layout-xlarge/activity_login.xml | 23 +++++++++++++++++++
 2 files changed, 46 insertions(+)

diff --git a/app/src/main/res/layout-land/activity_login.xml b/app/src/main/res/layout-land/activity_login.xml
index d96106f18..7265ba671 100644
--- a/app/src/main/res/layout-land/activity_login.xml
+++ b/app/src/main/res/layout-land/activity_login.xml
@@ -137,6 +137,7 @@
                 </android.support.design.widget.TextInputLayout>
 
                 <LinearLayout
+                    android:id="@+id/buttonFrame"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_below="@id/two_factor_container"
@@ -170,6 +171,28 @@
 
                 </LinearLayout>
 
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/buttonFrame"
+                    android:layout_marginBottom="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginRight="16dp"
+                    android:layout_marginStart="16dp">
+
+                    <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="16dp"
+                        android:layout_gravity="center_horizontal"
+                        android:text="@string/about_privacy_policy"
+                        android:layout_centerHorizontal="true"/>
+
+                </RelativeLayout>
+
             </RelativeLayout>
         </android.support.v7.widget.CardView>
 
diff --git a/app/src/main/res/layout-xlarge/activity_login.xml b/app/src/main/res/layout-xlarge/activity_login.xml
index c6293fbe3..90bef2423 100644
--- a/app/src/main/res/layout-xlarge/activity_login.xml
+++ b/app/src/main/res/layout-xlarge/activity_login.xml
@@ -137,6 +137,7 @@
                 </android.support.design.widget.TextInputLayout>
 
                 <LinearLayout
+                    android:id="@+id/buttonFrame"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_below="@id/two_factor_container"
@@ -170,6 +171,28 @@
 
                 </LinearLayout>
 
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/buttonFrame"
+                    android:layout_marginBottom="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginRight="16dp"
+                    android:layout_marginStart="16dp">
+
+                    <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="16dp"
+                        android:layout_gravity="center_horizontal"
+                        android:text="@string/about_privacy_policy"
+                        android:layout_centerHorizontal="true"/>
+
+                </RelativeLayout>
+
             </RelativeLayout>
         </android.support.v7.widget.CardView>