Skip to content

[FEATURE REQUEST] Pull to refresh in the member list #4801

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rohan-jadhav-dev wants to merge 1 commit into
base: master
Choose a base branch
from
+44 −8
Open

[FEATURE REQUEST] Pull to refresh in the member list #4801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 32 additions & 3 deletions ...pp/src/main/java/com/owncloud/android/presentation/spaces/members/SpaceMembersFragment.kt
View file
Open in desktop
Copy link
Collaborator

@joragua joragua Mar 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing blank line at the end of the file (Detekt is also reporting this)

Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -102,6 +103,10 @@ class SpaceMembersFragment : Fragment(), SpaceMembersAdapter.SpaceMembersAdapter

subscribeToViewModels()

binding.swipeRefreshMembers.setOnRefreshListener {
spaceMembersViewModel.getSpaceMembers()
}
Comment on lines +106 to +108
Copy link
Collaborator

@joragua joragua Mar 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you take into account that permissions also need to be refreshed? That means the user role can change while the refreshing is happening. For example, if a user changes from Manager to Viewer, actions icons such as trash, edit or add should no longer be displayed. 🤔


binding.addMemberButton.setOnClickListener {
spaceMembersViewModel.resetViewModel()
listener?.addMember(
Expand Down Expand Up @@ -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()) {
Expand All @@ -182,34 +196,43 @@ class SpaceMembersFragment : Fragment(), SpaceMembersAdapter.SpaceMembersAdapter
}
}
}
}

private fun observeSpaceMembers() {
collectLatestLifecycleFlow(spaceMembersViewModel.spaceMembers) { event ->
event?.let {
when (val uiResult = event.peekContent()) {
is UIResult.Success -> {
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)
val hasLinks = it.links.isNotEmpty()
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})")
}
}
}
}
}

private fun observeSpacePermissions() {
collectLatestLifecycleFlow(spaceMembersViewModel.spacePermissions) { event ->
event?.let {
when (val uiResult = event.peekContent()) {
Expand All @@ -228,7 +251,9 @@ class SpaceMembersFragment : Fragment(), SpaceMembersAdapter.SpaceMembersAdapter
}
}
}
}

private fun observeAddMemberResult() {
collectLatestLifecycleFlow(spaceMembersViewModel.addMemberResultFlow) { event ->
event?.peekContent()?.let { uiResult ->
when (uiResult) {
Expand All @@ -241,7 +266,9 @@ class SpaceMembersFragment : Fragment(), SpaceMembersAdapter.SpaceMembersAdapter
}
}
}
}

private fun observeRemoveMemberResult() {
collectLatestLifecycleFlow(spaceMembersViewModel.removeMemberResultFlow) { uiResult ->
when (uiResult) {
is UIResult.Loading -> { }
Expand All @@ -255,7 +282,9 @@ class SpaceMembersFragment : Fragment(), SpaceMembersAdapter.SpaceMembersAdapter
}
}
}
}

private fun observeEditMemberResult() {
collectLatestLifecycleFlow(spaceMembersViewModel.editMemberResultFlow) { event ->
event?.peekContent()?.let { uiResult ->
when (uiResult) {
Expand Down Expand Up @@ -320,4 +349,4 @@ class SpaceMembersFragment : Fragment(), SpaceMembersAdapter.SpaceMembersAdapter
}
}
}
}
}
17 changes: 12 additions & 5 deletions owncloudApp/src/main/res/layout/members_fragment.xml
View file
Open in desktop
Copy link
Collaborator

@joragua joragua Mar 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Check the indentation of the layouts: NestedScrollView should be the parent of LinearLayout. The XML structure should look like this:

<SwipeRefreshLayout>
    <NestedScrollView>
        <LinearLayout>
            ...
        </LinearLayout>
    </NestedScrollView>
</SwipeRefreshLayout>

Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -138,4 +143,6 @@

</LinearLayout>

</androidx.core.widget.NestedScrollView>
</androidx.core.widget.NestedScrollView>

</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
Loading