From ebb6118c1671bc988f0c0058d1c76704f8ebdbaa Mon Sep 17 00:00:00 2001
From: Rahul Kumar Patel <whyorean@gmail.com>
Date: Tue, 2 Mar 2021 01:29:15 +0530
Subject: [PATCH] Allow user to Deny TOS as well :p

---
 .../aurora/store/view/ui/sheets/TOSSheet.kt   | 19 ++++++++---
 app/src/main/res/layout/sheet_tos.xml         | 33 +++++++++++--------
 app/src/main/res/values/strings.xml           |  7 ++--
 3 files changed, 40 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/com/aurora/store/view/ui/sheets/TOSSheet.kt b/app/src/main/java/com/aurora/store/view/ui/sheets/TOSSheet.kt
index 79bb3bcf1..3dea8f46a 100644
--- a/app/src/main/java/com/aurora/store/view/ui/sheets/TOSSheet.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/sheets/TOSSheet.kt
@@ -25,8 +25,11 @@ import android.view.View
 import android.view.ViewGroup
 import com.aurora.Constants
 import com.aurora.extensions.browse
+import com.aurora.extensions.toast
+import com.aurora.store.R
 import com.aurora.store.databinding.SheetTosBinding
 import com.aurora.store.util.Preferences
+import kotlin.system.exitProcess
 
 class TOSSheet : BaseBottomSheet() {
 
@@ -63,14 +66,22 @@ class TOSSheet : BaseBottomSheet() {
     }
 
     private fun attachAction() {
-        B.btnPrimary.setOnClickListener {
+        B.btnRead.setOnClickListener {
             requireContext().browse(Constants.TOS_URL)
-            Preferences.putBoolean(requireContext(), Preferences.PREFERENCE_TOS_READ, true)
+        }
+
+        B.btnPrimary.setOnClickListener {
+            if (B.checkboxAccept.isChecked){
+                Preferences.putBoolean(requireContext(), Preferences.PREFERENCE_TOS_READ, true)
+                dismissAllowingStateLoss()
+            }else{
+                toast(R.string.onboarding_tos_error)
+            }
         }
 
         B.btnSecondary.setOnClickListener {
-            Preferences.putBoolean(requireContext(), Preferences.PREFERENCE_TOS_READ, true)
-            dismissAllowingStateLoss()
+            requireActivity().finish();
+            exitProcess(0);
         }
     }
 }
diff --git a/app/src/main/res/layout/sheet_tos.xml b/app/src/main/res/layout/sheet_tos.xml
index 88b4c1c1d..79091e32f 100644
--- a/app/src/main/res/layout/sheet_tos.xml
+++ b/app/src/main/res/layout/sheet_tos.xml
@@ -18,10 +18,9 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical">
 
     <LinearLayout
@@ -61,18 +60,26 @@
             android:id="@+id/txt_line1"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:maxLines="3"
-            android:text="@string/onboarding_tos"
-            android:textAlignment="viewStart"
-            android:textAppearance="@style/TextAppearance.Aurora.Line1" />
-
-        <TextView
-            android:id="@+id/txt_line2"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
             android:maxLines="10"
             android:text="@string/onboarding_tos_desc"
             android:textAlignment="viewStart"
+            android:textAppearance="@style/TextAppearance.Aurora.Line1" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/btn_read"
+            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end"
+            android:textAllCaps="false"
+            android:text="@string/onboarding_tos" />
+
+        <androidx.appcompat.widget.AppCompatCheckBox
+            android:id="@+id/checkbox_accept"
+            android:minHeight="0dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/onboarding_tos_confirmation"
             android:textAppearance="@style/TextAppearance.Aurora.Line2" />
     </LinearLayout>
 
@@ -88,7 +95,7 @@
             android:layout_width="0dp"
             android:layout_height="@dimen/height_button"
             android:layout_weight="1"
-            android:text="@string/action_accept" />
+            android:text="@string/action_deny" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_primary"
@@ -96,6 +103,6 @@
             android:layout_width="0dp"
             android:layout_height="@dimen/height_button"
             android:layout_weight="1"
-            android:text="@string/action_read_accept" />
+            android:text="@string/action_accept" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index dd3fb0001..f4d7332ea 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -61,6 +61,7 @@
     <string name="action_close">"Close"</string>
     <string name="action_copy">"Copy"</string>
     <string name="action_copy_link">"Copy Link"</string>
+    <string name="action_deny">"Deny"</string>
     <string name="action_disable">"Disable"</string>
     <string name="action_discard">"Discard"</string>
     <string name="action_discover">"Discover"</string>
@@ -105,7 +106,7 @@
     <string name="action_post">"Post"</string>
     <string name="action_previous">"Previous"</string>
     <string name="action_purchase">"Purchase"</string>
-    <string name="action_read_accept">"Read &amp; accept"</string>
+    <string name="action_read">"Read"</string>
     <string name="action_resend">"Resend"</string>
     <string name="action_restart">"Restart"</string>
     <string name="action_resume">"Resume"</string>
@@ -257,7 +258,9 @@
     <string name="onboarding_title_theme">"Themes"</string>
     <string name="onboarding_title_welcome">"Welcome"</string>
     <string name="onboarding_tos">"Terms of services"</string>
-    <string name="onboarding_tos_desc">"Read our Terms of services and accept it before you continue to use Aurora Store."</string>
+    <string name="onboarding_tos_desc">"Please read our Terms of Service and accept it to use Aurora Store."</string>
+    <string name="onboarding_tos_confirmation">"I have read the Aurora Store's Terms of Service."</string>
+    <string name="onboarding_tos_error">"You need to mark TOS read first."</string>
     <string name="onboarding_welcome_select">"How you doing?"</string>
 
     <string name="onboarding_permission_esa">"External Storage Access"</string>