mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 20:33:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #933 from aumassart/master

Browse source 
fixing issue #520 : adding a privacy statement
This commit is contained in:
Josephine Lim 2017-11-14 17:18:11 +10:00 • committed by GitHub
commit fb38c9033d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 69 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

23
app/src/main/res/layout-land/activity_login.xml
View file

@ -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>

23
app/src/main/res/layout-xlarge/activity_login.xml
View file

@ -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>

23
app/src/main/res/layout/activity_login.xml
View file

@ -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>