Merge branch 'development' of https://github.com/PratyushSingh07/mifo…

…s-mobile into development
PratyushSingh07 · Mar 19, 2024 · 0bee126 · 0bee126
2 parents eae5f22 + b1aabdf
commit 0bee126
Show file tree

Hide file tree

Showing 33 changed files with 1,276 additions and 783 deletions.
diff --git a/README.md b/README.md
@@ -1,3 +1,7 @@
+<p>
+  <img src="https://github.com/Vikashgathala/mifos-mobile/assets/12993867/0fd88221-24b4-4f6c-b589-45322a544a28" />
+</p>
+
 <img height='175' src="https://user-images.githubusercontent.com/37406965/51083189-d5dc3a80-173b-11e9-8ca0-28015e0893ac.png" align="left" hspace="1" vspace="1">
 
 # Mifos-Mobile Android Application for MifosX
@@ -20,11 +24,7 @@ An Android Application built on top of the MifosX Self-Service platform for end-
 
 Mifos boasts an active and vibrant contributor community, Please join us on [slack](https://mifos.slack.com/). Once you've joined the mifos slack community, please join the `#mifos-mobile` channel to engage with mifos-mobile development. If you encounter any difficulties joining our Slack channel, please don't hesitate to open an issue. This will allow us to assist you promptly or send you an invitation.
 
-## Screenshots
 
-<p>
-  <img src="https://user-images.githubusercontent.com/24931732/48102172-b0ccc800-e1de-11e8-9fb9-17c41234636e.png" />
-</p>
 
 ## How to Contribute
 

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -144,7 +144,7 @@
 
         <provider
             android:name="androidx.core.content.FileProvider"
-            android:authorities="org.org.mobile.fileprovider"
+            android:authorities="org.mifos.mobile.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true">
             <meta-data

diff --git a/app/src/main/java/org/mifos/mobile/ui/activities/LoanAccountContainerActivity.kt b/app/src/main/java/org/mifos/mobile/ui/activities/LoanAccountContainerActivity.kt
@@ -1,10 +1,11 @@
 package org.mifos.mobile.ui.activities
 
 import android.os.Bundle
+import android.view.View
 import org.mifos.mobile.R
 import org.mifos.mobile.databinding.ActivityContainerBinding
 import org.mifos.mobile.ui.activities.base.BaseActivity
-import org.mifos.mobile.ui.fragments.LoanAccountsDetailFragment
+import org.mifos.mobile.ui.loan_account.LoanAccountsDetailFragment
 import org.mifos.mobile.utils.Constants
 
 /*

diff --git a/app/src/main/java/org/mifos/mobile/ui/activities/SavingsAccountApplicationActivity.kt b/app/src/main/java/org/mifos/mobile/ui/activities/SavingsAccountApplicationActivity.kt
@@ -5,7 +5,7 @@ import org.mifos.mobile.R
 import org.mifos.mobile.databinding.ActivitySavingsAccountApplicationBinding
 import org.mifos.mobile.ui.activities.base.BaseActivity
 import org.mifos.mobile.ui.enums.SavingsAccountState
-import org.mifos.mobile.ui.fragments.SavingsAccountApplicationFragment.Companion.newInstance
+import org.mifos.mobile.ui.savings_account_application.SavingsAccountApplicationFragment.Companion.newInstance
 
 /*
 * Created by saksham on 30/June/2018

diff --git a/app/src/main/java/org/mifos/mobile/ui/activities/SavingsAccountContainerActivity.kt b/app/src/main/java/org/mifos/mobile/ui/activities/SavingsAccountContainerActivity.kt
@@ -36,18 +36,6 @@ class SavingsAccountContainerActivity : BaseActivity() {
         }
     }
 
-    fun hideToolbar() {
-        binding.apply {
-            toolbar?.visibility = View.GONE
-        }
-    }
-
-    fun showToolbar() {
-        binding.apply {
-            toolbar?.visibility = View.VISIBLE
-        }
-    }
-
     companion object {
         var transferSuccess = false
     }

diff --git a/app/src/main/java/org/mifos/mobile/ui/activities/base/BaseActivity.kt b/app/src/main/java/org/mifos/mobile/ui/activities/base/BaseActivity.kt
@@ -51,6 +51,16 @@ open class BaseActivity : BasePassCodeActivity(), BaseActivityCallback {
         }
     }
 
+    fun showToolbar() {
+        toolbar = findViewById(R.id.toolbar)
+        toolbar?.visibility = View.VISIBLE
+    }
+
+    fun hideToolbar() {
+        toolbar = findViewById(R.id.toolbar)
+        toolbar?.visibility = View.GONE
+    }
+
     /**
      * Used for removing elevation from toolbar
      */

diff --git a/app/src/main/java/org/mifos/mobile/ui/fragments/ClientChargeFragment.kt b/app/src/main/java/org/mifos/mobile/ui/fragments/ClientChargeFragment.kt
@@ -18,6 +18,7 @@ import org.mifos.mobile.R
 import org.mifos.mobile.databinding.FragmentClientChargeBinding
 import org.mifos.mobile.models.Charge
 import org.mifos.mobile.ui.activities.SavingsAccountContainerActivity
+import org.mifos.mobile.ui.activities.base.BaseActivity
 import org.mifos.mobile.ui.adapters.ClientChargeAdapter
 import org.mifos.mobile.ui.enums.ChargeType
 import org.mifos.mobile.ui.fragments.base.BaseFragment
@@ -49,7 +50,7 @@ class ClientChargeFragment : BaseFragment() {
     private var sweetUIErrorHandler: SweetUIErrorHandler? = null
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        (activity as? SavingsAccountContainerActivity)?.showToolbar()
+        (activity as? BaseActivity)?.showToolbar()
         if (arguments != null) {
             id = arguments?.getLong(Constants.CLIENT_ID)
             chargeType = arguments?.getCheckedSerializable(

diff --git a/app/src/main/java/org/mifos/mobile/ui/fragments/GuarantorListFragment.kt b/app/src/main/java/org/mifos/mobile/ui/fragments/GuarantorListFragment.kt
@@ -47,6 +47,7 @@ class GuarantorListFragment : BaseFragment() {
     private var disposableDeleteGuarantor: Disposable? = null
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        (activity as? BaseActivity)?.showToolbar()
         if (arguments != null) loanId = requireArguments().getLong(Constants.LOAN_ID)
     }
 

diff --git a/app/src/main/java/org/mifos/mobile/ui/fragments/LoanAccountSummaryFragment.kt b/app/src/main/java/org/mifos/mobile/ui/fragments/LoanAccountSummaryFragment.kt
@@ -8,6 +8,7 @@ import dagger.hilt.android.AndroidEntryPoint
 import org.mifos.mobile.R
 import org.mifos.mobile.databinding.FragmentLoanAccountSummaryBinding
 import org.mifos.mobile.models.accounts.loan.LoanWithAssociations
+import org.mifos.mobile.ui.activities.base.BaseActivity
 import org.mifos.mobile.ui.fragments.base.BaseFragment
 import org.mifos.mobile.utils.Constants
 import org.mifos.mobile.utils.CurrencyUtil
@@ -26,6 +27,7 @@ class LoanAccountSummaryFragment : BaseFragment() {
     private var loanWithAssociations: LoanWithAssociations? = null
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        (activity as? BaseActivity)?.showToolbar()
         if (arguments != null) {
             loanWithAssociations = arguments?.getCheckedParcelable(LoanWithAssociations::class.java, Constants.LOAN_ACCOUNT)
         }

diff --git a/app/src/main/java/org/mifos/mobile/ui/fragments/LoanAccountTransactionFragment.kt b/app/src/main/java/org/mifos/mobile/ui/fragments/LoanAccountTransactionFragment.kt
@@ -19,6 +19,7 @@ import kotlinx.coroutines.launch
 import org.mifos.mobile.R
 import org.mifos.mobile.databinding.FragmentLoanAccountTransactionsBinding
 import org.mifos.mobile.models.accounts.loan.LoanWithAssociations
+import org.mifos.mobile.ui.activities.base.BaseActivity
 import org.mifos.mobile.ui.adapters.RecentTransactionListAdapter
 import org.mifos.mobile.ui.fragments.base.BaseFragment
 import org.mifos.mobile.utils.Constants
@@ -50,6 +51,7 @@ class LoanAccountTransactionFragment : BaseFragment() {
     private var sweetUIErrorHandler: SweetUIErrorHandler? = null
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        (activity as? BaseActivity)?.showToolbar()
         if (arguments != null) {
             loanId = arguments?.getLong(Constants.LOAN_ID)
         }

diff --git a/app/src/main/java/org/mifos/mobile/ui/fragments/LoanAccountWithdrawFragment.kt b/app/src/main/java/org/mifos/mobile/ui/fragments/LoanAccountWithdrawFragment.kt
@@ -14,6 +14,7 @@ import org.mifos.mobile.R
 import org.mifos.mobile.databinding.FragmentLoanWithdrawBinding
 import org.mifos.mobile.models.accounts.loan.LoanWithAssociations
 import org.mifos.mobile.models.accounts.loan.LoanWithdraw
+import org.mifos.mobile.ui.activities.base.BaseActivity
 import org.mifos.mobile.ui.fragments.base.BaseFragment
 import org.mifos.mobile.utils.Constants
 import org.mifos.mobile.utils.DateHelper
@@ -36,6 +37,7 @@ class LoanAccountWithdrawFragment : BaseFragment() {
     private var loanWithAssociations: LoanWithAssociations? = null
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        (activity as? BaseActivity)?.showToolbar()
         if (arguments != null) {
             loanWithAssociations = arguments?.getCheckedParcelable(LoanWithAssociations::class.java, Constants.LOAN_ACCOUNT)
         }