From df25ba6656c39eb17492629dc6d09cc79ac51c90 Mon Sep 17 00:00:00 2001
From: ROHAN JADHAV <rj8342368@gmail.com>
Date: Fri, 6 Mar 2026 06:50:21 +0530
Subject: [PATCH] fix: add pull to refresh in space members list

---
 .../spaces/members/SpaceMembersFragment.kt    | 35 +++++++++++++++++--
 .../src/main/res/layout/members_fragment.xml  | 17 ++++++---
 2 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/owncloudApp/src/main/java/com/owncloud/android/presentation/spaces/members/SpaceMembersFragment.kt b/owncloudApp/src/main/java/com/owncloud/android/presentation/spaces/members/SpaceMembersFragment.kt
index 4ea5d250ba7..e184f33cbd2 100644
--- a/owncloudApp/src/main/java/com/owncloud/android/presentation/spaces/members/SpaceMembersFragment.kt
+++ b/owncloudApp/src/main/java/com/owncloud/android/presentation/spaces/members/SpaceMembersFragment.kt
@@ -29,6 +29,7 @@ import android.view.ViewGroup
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import com.owncloud.android.R
 import com.owncloud.android.databinding.MembersFragmentBinding
 import com.owncloud.android.domain.links.model.OCLink
@@ -102,6 +103,10 @@ class SpaceMembersFragment : Fragment(), SpaceMembersAdapter.SpaceMembersAdapter
 
         subscribeToViewModels()
 
+        binding.swipeRefreshMembers.setOnRefreshListener {
+            spaceMembersViewModel.getSpaceMembers()
+        }
+
         binding.addMemberButton.setOnClickListener {
             spaceMembersViewModel.resetViewModel()
             listener?.addMember(
@@ -166,6 +171,15 @@ class SpaceMembersFragment : Fragment(), SpaceMembersAdapter.SpaceMembersAdapter
     }
 
     private fun subscribeToViewModels() {
+        observeRoles()
+        observeSpaceMembers()
+        observeSpacePermissions()
+        observeAddMemberResult()
+        observeRemoveMemberResult()
+        observeEditMemberResult()
+    }
+
+    private fun observeRoles() {
         collectLatestLifecycleFlow(spaceMembersViewModel.roles) { event ->
             event?.let {
                 when (val uiResult = event.peekContent()) {
@@ -182,7 +196,9 @@ class SpaceMembersFragment : Fragment(), SpaceMembersAdapter.SpaceMembersAdapter
                 }
             }
         }
+    }
 
+    private fun observeSpaceMembers() {
         collectLatestLifecycleFlow(spaceMembersViewModel.spaceMembers) { event ->
             event?.let {
                 when (val uiResult = event.peekContent()) {
@@ -190,7 +206,8 @@ class SpaceMembersFragment : Fragment(), SpaceMembersAdapter.SpaceMembersAdapter
                         uiResult.data?.let {
                             if (roles.isNotEmpty()) {
                                 numberOfManagers = it.members.count { spaceMember ->
-                                    spaceMember.roles.contains(OCRoleType.toString(OCRoleType.CAN_MANAGE)) }
+                                    spaceMember.roles.contains(OCRoleType.toString(OCRoleType.CAN_MANAGE))
+                                }
                                 spaceMembers = it.members
                                 addMemberRoles = it.roles
                                 spaceMembersAdapter.setSpaceMembers(spaceMembers, roles, canRemoveMembers, canEditMembers, numberOfManagers)
@@ -198,10 +215,14 @@ class SpaceMembersFragment : Fragment(), SpaceMembersAdapter.SpaceMembersAdapter
                                 showOrHideEmptyView(hasLinks)
                                 if (hasLinks) { showSpaceLinks(it.links) }
                                 binding.indeterminateProgressBar.isVisible = false
+                                binding.swipeRefreshMembers.isRefreshing = false
                             }
                         }
                     }
-                    is UIResult.Loading -> { binding.indeterminateProgressBar.isVisible = true }
+                    is UIResult.Loading -> {
+                        binding.indeterminateProgressBar.isVisible = true
+                        binding.swipeRefreshMembers.isRefreshing = true
+                    }
                     is UIResult.Error -> {
                         requireActivity().finish()
                         Timber.e(uiResult.error, "Failed to retrieve space members for space: ${currentSpace.id} (${currentSpace.id})")
@@ -209,7 +230,9 @@ class SpaceMembersFragment : Fragment(), SpaceMembersAdapter.SpaceMembersAdapter
                 }
             }
         }
+    }
 
+    private fun observeSpacePermissions() {
         collectLatestLifecycleFlow(spaceMembersViewModel.spacePermissions) { event ->
             event?.let {
                 when (val uiResult = event.peekContent()) {
@@ -228,7 +251,9 @@ class SpaceMembersFragment : Fragment(), SpaceMembersAdapter.SpaceMembersAdapter
                 }
             }
         }
+    }
 
+    private fun observeAddMemberResult() {
         collectLatestLifecycleFlow(spaceMembersViewModel.addMemberResultFlow) { event ->
             event?.peekContent()?.let { uiResult ->
                 when (uiResult) {
@@ -241,7 +266,9 @@ class SpaceMembersFragment : Fragment(), SpaceMembersAdapter.SpaceMembersAdapter
                 }
             }
         }
+    }
 
+    private fun observeRemoveMemberResult() {
         collectLatestLifecycleFlow(spaceMembersViewModel.removeMemberResultFlow) { uiResult ->
             when (uiResult) {
                 is UIResult.Loading -> { }
@@ -255,7 +282,9 @@ class SpaceMembersFragment : Fragment(), SpaceMembersAdapter.SpaceMembersAdapter
                 }
             }
         }
+    }
 
+    private fun observeEditMemberResult() {
         collectLatestLifecycleFlow(spaceMembersViewModel.editMemberResultFlow) { event ->
             event?.peekContent()?.let { uiResult ->
                 when (uiResult) {
@@ -320,4 +349,4 @@ class SpaceMembersFragment : Fragment(), SpaceMembersAdapter.SpaceMembersAdapter
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/owncloudApp/src/main/res/layout/members_fragment.xml b/owncloudApp/src/main/res/layout/members_fragment.xml
index 9331537adf5..e8d399c6b26 100644
--- a/owncloudApp/src/main/res/layout/members_fragment.xml
+++ b/owncloudApp/src/main/res/layout/members_fragment.xml
@@ -16,13 +16,18 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.swiperefreshlayout.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/shareScroll"
+    android:id="@+id/swipe_refresh_members"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".presentation.spaces.members.SpaceMembersActivity">
+    android:layout_height="match_parent">
+
+    <androidx.core.widget.NestedScrollView
+        android:id="@+id/shareScroll"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:context=".presentation.spaces.members.SpaceMembersActivity">
 
     <LinearLayout
         android:id="@+id/members_section"
@@ -138,4 +143,6 @@
 
     </LinearLayout>
 
-</androidx.core.widget.NestedScrollView>
+    </androidx.core.widget.NestedScrollView>
+
+</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>