fix: Migrate Settings from XML to compose openMF#2570

fix: Migrate Settings from XML to compose openMF#2570 fix: Migrate Settings from XML to compose openMF#2570 refactor: Migrate Settings from XML to compose openMF#2570 fix: Migrate Settings from XML to compose openMF#2570 migrate Settings to compose openMF#2570
itsPronay · Jun 14, 2024 · f8250e9 · f8250e9
1 parent d46ab72
commit f8250e9
Show file tree

Hide file tree

Showing 14 changed files with 838 additions and 220 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -150,7 +150,7 @@
             android:name=".utils.fcm.RegistrationIntentService"
             android:exported="false" />
 
-        <activity android:name=".ui.activities.SettingsActivity" />
+        <activity android:name="org.mifos.mobile.ui.settings.SettingsActivity" />
     </application>
 
 </manifest>
diff --git a/app/src/main/java/org/mifos/mobile/MifosSelfServiceApp.kt b/app/src/main/java/org/mifos/mobile/MifosSelfServiceApp.kt
@@ -11,7 +11,7 @@ import com.raizlabs.android.dbflow.config.FlowConfig
 import com.raizlabs.android.dbflow.config.FlowManager
 import dagger.hilt.android.HiltAndroidApp
 import org.mifos.mobile.api.local.PreferencesHelper
-import org.mifos.mobile.ui.fragments.applySavedTheme
+import org.mifos.mobile.ui.settings.applySavedTheme
 import org.mifos.mobile.utils.LanguageHelper
 import org.mifos.mobile.utils.LanguageHelper.onAttach
 import java.util.Locale

diff --git a/app/src/main/java/org/mifos/mobile/api/local/PreferencesHelper.kt b/app/src/main/java/org/mifos/mobile/api/local/PreferencesHelper.kt
@@ -7,7 +7,7 @@ import android.text.TextUtils
 import dagger.hilt.android.qualifiers.ApplicationContext
 import org.mifos.mobile.api.BaseURL
 import org.mifos.mobile.api.SelfServiceInterceptor
-import org.mifos.mobile.ui.fragments.AppTheme
+import org.mifos.mobile.ui.settings.AppTheme
 import javax.inject.Inject
 import javax.inject.Singleton
 

diff --git a/app/src/main/java/org/mifos/mobile/ui/activities/HomeActivity.kt b/app/src/main/java/org/mifos/mobile/ui/activities/HomeActivity.kt
@@ -39,6 +39,10 @@ import org.mifos.mobile.ui.getThemeAttributeColor
 import org.mifos.mobile.ui.help.HelpActivity
 import org.mifos.mobile.ui.home.HomeOldFragment
 import org.mifos.mobile.ui.login.LoginActivity
+import org.mifos.mobile.ui.settings.SettingsActivity
+import org.mifos.mobile.ui.third_party_transfer.ThirdPartyTransferComposeFragment
+import org.mifos.mobile.ui.notification.NotificationFragment
+import org.mifos.mobile.ui.recent_transactions.RecentTransactionsComposeFragment
 import org.mifos.mobile.utils.Constants
 import org.mifos.mobile.utils.TextDrawable
 import org.mifos.mobile.utils.Toaster

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
diff --git a/app/src/main/java/org/mifos/mobile/ui/guarantor/guarantor_details/GuarantorDetailScreen.kt b/app/src/main/java/org/mifos/mobile/ui/guarantor/guarantor_details/GuarantorDetailScreen.kt
@@ -1,14 +1,8 @@
 package org.mifos.mobile.ui.guarantor.guarantor_details
 
-import android.util.Log
 import android.widget.Toast
-import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Add
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -23,14 +17,12 @@ import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import org.mifos.mobile.R
-import org.mifos.mobile.core.ui.component.FloatingActionButtonContent
 import org.mifos.mobile.core.ui.component.MFScaffold
 import org.mifos.mobile.core.ui.component.MifosAlertDialog
 import org.mifos.mobile.core.ui.component.MifosErrorComponent
 import org.mifos.mobile.core.ui.component.MifosProgressIndicatorOverlay
 import org.mifos.mobile.core.ui.theme.MifosMobileTheme
 import org.mifos.mobile.models.guarantor.GuarantorPayload
-import org.mifos.mobile.ui.guarantor.guarantor_list.GuarantorListContent
 import org.mifos.mobile.utils.Network
 
 @Composable

diff --git a/.../mobile/ui/activities/SettingsActivity.kt → ...os/mobile/ui/settings/SettingsActivity.kt b/.../mobile/ui/activities/SettingsActivity.kt → ...os/mobile/ui/settings/SettingsActivity.kt
@@ -1,23 +1,23 @@
-package org.mifos.mobile.ui.activities
+package org.mifos.mobile.ui.settings
 
 import android.content.Intent
 import android.os.Bundle
 import androidx.core.app.ActivityCompat
 import org.mifos.mobile.R
-import org.mifos.mobile.databinding.ActivitySettingsBinding
+import org.mifos.mobile.databinding.ActivityUserProfileBinding
+import org.mifos.mobile.ui.activities.HomeActivity
 import org.mifos.mobile.ui.activities.base.BaseActivity
-import org.mifos.mobile.ui.fragments.SettingsFragment
 import org.mifos.mobile.utils.Constants
 
 class SettingsActivity : BaseActivity() {
-    private lateinit var binding: ActivitySettingsBinding
-    private var hasSettingsChanged = false
+    private lateinit var binding: ActivityUserProfileBinding
+    var hasSettingsChanged = false
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        binding = ActivitySettingsBinding.inflate(layoutInflater)
+        binding = ActivityUserProfileBinding.inflate(layoutInflater)
         setContentView(binding.root)
-        setToolbarTitle(getString(R.string.settings))
-        showBackButton()
+
         replaceFragment(SettingsFragment.newInstance(), false, R.id.container)
         if (intent.hasExtra(Constants.HAS_SETTINGS_CHANGED)) {
             hasSettingsChanged = intent.getBooleanExtra(
@@ -27,6 +27,7 @@ class SettingsActivity : BaseActivity() {
         }
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onBackPressed() {
         if (supportFragmentManager.backStackEntryCount == 0) {
             super.onBackPressed()
@@ -38,4 +39,4 @@ class SettingsActivity : BaseActivity() {
             supportFragmentManager.popBackStack()
         }
     }
-}
+}