From c0af12c23f52f6e36f7188b73e566bf1bb28a6cb Mon Sep 17 00:00:00 2001
From: Aayush Gupta <aayushgupta219@gmail.com>
Date: Mon, 24 Jul 2023 23:48:20 +0530
Subject: [PATCH] TOSSheet: Migrate to navigation components

Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
---
 .../main/java/com/aurora/store/MainActivity.kt    | 12 ------------
 .../view/ui/onboarding/OnboardingFragment.kt      |  4 ++++
 .../com/aurora/store/view/ui/sheets/TOSSheet.kt   | 15 +++------------
 app/src/main/res/navigation/mobile_navigation.xml |  5 +++++
 4 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/app/src/main/java/com/aurora/store/MainActivity.kt b/app/src/main/java/com/aurora/store/MainActivity.kt
index cb29b5e0c..f7c9d6738 100644
--- a/app/src/main/java/com/aurora/store/MainActivity.kt
+++ b/app/src/main/java/com/aurora/store/MainActivity.kt
@@ -58,14 +58,12 @@ import com.aurora.store.util.Log
 import com.aurora.store.util.Preferences
 import com.aurora.store.view.ui.sheets.NetworkDialogSheet
 import com.aurora.store.view.ui.sheets.SelfUpdateSheet
-import com.aurora.store.view.ui.sheets.TOSSheet
 import com.aurora.store.viewmodel.MainViewModel
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners
 import com.google.android.material.bottomnavigation.BottomNavigationView
 import com.google.android.material.elevation.SurfaceColors
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
-import kotlinx.coroutines.flow.drop
 import kotlinx.coroutines.launch
 import java.lang.reflect.Modifier
 
@@ -159,16 +157,6 @@ class MainActivity : AppCompatActivity(), NetworkProvider.NetworkListener {
         attachDrawer()
         attachSearch()
 
-        if (!Preferences.getBoolean(this, Preferences.PREFERENCE_TOS_READ)) {
-            runOnUiThread {
-                if (!supportFragmentManager.isDestroyed) {
-                    val sheet = TOSSheet.newInstance()
-                    sheet.isCancelable = false
-                    sheet.show(supportFragmentManager, TOSSheet.TAG)
-                }
-            }
-        }
-
         /*Check only if download to external storage is enabled*/
         if (Preferences.getBoolean(this, Preferences.PREFERENCE_DOWNLOAD_EXTERNAL)) {
             if (isRAndAbove()) {
diff --git a/app/src/main/java/com/aurora/store/view/ui/onboarding/OnboardingFragment.kt b/app/src/main/java/com/aurora/store/view/ui/onboarding/OnboardingFragment.kt
index aab5517d7..310018185 100644
--- a/app/src/main/java/com/aurora/store/view/ui/onboarding/OnboardingFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/onboarding/OnboardingFragment.kt
@@ -75,6 +75,10 @@ class OnboardingFragment : Fragment(R.layout.fragment_onboarding) {
         binding.btnBackward.setOnClickListener {
             moveBackward()
         }
+
+        if (!Preferences.getBoolean(view.context, Preferences.PREFERENCE_TOS_READ)) {
+            findNavController().navigate(R.id.TOSSheet)
+        }
     }
 
     override fun onDestroyView() {
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 db0ba243a..afe03f3ca 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
@@ -34,18 +34,9 @@ class TOSSheet : BaseBottomSheet() {
 
     private lateinit var B: SheetTosBinding
 
-    companion object {
-
-        const val TAG = "TOSSheet"
-
-        @JvmStatic
-        fun newInstance(): TOSSheet {
-            return TOSSheet().apply {
-                arguments = Bundle().apply {
-
-                }
-            }
-        }
+    override fun onStart() {
+        super.onStart()
+        isCancelable = false
     }
 
     override fun onCreateContentView(
diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml
index 62b2ae3e2..abd062a3c 100644
--- a/app/src/main/res/navigation/mobile_navigation.xml
+++ b/app/src/main/res/navigation/mobile_navigation.xml
@@ -336,4 +336,9 @@
             app:popUpTo="@id/mobile_navigation"
             app:popUpToInclusive="true" />
     </fragment>
+    <dialog
+        android:id="@+id/TOSSheet"
+        android:name="com.aurora.store.view.ui.sheets.TOSSheet"
+        android:label="TOSSheet"
+        tools:layout="@layout/sheet_tos" />
 </navigation>