From 7d1b4c363f16556999ae12809239e7ed2443e756 Mon Sep 17 00:00:00 2001
From: Niels Andriesse <andriesseniels@gmail.com>
Date: Wed, 11 Sep 2019 10:08:38 +1000
Subject: [PATCH] Add beta terms label

---
 res/layout/registration_welcome_activity.xml | 22 +++++++++++++++++---
 res/values/strings.xml                       |  1 +
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/res/layout/registration_welcome_activity.xml b/res/layout/registration_welcome_activity.xml
index 69cb628f33..d08003387a 100644
--- a/res/layout/registration_welcome_activity.xml
+++ b/res/layout/registration_welcome_activity.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.constraint.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:background="@color/loki_darkest_gray"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -26,7 +26,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/textView"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toTopOf="@id/welcome_terms_button"
+        app:layout_constraintBottom_toTopOf="@id/beta_terms_label"
         android:orientation="vertical"
         android:gravity="center">
 
@@ -37,6 +37,21 @@
 
     </LinearLayout>
 
+    <TextView
+        android:id="@+id/beta_terms_label"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="32dp"
+        android:layout_marginEnd="32dp"
+        android:layout_marginBottom="24dp"
+        style="@style/Signal.Text.Body"
+        android:text="@string/activity_landing_beta_terms"
+        android:textColor="@color/white"
+        android:textAlignment="center"
+        app:layout_constraintBottom_toTopOf="@+id/welcome_terms_button"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
     <TextView
         android:id="@+id/welcome_terms_button"
         android:layout_width="wrap_content"
@@ -45,6 +60,7 @@
         style="@style/Signal.Text.Body"
         android:text="@string/activity_landing_privacy_policy_button_title"
         android:textColor="@color/signal_primary"
+        android:textAlignment="center"
         app:layout_constraintBottom_toTopOf="@+id/welcome_continue_button"
         app:layout_constraintEnd_toEndOf="@+id/welcome_continue_button"
         app:layout_constraintStart_toStartOf="@+id/welcome_continue_button" />
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6488c933b5..10f66eeca1 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1547,6 +1547,7 @@
     <!-- Landing activity -->
     <string name="activity_landing_title">Loki Messenger</string>
     <string name="activity_landing_permission_dialog_message">Some features of Loki Messenger (such as automatic message backup) require storage access to work.</string>
+    <string name="activity_landing_beta_terms">"Loki Messenger is currently in beta. For development purposes the beta version collects basic usage statistics and crash logs. In addition, the beta version doesn't provide full privacy and shouldn\'t be used to transmit sensitive information."</string>
     <string name="activity_landing_privacy_policy_button_title">Privacy Policy</string>
     <!-- Account details activity -->
     <string name="activity_account_details_title">Create Your Loki Messenger Account</string>