fix: Migrate Settings from XML to compose openMF#2570

itsPronay · Jun 14, 2024 · b9c4fc5 · b9c4fc5
1 parent bc76fe5
commit b9c4fc5
Show file tree

Hide file tree

Showing 11 changed files with 358 additions and 231 deletions.
diff --git a/app/src/main/java/org/mifos/mobile/models/notification/MifosNotification.kt b/app/src/main/java/org/mifos/mobile/models/notification/MifosNotification.kt
@@ -31,8 +31,8 @@ class MifosNotification : BaseModel() {
         this.timeStamp = timeStamp
     }
 
-    fun isRead(): Boolean? {
-        return read
+    fun isRead(): Boolean {
+        return read ?: false
     }
 
     fun setRead(read: Boolean?) {

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
@@ -40,6 +40,7 @@ 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.notification.NotificationFragment
 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/activities/NotificationActivity.kt b/app/src/main/java/org/mifos/mobile/ui/activities/NotificationActivity.kt
@@ -4,7 +4,7 @@ import android.os.Bundle
 import org.mifos.mobile.R
 import org.mifos.mobile.databinding.ActivityNotificationBinding
 import org.mifos.mobile.ui.activities.base.BaseActivity
-import org.mifos.mobile.ui.fragments.NotificationFragment
+import org.mifos.mobile.ui.notification.NotificationFragment
 
 class NotificationActivity : BaseActivity() {
 

diff --git a/app/src/main/java/org/mifos/mobile/ui/fragments/NotificationFragment.kt b/app/src/main/java/org/mifos/mobile/ui/fragments/NotificationFragment.kt
diff --git a/app/src/main/java/org/mifos/mobile/ui/notification/NotificationFragment.kt b/app/src/main/java/org/mifos/mobile/ui/notification/NotificationFragment.kt
@@ -0,0 +1,53 @@
+package org.mifos.mobile.ui.notification
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Toast
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener
+import com.github.therajanmaurya.sweeterror.SweetUIErrorHandler
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.launch
+import org.mifos.mobile.BuildConfig
+import org.mifos.mobile.R
+import org.mifos.mobile.core.ui.component.mifosComposeView
+import org.mifos.mobile.databinding.FragmentNotificationBinding
+import org.mifos.mobile.models.notification.MifosNotification
+import org.mifos.mobile.ui.activities.base.BaseActivity
+import org.mifos.mobile.ui.adapters.NotificationAdapter
+import org.mifos.mobile.ui.fragments.base.BaseFragment
+import org.mifos.mobile.utils.DividerItemDecoration
+import org.mifos.mobile.utils.Network
+import javax.inject.Inject
+
+/**
+ * Created by dilpreet on 13/9/17.
+ */
+@AndroidEntryPoint
+class NotificationFragment : BaseFragment() {
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?,
+    ): View {
+        (activity as? BaseActivity)?.hideToolbar()
+        return mifosComposeView(requireContext()) {
+            NotificationScreen(
+                navigateBack = { activity?.onBackPressed() }
+            )
+        }
+    }
+
+    companion object {
+        fun newInstance(): NotificationFragment {
+            return NotificationFragment()
+        }
+    }
+}