State fixed while authenticating

lakshya-20 · web-flow · commit f7adc6e730b5 · 2021-06-13T11:20:43.000+05:30
diff --git a/app/src/main/java/com/github/code/gambit/ui/fragment/auth/AuthFragment.kt b/app/src/main/java/com/github/code/gambit/ui/fragment/auth/AuthFragment.kt
@@ -51,7 +51,8 @@ class AuthFragment : Fragment(R.layout.fragment_auth) {
             if (it) {
                 Toast.makeText(requireContext(), "Permission granted", Toast.LENGTH_SHORT).show()
             } else {
-                Toast.makeText(requireContext(), "Permission not granted", Toast.LENGTH_SHORT).show()
+                Toast.makeText(requireContext(), "Permission not granted", Toast.LENGTH_SHORT)
+                    .show()
             }
         }
 
@@ -72,15 +73,15 @@ class AuthFragment : Fragment(R.layout.fragment_auth) {
         confirmationComponent = ConfirmationComponent.bind(requireContext())
 
         confirmationComponent.getOtp().observe(viewLifecycleOwner) {
-            it?.let {
-                confirmSignUp(it)
-            }
+            it?.let { confirmSignUp(it) }
         }
 
         confirmationComponent.setResendCallback { email ->
             viewModel.setEvent(AuthEvent.ResendCode(email))
         }
 
+        confirmationComponent.setOnCancelCallback { enableInteraction() }
+
         binding.buttonSubmit.setOnClickListener {
             disableInteraction()
             val fg = (binding.fragmentContainer.adapter as AuthFragmentAdapter).getFragment(
@@ -90,12 +91,16 @@ class AuthFragment : Fragment(R.layout.fragment_auth) {
                 val data = (fg as SignUpFragment).validate()
                 if (data != null) {
                     signUp(data)
-                } else { enableInteraction() }
+                } else {
+                    enableInteraction()
+                }
             } else {
                 val data = (fg as LoginFragment).validate()
                 if (data != null) {
                     logIn(data)
-                } else { enableInteraction() }
+                } else {
+                    enableInteraction()
+                }
             }
         }
 
@@ -128,6 +133,7 @@ class AuthFragment : Fragment(R.layout.fragment_auth) {
                         binding.root.snackbar(it.reason)
                     }
                     is AuthState.ResendStatus -> {
+                        confirmationComponent.onResendResult(it.success)
                         if (it.success) {
                             longToast("Code send on your email")
                         }
diff --git a/app/src/main/java/com/github/code/gambit/ui/fragment/auth/confirmationcomponent/ConfirmationComponent.kt b/app/src/main/java/com/github/code/gambit/ui/fragment/auth/confirmationcomponent/ConfirmationComponent.kt
@@ -15,4 +15,6 @@ interface ConfirmationComponent {
     fun getOtp(): LiveData<String>
     fun setResendCallback(callback: (email: String) -> Unit)
     fun showError(message: String = "")
+    fun setOnCancelCallback(cancelFunction: () -> Unit = {})
+    fun onResendResult(success: Boolean)
 }
diff --git a/app/src/main/java/com/github/code/gambit/ui/fragment/auth/confirmationcomponent/ConfirmationDialog.kt b/app/src/main/java/com/github/code/gambit/ui/fragment/auth/confirmationcomponent/ConfirmationDialog.kt
@@ -17,6 +17,7 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import com.github.code.gambit.R
 import com.github.code.gambit.databinding.EmailVerificationLayoutBinding
+import com.github.code.gambit.utility.extention.enableAfter
 import com.github.code.gambit.utility.extention.setStatusColor
 import com.github.code.gambit.utility.extention.snackbar
 import kotlin.math.hypot
@@ -30,8 +31,10 @@ class ConfirmationDialog(val context: Context) : ConfirmationComponent {
     )
     private val binding get() = _binding
 
+    private val defaultResendCounter = 50
     private val _otp = MutableLiveData<String>()
     private var resendCallBack: ((email: String) -> Unit)? = null
+    private var cancelCallBack: (() -> Unit)? = null
 
     private var userEmail: String = ""
 
@@ -61,11 +64,14 @@ class ConfirmationDialog(val context: Context) : ConfirmationComponent {
         }
 
         binding.cancel.setOnClickListener {
-            revealShow(b = false, exit = true)
+            revealShow(b = false, exit = true, exitFunction = cancelCallBack ?: {})
         }
 
-        binding.resend.setOnClickListener {
-            resendCallBack?.let { it(userEmail) }
+        binding.resend.setOnClickListener { v ->
+            resendCallBack?.let {
+                v.isEnabled = false
+                it(userEmail)
+            }
         }
 
         dialog.setOnShowListener { revealShow(true) }
@@ -120,6 +126,7 @@ class ConfirmationDialog(val context: Context) : ConfirmationComponent {
 
     @SuppressLint("SetTextI18n")
     override fun show(userEmail: String) {
+        binding.resend.enableAfter(defaultResendCounter, binding.resendTimer)
         this.userEmail = userEmail
         binding.infoText.text = "${binding.infoText.text}\n$userEmail"
         dialog.show()
@@ -145,4 +152,16 @@ class ConfirmationDialog(val context: Context) : ConfirmationComponent {
             snackbar(message)
         }
     }
+
+    override fun setOnCancelCallback(cancelFunction: () -> Unit) {
+        cancelCallBack = cancelFunction
+    }
+
+    override fun onResendResult(success: Boolean) {
+        if (success) {
+            binding.resend.enableAfter(defaultResendCounter, binding.resendTimer)
+        } else {
+            binding.resend.enableAfter(0, binding.resendTimer)
+        }
+    }
 }
diff --git a/app/src/main/java/com/github/code/gambit/utility/extention/view.kt b/app/src/main/java/com/github/code/gambit/utility/extention/view.kt
@@ -5,15 +5,16 @@ import android.app.AlertDialog
 import android.content.ClipData
 import android.content.ClipboardManager
 import android.content.Context
+import android.os.Handler
 import android.view.View
 import android.view.Window
 import android.view.WindowManager
 import android.view.animation.AnimationUtils
 import android.view.animation.DecelerateInterpolator
 import android.view.inputmethod.InputMethodManager
 import android.widget.RelativeLayout
+import android.widget.TextView
 import android.widget.Toast
-import androidx.core.content.ContextCompat.getSystemService
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import com.github.code.gambit.R
@@ -58,6 +59,27 @@ fun View?.show() {
     }
 }
 
+fun View?.enableAfter(timeInSeconds: Int, counterView: TextView) {
+    if (this == null) {
+        return
+    }
+    var count = timeInSeconds
+    this.isEnabled = false
+    counterView.visibility = View.VISIBLE
+    Handler().post(object : Runnable {
+        override fun run() {
+            counterView.text = count.toString()
+            if (count <= 0) {
+                this@enableAfter.isEnabled = true
+                counterView.visibility = View.INVISIBLE
+                return
+            }
+            count--
+            handler.postDelayed(this, 1000)
+        }
+    })
+}
+
 fun View.toggleVisibility() {
     if (isVisible) {
         visibility = View.GONE
@@ -66,14 +88,6 @@ fun View.toggleVisibility() {
     visibility = View.VISIBLE
 }
 
-fun List<View>.hideAll() {
-    this.forEach { it.hide() }
-}
-
-fun List<View>.showAll() {
-    this.forEach { it.show() }
-}
-
 fun View.snackbar(message: String, view: View) {
     Snackbar.make(this, message, Snackbar.LENGTH_INDEFINITE)
         .setAnchorView(view)
@@ -152,8 +166,13 @@ fun Context.showDefaultAlert(title: String, message: String, positiveButtonPress
         .setNegativeButton("Cancel") { dialog, _ -> dialog.dismiss() }.create().show()
 }
 
-fun Context.showDefaultMaterialAlert(title: String, message: String, positiveButtonPress: () -> Unit) {
+fun Context.showDefaultMaterialAlert(
+    title: String,
+    message: String,
+    positiveButtonPress: () -> Unit
+) {
     MaterialAlertDialogBuilder(this)
-        .setTitle(title).setMessage(message).setPositiveButton("Yes") { _, _ -> positiveButtonPress() }
+        .setTitle(title).setMessage(message)
+        .setPositiveButton("Yes") { _, _ -> positiveButtonPress() }
         .setNegativeButton("Cancel") { dialog, _ -> dialog.dismiss() }.create().show()
 }
diff --git a/app/src/main/res/layout/email_verification_layout.xml b/app/src/main/res/layout/email_verification_layout.xml
@@ -3,6 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:background="@color/secondary"
     android:id="@+id/root">
 
@@ -79,6 +80,18 @@
         android:layout_centerHorizontal="true"
         android:layout_marginBottom="32dp"/>
 
+    <TextView
+        android:id="@+id/resend_timer"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        tools:text="47"
+        android:textSize="22sp"
+        android:fontFamily="sans-serif-light"
+        android:textColor="@color/raw_black"
+        android:layout_below="@id/otp_view"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="@dimen/root_side_margin"/>
+
 
     <Button
         android:id="@+id/resend"
@@ -87,17 +100,19 @@
         android:layout_height="36dp"
         android:text="@string/resend"
         android:textColor="@color/raw_black"
-        android:layout_below="@id/otp_view"
+        android:layout_below="@id/resend_timer"
         android:layout_centerHorizontal="true"
-        android:layout_marginTop="@dimen/root_side_margin"/>
+        android:layout_marginTop="2dp"
+        android:enabled="false"/>
 
 
     <com.google.android.material.progressindicator.CircularProgressIndicator
         android:id="@+id/progress_bar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:indeterminate="true"
-        android:layout_centerInParent="true"
+        android:layout_below="@id/resend"
+        android:layout_centerHorizontal="true"
         android:visibility="gone"
         app:indicatorColor="@color/login_signup_button_color"/>
 

Original file line number	Diff line number	Diff line change
`@@ -15,4 +15,6 @@ interface ConfirmationComponent {`
`15`	`15`	`fun getOtp(): LiveData<String>`
`16`	`16`	`fun setResendCallback(callback: (email: String) -> Unit)`
`17`	`17`	`fun showError(message: String = "")`
	`18`	`+ fun setOnCancelCallback(cancelFunction: () -> Unit = {})`
	`19`	`+ fun onResendResult(success: Boolean)`
`18`	`20`	`}`