migrate update password screen to compose

migrate update password screen to compose migrate update password screen to compose migrate update password screen to compose Migration of update password screen to compose Migration of update password screen to compose migrate update update password to compose migration of Update password screen to compose Refractor: Migration of Update Password to compose Refractor: Migration of Update Password to compose migration of update password to compose migrate Update password to compose update Password to compose migration
openMF · Apr 5, 2024 · 2638de2 · 2638de2
1 parent 203cd9c
commit 2638de2
Show file tree

Hide file tree

Showing 13 changed files with 458 additions and 237 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -86,6 +86,10 @@
             android:configChanges="orientation|screenSize"
             android:windowSoftInputMode="adjustResize" />
 
+        <activity android:name=".ui.update_password.UpdatePasswordActivity"
+            android:configChanges="orientation|screenSize"
+            android:windowSoftInputMode="adjustResize" />
+
         <activity
             android:name="com.google.android.gms.oss.licenses.OssLicensesMenuActivity"
             android:configChanges="orientation|screenSize"

diff --git a/app/src/main/java/org/mifos/mobile/ui/activities/EditUserDetailActivity.kt b/app/src/main/java/org/mifos/mobile/ui/activities/EditUserDetailActivity.kt
@@ -4,7 +4,7 @@ import android.os.Bundle
 import org.mifos.mobile.R
 import org.mifos.mobile.databinding.ActivityEditUserDetailBinding
 import org.mifos.mobile.ui.activities.base.BaseActivity
-import org.mifos.mobile.ui.fragments.UpdatePasswordFragment
+import org.mifos.mobile.ui.update_password.UpdatePasswordFragment
 
 /*
 * Created by saksham on 14/July/2018

diff --git a/app/src/main/java/org/mifos/mobile/ui/fragments/SettingsFragment.kt b/app/src/main/java/org/mifos/mobile/ui/fragments/SettingsFragment.kt
@@ -17,6 +17,8 @@ import org.mifos.mobile.R
 import org.mifos.mobile.api.local.PreferencesHelper
 import org.mifos.mobile.ui.activities.PassCodeActivity
 import org.mifos.mobile.ui.activities.base.BaseActivity
+import org.mifos.mobile.ui.update_password.UpdatePasswordActivity
+import org.mifos.mobile.ui.update_password.UpdatePasswordFragment
 import org.mifos.mobile.utils.ConfigurationDialogFragmentCompat
 import org.mifos.mobile.utils.ConfigurationPreference
 import org.mifos.mobile.utils.Constants
@@ -84,6 +86,7 @@ class SettingsFragment : PreferenceFragmentCompat(), OnSharedPreferenceChangeLis
 
     override fun onResume() {
         super.onResume()
+        (activity as? BaseActivity)?.showToolbar()
         activity?.title = getString(R.string.settings)
         preferenceScreen.sharedPreferences.registerOnSharedPreferenceChangeListener(this)
     }

diff --git a/app/src/main/java/org/mifos/mobile/ui/fragments/UpdatePasswordFragment.kt b/app/src/main/java/org/mifos/mobile/ui/fragments/UpdatePasswordFragment.kt
diff --git a/app/src/main/java/org/mifos/mobile/ui/registration/RegistrationActivity.kt b/app/src/main/java/org/mifos/mobile/ui/registration/RegistrationActivity.kt
@@ -3,8 +3,8 @@ package org.mifos.mobile.ui.registration
 import android.os.Bundle
 import org.mifos.mobile.R
 import org.mifos.mobile.databinding.ActivityRegistrationBinding
+import org.mifos.mobile.databinding.ActivityUserProfileBinding
 import org.mifos.mobile.ui.activities.base.BaseActivity
-import org.mifos.mobile.ui.registration.RegistrationFragment
 import org.mifos.mobile.utils.MaterialDialog
 
 class RegistrationActivity : BaseActivity() {
@@ -27,5 +27,4 @@ class RegistrationActivity : BaseActivity() {
             .createMaterialDialog()
             .show()
     }
-
 }
diff --git a/app/src/main/java/org/mifos/mobile/ui/update_password/UpdatePasswordActivity.kt b/app/src/main/java/org/mifos/mobile/ui/update_password/UpdatePasswordActivity.kt
@@ -0,0 +1,29 @@
+package org.mifos.mobile.ui.update_password
+
+import android.annotation.SuppressLint
+import android.os.Bundle
+import org.mifos.mobile.R
+import org.mifos.mobile.databinding.ActivityUpdatePaswordBinding
+import org.mifos.mobile.databinding.ActivityUserProfileBinding
+import org.mifos.mobile.ui.activities.base.BaseActivity
+import org.mifos.mobile.utils.MaterialDialog
+
+class UpdatePasswordActivity : BaseActivity() {
+    private lateinit var binding: ActivityUpdatePaswordBinding
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = ActivityUpdatePaswordBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+        replaceFragment(UpdatePasswordFragment.newInstance(), false, R.id.container)
+    }
+
+    override fun onBackPressed() {
+        super.onBackPressed()
+        if (fragmentManager?.backStackEntryCount!! > 0) {
+            fragmentManager?.popBackStack()
+        } else {
+            super.onBackPressed()
+        }
+    }
+}