From 38da5a8269e62add2945d75f87817276b135ef9d Mon Sep 17 00:00:00 2001
From: kmanikanta335 <118070186+kmanikanta335@users.noreply.github.com>
Date: Sun, 5 Nov 2023 23:12:46 +0530
Subject: [PATCH 1/2] feature:error layout

---
 .../groupdetails/GroupDetailsFragment.kt      | 30 ++++++++++++++++++-
 .../res/layout/fragment_group_details.xml     |  8 ++++-
 .../src/main/res/values-ca/strings.xml        |  1 +
 .../src/main/res/values-en/strings.xml        |  1 +
 .../src/main/res/values-es/strings.xml        |  1 +
 .../src/main/res/values-fr/strings.xml        |  1 +
 .../src/main/res/values-hi/strings.xml        |  1 +
 .../src/main/res/values-kn/strings.xml        |  1 +
 .../src/main/res/values-sw/strings.xml        |  1 +
 .../src/main/res/values-zh/strings.xml        |  1 +
 .../src/main/res/values/strings.xml           |  2 ++
 11 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/groupdetails/GroupDetailsFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/groupdetails/GroupDetailsFragment.kt
index 2710e9a784f..dd5de6fdaa0 100644
--- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/groupdetails/GroupDetailsFragment.kt
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/groupdetails/GroupDetailsFragment.kt
@@ -10,12 +10,15 @@ import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
 import android.widget.AdapterView
+import android.widget.Button
 import android.widget.ListAdapter
 import android.widget.ListView
 import android.widget.TextView
 import android.widget.Toast
 import androidx.lifecycle.ViewModelProvider
 import androidx.navigation.fragment.findNavController
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.github.therajanmaurya.sweeterror.SweetUIErrorHandler
 import com.joanzapata.iconify.fonts.MaterialIcons
 import com.joanzapata.iconify.widget.IconTextView
 import com.mifos.mifosxdroid.R
@@ -45,6 +48,7 @@ class GroupDetailsFragment : MifosBaseFragment() {
     private lateinit var binding: FragmentGroupDetailsBinding
 
     private lateinit var viewModel: GroupDetailsViewModel
+    private var sweetUIErrorHandler: SweetUIErrorHandler? = null
 
     private var groupId = 0
     private var accountAccordion: AccountAccordion? = null
@@ -65,11 +69,14 @@ class GroupDetailsFragment : MifosBaseFragment() {
         viewModel = ViewModelProvider(this)[GroupDetailsViewModel::class.java]
         viewModel.loadGroupDetailsAndAccounts(groupId)
 
+        showUserInterface()
+
         viewModel.groupDetailsUiState.observe(viewLifecycleOwner) {
             when (it) {
                 is GroupDetailsUiState.ShowFetchingError -> {
                     showProgressbar(false)
-                    showFetchingError(it.message)
+                   // showFetchingError(it.message)
+                    showErrorLayout()
                 }
 
                 is GroupDetailsUiState.ShowGroup -> {
@@ -100,8 +107,29 @@ class GroupDetailsFragment : MifosBaseFragment() {
         binding.btnActivateGroup.setOnClickListener {
             onClickActivateGroup()
         }
+        binding.layoutError.findViewById<Button>(R.id.btnTryAgain).setOnClickListener {
+            reloadOnError()
+        }
+    }
+
+    fun reloadOnError() {
+        sweetUIErrorHandler?.hideSweetErrorLayoutUI(binding.scrollGroupDetails, binding.layoutError)
+        viewModel.loadGroupDetailsAndAccounts(groupId)
+
     }
 
+    private fun showErrorLayout() {
+        val errorMessage = getStringMessage(R.string.failed_to_load_group_details)
+        sweetUIErrorHandler?.showSweetErrorUI(
+            errorMessage, R.drawable.ic_error_black_24dp,
+            binding.scrollGroupDetails, binding.layoutError
+        )
+    }
+
+    private fun showUserInterface() {
+
+        sweetUIErrorHandler = SweetUIErrorHandler(requireActivity(), binding.root)
+    }
     private fun onClickActivateGroup() {
         val action = GroupDetailsFragmentDirections.actionGroupDetailsFragmentToActivateFragment(
             groupId,
diff --git a/mifosng-android/src/main/res/layout/fragment_group_details.xml b/mifosng-android/src/main/res/layout/fragment_group_details.xml
index 7f9ddf8acef..cc7ff7bf315 100644
--- a/mifosng-android/src/main/res/layout/fragment_group_details.xml
+++ b/mifosng-android/src/main/res/layout/fragment_group_details.xml
@@ -7,7 +7,9 @@
     android:layout_marginStart="@dimen/default_padding"
     android:layout_marginEnd="@dimen/default_padding">
 
-    <ScrollView style="@style/ScrollView.Base">
+    <ScrollView
+        android:id="@+id/scroll_group_details"
+        style="@style/ScrollView.Base">
 
         <LinearLayout style="@style/LinearLayout.Base">
 
@@ -176,5 +178,9 @@
             android:background="@color/accent"
             android:text="@string/activate_group" />
     </LinearLayout>
+    <include
+        android:id="@+id/layout_error"
+        layout="@layout/layout_sweet_exception_handler"
+        android:visibility="gone" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/mifosng-android/src/main/res/values-ca/strings.xml b/mifosng-android/src/main/res/values-ca/strings.xml
index d9c15acc25d..d789afe9d6e 100755
--- a/mifosng-android/src/main/res/values-ca/strings.xml
+++ b/mifosng-android/src/main/res/values-ca/strings.xml
@@ -165,5 +165,6 @@
     <string name="dark_mode">mode fosc</string>
 
     <string name="accounts">Comptes</string>
+    <string name="failed_to_load_group_details">No s\'han pogut carregar els detalls del grup</string>
 
 </resources>
diff --git a/mifosng-android/src/main/res/values-en/strings.xml b/mifosng-android/src/main/res/values-en/strings.xml
index 42f7d3df2fe..4ce296abaa2 100755
--- a/mifosng-android/src/main/res/values-en/strings.xml
+++ b/mifosng-android/src/main/res/values-en/strings.xml
@@ -188,6 +188,7 @@
     <string name="valid">Valid</string>
     <string name="surveyEmpty">This Survey is Empty</string>
     <string name="accounts">Accounts</string>
+    <string name="failed_to_load_group_details">Failed To Load Group Details</string>
 
 
 </resources>
diff --git a/mifosng-android/src/main/res/values-es/strings.xml b/mifosng-android/src/main/res/values-es/strings.xml
index 1a50d0cf69a..bebbfe958f3 100755
--- a/mifosng-android/src/main/res/values-es/strings.xml
+++ b/mifosng-android/src/main/res/values-es/strings.xml
@@ -165,5 +165,6 @@
     <string name="dark_mode">modo oscuro</string>
 
     <string name="accounts">cuenta</string>
+    <string name="failed_to_load_group_details">Error al cargar los detalles del grupo</string>
 
 </resources>
diff --git a/mifosng-android/src/main/res/values-fr/strings.xml b/mifosng-android/src/main/res/values-fr/strings.xml
index fb350f47bb5..a30715fd64d 100644
--- a/mifosng-android/src/main/res/values-fr/strings.xml
+++ b/mifosng-android/src/main/res/values-fr/strings.xml
@@ -613,5 +613,6 @@
     <string name="dark_mode">mode sombre</string>
 
     <string name="accounts">Compte</string>
+    <string name="failed_to_load_group_details">Echec du chargement des détails du groupe</string>
 
 </resources>
diff --git a/mifosng-android/src/main/res/values-hi/strings.xml b/mifosng-android/src/main/res/values-hi/strings.xml
index 5e645512697..edd29f778fa 100644
--- a/mifosng-android/src/main/res/values-hi/strings.xml
+++ b/mifosng-android/src/main/res/values-hi/strings.xml
@@ -640,5 +640,6 @@
     <string name="lang_changed">भाषा बदली गए</string>
     <string name="lang_change_description">उस भाषा का चयन करें जिसमें आप ऐप देखना चाहते हैं</string>
     <string name="dark_mode">डार्क मोडं</string>
+    <string name="failed_to_load_group_details">समूह विवरण लोड करने में विफल</string>
 
 </resources>
\ No newline at end of file
diff --git a/mifosng-android/src/main/res/values-kn/strings.xml b/mifosng-android/src/main/res/values-kn/strings.xml
index 90c5dc1613d..de603848a0a 100644
--- a/mifosng-android/src/main/res/values-kn/strings.xml
+++ b/mifosng-android/src/main/res/values-kn/strings.xml
@@ -595,5 +595,6 @@
     <string name="dark_mode">ಡಾರ್ಕ್ ಮೋಡ್</string>
 
     <string name="accounts">ಖಾತೆ</string>
+    <string name="failed_to_load_group_details">ಸಮೂಹ ವಿವರಗಳನ್ನು ಲೋಡ್ ಮಾಡಲು ವಿಫಲವಾಗಿದೆ</string>
 
 </resources>
\ No newline at end of file
diff --git a/mifosng-android/src/main/res/values-sw/strings.xml b/mifosng-android/src/main/res/values-sw/strings.xml
index c61528bba74..fe61c7f0733 100644
--- a/mifosng-android/src/main/res/values-sw/strings.xml
+++ b/mifosng-android/src/main/res/values-sw/strings.xml
@@ -732,5 +732,6 @@
     <string name="lang_changed">Lugha Imebadilishwa</string>
     <string name="lang_change_description">Chagua lugha ambayo unataka kutazama programu</string>
     <string name="dark_mode">hali ya giza</string>
+    <string name="failed_to_load_group_details">Imeshindwa Kupakia Maelezo ya Kikundi</string>
 
 </resources>
\ No newline at end of file
diff --git a/mifosng-android/src/main/res/values-zh/strings.xml b/mifosng-android/src/main/res/values-zh/strings.xml
index 3ef79bc1da2..17215a8db53 100755
--- a/mifosng-android/src/main/res/values-zh/strings.xml
+++ b/mifosng-android/src/main/res/values-zh/strings.xml
@@ -721,6 +721,7 @@
     <string name="lang_changed">语言已更改</string>
     <string name="lang_change_description">选择您要查看应用程序的语言</string>
     <string name="dark_mode">暗模式</string>
+    <string name="failed_to_load_group_details">无以加载组详细信息</string>
 
 
 </resources>
diff --git a/mifosng-android/src/main/res/values/strings.xml b/mifosng-android/src/main/res/values/strings.xml
index 75e55c98876..ec6a97e417d 100755
--- a/mifosng-android/src/main/res/values/strings.xml
+++ b/mifosng-android/src/main/res/values/strings.xml
@@ -652,6 +652,7 @@
     <string name="failed_to_sync_loan">Failed to Sync Loan</string>
     <string name="failed_to_sync_loanrepayment">Failed to Sync LoanRepayment</string>
     <string name="failed_to_load_client">Failed To Load Clients</string>
+    <string name="failed_to_group_details">Failed To Load Group Details</string>
     <string name="failed_to_fetch_savingsaccount">Failed To Fetch SavingsAccount</string>
     <string name="failed_to_fetch_datatable">Failed To Fetch DataTable</string>
     <string name="failed_to_fetch_savings_template">Failed to load Saving Template</string>
@@ -916,5 +917,6 @@
 
     <string name="instance_url">Instance Url</string>
     <string name="no_check_inbox">Checker Inbox is empty</string>
+    <string name="failed_to_load_group_details">Failed To Load Group Details</string>
 
 </resources>

From 22fc76a9f861c6de7367e92c861e5fc6440ad61c Mon Sep 17 00:00:00 2001
From: kmanikanta335 <118070186+kmanikanta335@users.noreply.github.com>
Date: Sun, 3 Mar 2024 17:55:40 +0530
Subject: [PATCH 2/2] changes are resolved

---
 .../groupdetails/GroupDetailsFragment.kt      | 38 ++++++++-----------
 1 file changed, 15 insertions(+), 23 deletions(-)

diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/groupdetails/GroupDetailsFragment.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/groupdetails/GroupDetailsFragment.kt
index 3bbda7013ac..265b28d0605 100644
--- a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/groupdetails/GroupDetailsFragment.kt
+++ b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/groupdetails/GroupDetailsFragment.kt
@@ -65,14 +65,13 @@ class GroupDetailsFragment : MifosBaseFragment() {
         viewModel = ViewModelProvider(this)[GroupDetailsViewModel::class.java]
         viewModel.loadGroupDetailsAndAccounts(groupId)
 
-        showUserInterface()
+        sweetUIErrorHandler = SweetUIErrorHandler(requireActivity(), binding.root)
 
         viewModel.groupDetailsUiState.observe(viewLifecycleOwner) {
             when (it) {
                 is GroupDetailsUiState.ShowFetchingError -> {
                     showProgressbar(false)
-                   // showFetchingError(it.message)
-                    showErrorLayout()
+                    showFetchingError()
                 }
 
                 is GroupDetailsUiState.ShowGroup -> {
@@ -90,7 +89,10 @@ class GroupDetailsFragment : MifosBaseFragment() {
                     showGroupClients(it.clientMembers)
                 }
 
-                is GroupDetailsUiState.ShowProgressbar -> showProgressbar(it.state)
+                is GroupDetailsUiState.ShowProgressbar -> {
+                    sweetUIErrorHandler?.hideSweetErrorLayoutUI(binding.scrollGroupDetails, binding.layoutError)
+                    showProgressbar(it.state)
+                }
             }
         }
 
@@ -103,29 +105,15 @@ class GroupDetailsFragment : MifosBaseFragment() {
         binding.btnActivateGroup.setOnClickListener {
             onClickActivateGroup()
         }
-        binding.layoutError.findViewById<Button>(R.id.btnTryAgain).setOnClickListener {
-            reloadOnError()
+        binding.layoutError.findViewById<Button>(com.github.therajanmaurya.sweeterror.R.id.btnTryAgain).setOnClickListener {
+            loadGroupDetailsAndAccounts()
         }
     }
 
-    fun reloadOnError() {
-        sweetUIErrorHandler?.hideSweetErrorLayoutUI(binding.scrollGroupDetails, binding.layoutError)
+    fun loadGroupDetailsAndAccounts() {
         viewModel.loadGroupDetailsAndAccounts(groupId)
-
-    }
-
-    private fun showErrorLayout() {
-        val errorMessage = getStringMessage(R.string.failed_to_load_group_details)
-        sweetUIErrorHandler?.showSweetErrorUI(
-            errorMessage, R.drawable.ic_error_black_24dp,
-            binding.scrollGroupDetails, binding.layoutError
-        )
     }
 
-    private fun showUserInterface() {
-
-        sweetUIErrorHandler = SweetUIErrorHandler(requireActivity(), binding.root)
-    }
     private fun onClickActivateGroup() {
         val action = GroupDetailsFragmentDirections.actionGroupDetailsFragmentToActivateFragment(
             groupId,
@@ -281,8 +269,12 @@ class GroupDetailsFragment : MifosBaseFragment() {
         }
     }
 
-    private fun showFetchingError(errorMessage: Int) {
-        Toast.makeText(activity, getStringMessage(errorMessage), Toast.LENGTH_SHORT).show()
+    private fun showFetchingError() {
+        val errorMessage = getStringMessage(R.string.failed_to_load_group_details)
+        sweetUIErrorHandler?.showSweetErrorUI(
+            errorMessage, R.drawable.ic_error_black_24dp,
+            binding.scrollGroupDetails, binding.layoutError
+        )
     }
 
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {