From 1eb135d48e73a4b589beff8b9588e12020c1119b Mon Sep 17 00:00:00 2001
From: Gracia Hotmauli <95269134+hotmauligracia@users.noreply.github.com>
Date: Sat, 23 Aug 2025 09:09:35 +0700
Subject: [PATCH] change password

---
 .idea/deploymentTargetSelector.xml                          | 4 ++--
 .idea/deviceManager.xml                                     | 2 +-
 .../ecommerce_serang/ui/profile/ChangePasswordActivity.kt   | 6 ++++++
 .../com/alya/ecommerce_serang/ui/profile/ProfileFragment.kt | 4 +++-
 app/src/main/res/layout/activity_change_password.xml        | 2 +-
 5 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index b9f33c3..0b1f6b9 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2025-08-17T17:32:55.497700100Z">
+        <DropdownSelection timestamp="2025-08-23T01:49:41.982701700Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\Gracia Hotmauli\.android\avd\Pixel_9_2.avd" />
+              <DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\Gracia Hotmauli\.android\avd\Pixel_9a.avd" />
             </handle>
           </Target>
         </DropdownSelection>
diff --git a/.idea/deviceManager.xml b/.idea/deviceManager.xml
index 91f9558..eebfe8e 100644
--- a/.idea/deviceManager.xml
+++ b/.idea/deviceManager.xml
@@ -5,7 +5,7 @@
       <list>
         <ColumnSorterState>
           <option name="column" value="Name" />
-          <option name="order" value="ASCENDING" />
+          <option name="order" value="DESCENDING" />
         </ColumnSorterState>
       </list>
     </option>
diff --git a/app/src/main/java/com/alya/ecommerce_serang/ui/profile/ChangePasswordActivity.kt b/app/src/main/java/com/alya/ecommerce_serang/ui/profile/ChangePasswordActivity.kt
index 946b39e..b7989a8 100644
--- a/app/src/main/java/com/alya/ecommerce_serang/ui/profile/ChangePasswordActivity.kt
+++ b/app/src/main/java/com/alya/ecommerce_serang/ui/profile/ChangePasswordActivity.kt
@@ -39,6 +39,12 @@ class ChangePasswordActivity : AppCompatActivity() {
 
         sessionManager = SessionManager(this)
 
+        binding.header.headerTitle.text = "Ubah Kata Sandi"
+        binding.header.headerLeftIcon.setOnClickListener {
+            onBackPressedDispatcher.onBackPressed()
+            finish()
+        }
+
         // Listen for the result of the password change
         viewModel.changePasswordResult.observe(this, Observer { result ->
             when (result) {
diff --git a/app/src/main/java/com/alya/ecommerce_serang/ui/profile/ProfileFragment.kt b/app/src/main/java/com/alya/ecommerce_serang/ui/profile/ProfileFragment.kt
index 612ab4f..5c76fe8 100644
--- a/app/src/main/java/com/alya/ecommerce_serang/ui/profile/ProfileFragment.kt
+++ b/app/src/main/java/com/alya/ecommerce_serang/ui/profile/ProfileFragment.kt
@@ -115,7 +115,9 @@ class ProfileFragment : Fragment() {
                         when (store.approvalStatus) {
                             "process" -> startActivity(Intent(requireContext(), StoreOnReviewActivity::class.java))
                             "rejected" -> startActivity(
-                                Intent(requireContext(), RegisterStoreActivity::class.java).putExtra("REAPPLY", true))
+                                Intent(requireContext(), RegisterStoreActivity::class.java)
+                                    .putExtra("REAPPLY", true)
+                            )
                             else -> {
                                 when(store.storeStatus){
                                     "suspended" -> startActivity(Intent(requireContext(), StoreSuspendedActivity::class.java))
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index 9ef0a84..5617d98 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -10,7 +10,7 @@
     tools:context=".ui.profile.ChangePasswordActivity">
 
     <include
-        android:id="@+id/headerStoreProduct"
+        android:id="@+id/header"
         layout="@layout/header" />
 
     <androidx.constraintlayout.widget.ConstraintLayout