From d73f0b1e12b796864bb5526ffbab2ad164c63d9d Mon Sep 17 00:00:00 2001 From: Rahul Kumar Patel Date: Sat, 27 Mar 2021 03:29:19 +0530 Subject: [PATCH] Do not allow TOS to be dismissed --- .../aurora/store/view/ui/commons/BaseActivity.kt | 4 +++- .../com/aurora/store/view/ui/sheets/TOSSheet.kt | 15 +++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/aurora/store/view/ui/commons/BaseActivity.kt b/app/src/main/java/com/aurora/store/view/ui/commons/BaseActivity.kt index bcc96b956..acf72de0e 100644 --- a/app/src/main/java/com/aurora/store/view/ui/commons/BaseActivity.kt +++ b/app/src/main/java/com/aurora/store/view/ui/commons/BaseActivity.kt @@ -144,7 +144,9 @@ abstract class BaseActivity : AppCompatActivity(), NetworkProvider.NetworkListen task { TimeUnit.SECONDS.sleep(5) } successUi { - TOSSheet.newInstance().show(supportFragmentManager, TOSSheet.TAG) + val sheet = TOSSheet.newInstance() + sheet.isCancelable = false + sheet.show(supportFragmentManager, TOSSheet.TAG) } } 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 3dea8f46a..661284d38 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 @@ -29,6 +29,8 @@ import com.aurora.extensions.toast import com.aurora.store.R import com.aurora.store.databinding.SheetTosBinding import com.aurora.store.util.Preferences +import nl.komponents.kovenant.task +import java.util.concurrent.TimeUnit import kotlin.system.exitProcess class TOSSheet : BaseBottomSheet() { @@ -71,17 +73,22 @@ class TOSSheet : BaseBottomSheet() { } B.btnPrimary.setOnClickListener { - if (B.checkboxAccept.isChecked){ + if (B.checkboxAccept.isChecked) { Preferences.putBoolean(requireContext(), Preferences.PREFERENCE_TOS_READ, true) dismissAllowingStateLoss() - }else{ + } else { toast(R.string.onboarding_tos_error) } } B.btnSecondary.setOnClickListener { - requireActivity().finish(); - exitProcess(0); + toast("Bye Bye") + task { + TimeUnit.SECONDS.sleep(2) + } success { + requireActivity().finish(); + exitProcess(0); + } } } }