Merge pull request #11 from fictadvisor/feature-viewmodels

Feature viewmodels (needs checks on a real email)
fictadvisor · Mar 7, 2024 · f6d5645 · f6d5645
2 parents ca38257 + a1ee773
commit f6d5645
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 1 deletion.
diff --git a/app/src/main/java/com/fictadvisor/android/ui/ContinueRegistrationFragment.kt b/app/src/main/java/com/fictadvisor/android/ui/ContinueRegistrationFragment.kt
@@ -12,6 +12,7 @@ import androidx.navigation.Navigation
 import com.fictadvisor.android.data.dto.*
 import com.fictadvisor.android.databinding.FragmentContinueRegistrationBinding
 import com.fictadvisor.android.repository.AuthRepository
+import com.fictadvisor.android.utils.StorageUtil
 import com.fictadvisor.android.validator.RegistrationInputValidator
 import com.fictadvisor.android.viewmodel.AuthViewModel
 import com.fictadvisor.android.viewmodel.AuthViewModelFactory
@@ -25,6 +26,7 @@ class ContinueRegistrationFragment : Fragment() {
     private lateinit var authViewModel: AuthViewModel
     private val authRepository = AuthRepository()
     private lateinit var inputValidator: RegistrationInputValidator
+    private lateinit var storageUtil: StorageUtil
 
 
     override fun onCreateView(
@@ -36,6 +38,8 @@ class ContinueRegistrationFragment : Fragment() {
 
         inputValidator = RegistrationInputValidator(requireContext())
 
+        storageUtil = StorageUtil(requireActivity())
+
         authViewModel = ViewModelProvider(
             this,
             AuthViewModelFactory(authRepository)
@@ -188,6 +192,7 @@ class ContinueRegistrationFragment : Fragment() {
         when (registerResponse) {
             is BaseResponse.Success -> {
                 showSuccessLog("Реєстрація успішна")
+                storageUtil.setEmail(binding.editTextTextEmail.text.toString())
                 val action = ContinueRegistrationFragmentDirections.actionContinueRegistrationFragmentToVerifyEmailFragment()
                 Navigation.findNavController(requireView()).navigate(action)
             }

diff --git a/app/src/main/java/com/fictadvisor/android/ui/VerifyEmailFragment.kt b/app/src/main/java/com/fictadvisor/android/ui/VerifyEmailFragment.kt
@@ -39,7 +39,7 @@ class VerifyEmailFragment : Fragment() {
         binding = FragmentVerifyEmailBinding.inflate(inflater, container, false)
         val view = binding.root
 
-        storageUtil = StorageUtil(requireContext())
+        storageUtil = StorageUtil(requireActivity())
 
         authViewModel = ViewModelProvider(
             this,
@@ -53,9 +53,18 @@ class VerifyEmailFragment : Fragment() {
             sendEmailVerificationRequest(token)
         }
 
+        setResendButtonOnClickListener()
+
         return view
     }
 
+    private fun setResendButtonOnClickListener() {
+        binding.resendEmailButton.setOnClickListener {
+            val email = storageUtil.getEmail()!!
+            resendEmailVerificationRequest(email)
+        }
+    }
+
     private fun sendEmailVerificationRequest(token: String) {
         CoroutineScope(Dispatchers.IO).launch {
             authViewModel.verifyEmailToken(token)
@@ -68,6 +77,28 @@ class VerifyEmailFragment : Fragment() {
         }
     }
 
+    private fun resendEmailVerificationRequest(email: String) {
+        CoroutineScope(Dispatchers.IO).launch {
+            authViewModel.verifyEmail(email)
+        }
+
+        authViewModel.authVerifyEmailResponse.observe(viewLifecycleOwner) { response ->
+            response?.let {
+                when (response) {
+                    is BaseResponse.Success -> {
+                        binding.messageTV.text = "Повторний запит на підтвердження email відправлено на адресу $email"
+                    }
+
+                    is BaseResponse.Error -> {
+                        binding.messageTV.text = "Помилка при повторному відправленні email: ${response.error?.message}"
+                    }
+
+                    is BaseResponse.Loading -> {}
+                }
+            }
+        }
+    }
+
     private fun handleVerificationEmailResponse(response: BaseResponse<AuthLoginResponse>) {
         when (response) {
             is BaseResponse.Success -> {

diff --git a/app/src/main/java/com/fictadvisor/android/utils/StorageKeys.kt b/app/src/main/java/com/fictadvisor/android/utils/StorageKeys.kt
@@ -4,4 +4,5 @@ enum class StorageKeys {
     ACCESS_TOKEN,
     REFRESH_TOKEN,
     TELEGRAM_INFO,
+    EMAIL
 }
diff --git a/app/src/main/java/com/fictadvisor/android/utils/StorageUtil.kt b/app/src/main/java/com/fictadvisor/android/utils/StorageUtil.kt
@@ -67,4 +67,16 @@ class StorageUtil(private val context: Context) {
             null
         }
     }
+
+    fun setEmail(email: String) {
+        context.getSharedPreferences(prefName, Context.MODE_PRIVATE).edit().apply {
+            putString(StorageKeys.EMAIL.name, email)
+            apply()
+        }
+    }
+
+    fun getEmail(): String? {
+        val prefs = context.getSharedPreferences(prefName, Context.MODE_PRIVATE)
+        return prefs.getString(StorageKeys.EMAIL.name, null)
+    }
 }
diff --git a/app/src/main/res/layout/fragment_verify_email.xml b/app/src/main/res/layout/fragment_verify_email.xml
@@ -18,4 +18,14 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <Button
+        android:id="@+id/resendEmailButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="50dp"
+        android:text="Відправити знову"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/messageTV" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>