From b3d2527ebce9c69a232ed913c8eb6f399339b0cc Mon Sep 17 00:00:00 2001
From: shaulascr <alya.roosyidah@gmail.com>
Date: Sat, 23 Aug 2025 00:02:30 +0700
Subject: [PATCH] fix register address

---
 .../auth/fragments/RegisterStep2Fragment.kt   | 34 +------------------
 .../auth/fragments/RegisterStep3Fragment.kt   | 15 +-------
 .../res/layout/fragment_register_step3.xml    |  2 +-
 3 files changed, 3 insertions(+), 48 deletions(-)

diff --git a/app/src/main/java/com/alya/ecommerce_serang/ui/auth/fragments/RegisterStep2Fragment.kt b/app/src/main/java/com/alya/ecommerce_serang/ui/auth/fragments/RegisterStep2Fragment.kt
index c273c9c..04fa4d1 100644
--- a/app/src/main/java/com/alya/ecommerce_serang/ui/auth/fragments/RegisterStep2Fragment.kt
+++ b/app/src/main/java/com/alya/ecommerce_serang/ui/auth/fragments/RegisterStep2Fragment.kt
@@ -381,36 +381,4 @@ class RegisterStep2Fragment : Fragment() {
         Log.d(TAG, "onDetach - final cleanup")
         stopTimer()
     }
-}
-
-//    override fun onDestroyView() {
-//        super.onDestroyView()
-//        countDownTimer?.cancel()
-//        _binding = null
-//    }
-
-//    private fun startResendCooldown() {
-//        Log.d(TAG, "startResendCooldown called")
-//        timeRemaining = 30
-//        binding.tvResendOtp.isEnabled = false
-//        binding.tvResendOtp.setTextColor(ContextCompat.getColor(requireContext(), R.color.soft_gray))
-//
-//        countDownTimer?.cancel()
-//        countDownTimer = object : CountDownTimer(30000, 1000) {
-//            override fun onTick(millisUntilFinished: Long) {
-//                timeRemaining = (millisUntilFinished / 1000).toInt()
-//                binding.tvTimer.text = "Kirim ulang OTP dalam waktu 00:${String.format("%02d", timeRemaining)}"
-//                if (timeRemaining % 5 == 0) {
-//                    Log.d(TAG, "Cooldown remaining: $timeRemaining seconds")
-//                }
-//            }
-//
-//            override fun onFinish() {
-//                Log.d(TAG, "Cooldown finished, enabling resend button")
-//                binding.tvTimer.text = "Dapat mengirim ulang kode OTP"
-//                binding.tvResendOtp.isEnabled = true
-//                binding.tvResendOtp.setTextColor(ContextCompat.getColor(requireContext(), R.color.blue1))
-//                timeRemaining = 0
-//            }
-//        }.start()
-//    }
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/alya/ecommerce_serang/ui/auth/fragments/RegisterStep3Fragment.kt b/app/src/main/java/com/alya/ecommerce_serang/ui/auth/fragments/RegisterStep3Fragment.kt
index d15acfb..07e45c4 100644
--- a/app/src/main/java/com/alya/ecommerce_serang/ui/auth/fragments/RegisterStep3Fragment.kt
+++ b/app/src/main/java/com/alya/ecommerce_serang/ui/auth/fragments/RegisterStep3Fragment.kt
@@ -96,19 +96,11 @@ class RegisterStep3Fragment : Fragment() {
             Log.d(TAG, "Auto-filled name: ${it.name}, phone: ${it.phone}")
         }
 
-        // Set up province and city dropdowns
         setupAutoComplete()
-
         setupEdgeToEdge()
 
         // Set up button listeners
         binding.btnPrevious.setOnClickListener {
-            // Go back to the previous step
-//            parentFragmentManager.popBackStack()
-//            (activity as? RegisterActivity)?.navigateToStep(2, null)
-//            (activity as? RegisterActivity)?.goBackToPreviousStep()
-
-            // Option 2: Direct navigation to step 1
             val step2Fragment = RegisterStep2Fragment()
             parentFragmentManager.beginTransaction()
                 .replace(R.id.fragment_container, step2Fragment)
@@ -117,14 +109,8 @@ class RegisterStep3Fragment : Fragment() {
 
         binding.btnRegister.setOnClickListener {
             submitAddress()
-            sessionManager.clearAll()
         }
 
-        // If user skips address entry
-//        binding.btnSkip.setOnClickListener {
-//            showRegistrationSuccess()
-//        }
-
         // Observe address submission state
         observeAddressSubmissionState()
 
@@ -513,6 +499,7 @@ class RegisterStep3Fragment : Fragment() {
     private fun showRegistrationSuccess() {
         // Now we can show the success message for the overall registration process
         Toast.makeText(requireContext(), "Berhasil mendaftarkan akun", Toast.LENGTH_LONG).show()
+        sessionManager.clearAll()
 
         // Navigate to login screen
         startActivity(Intent(requireContext(), LoginActivity::class.java))
diff --git a/app/src/main/res/layout/fragment_register_step3.xml b/app/src/main/res/layout/fragment_register_step3.xml
index 7c78223..4278e3d 100644
--- a/app/src/main/res/layout/fragment_register_step3.xml
+++ b/app/src/main/res/layout/fragment_register_step3.xml
@@ -261,7 +261,7 @@
         android:id="@+id/btn_register"
         android:layout_width="match_parent"
         android:layout_height="56dp"
-        android:layout_margin="16dp"
+        android:layout_marginHorizontal="16dp"
         android:background="@drawable/button_address_background"
         android:text="@string/signup"
         android:textAllCaps="false"