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 @@ 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">