-
Notifications
You must be signed in to change notification settings - Fork 3.1k
[FEATURE REQUEST] Add a member to a space: Search user and show the list of matches #4754
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
19 commits
Select commit
Hold shift + click to select a range
8139f22
feat: show "+" icon for adding new members only for space managers
joragua 04f10d5
refactor: move item header from fragment to members activity
joragua ed2d5d4
feat: create and display the new layout to add members
joragua 699b901
feat: implement logic to search new users
joragua 0278f0b
feat: implement logic to search new groups
joragua 572b294
chore: add error logs for clarity
joragua 556f015
feat: add display name sorting for space members
joragua 2554b36
test: create tests for OCRemoteMembersDataSource and OCMembersRepository
joragua 2232801
refactor: rename members strings for consistent naming
joragua 8f508ac
refactor: remove blank lines and unnecessary "+" from view id reference
joragua aeb205f
refactor: rewrite members list filter and space members diff util for…
joragua 4eb41e6
test: align test structure with production classes
joragua 4bee490
refactor: use a non-deprecated transaction method for add member frag…
joragua 45e3ac0
fix: refresh members list correctly when typing
joragua c777eff
fix: wrap query parameter in quotes to support special characters
joragua 6bb5cd8
feat: show a message when there are no matches for users and groups
joragua b3b4c63
feat: display a spinner while members search is loading
joragua 0730cad
fix: prevent multiple search requests when typing fast
joragua 7e9d118
fix: hide empty state or members list while search is loading
joragua File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
143 changes: 143 additions & 0 deletions
143
...udApp/src/main/java/com/owncloud/android/presentation/spaces/members/AddMemberFragment.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,143 @@ | ||
| /** | ||
| * ownCloud Android client application | ||
| * | ||
| * @author Jorge Aguado Recio | ||
| * | ||
| * Copyright (C) 2026 ownCloud GmbH. | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License version 2, | ||
| * as published by the Free Software Foundation. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| package com.owncloud.android.presentation.spaces.members | ||
|
|
||
| import android.os.Bundle | ||
| import android.view.LayoutInflater | ||
| import android.view.View | ||
| import android.view.ViewGroup | ||
| import androidx.core.view.isVisible | ||
| import androidx.fragment.app.Fragment | ||
| import androidx.recyclerview.widget.LinearLayoutManager | ||
| import androidx.recyclerview.widget.RecyclerView | ||
| import com.owncloud.android.R | ||
| import com.owncloud.android.databinding.AddMemberFragmentBinding | ||
| import com.owncloud.android.domain.spaces.model.OCSpace | ||
| import com.owncloud.android.domain.spaces.model.SpaceMember | ||
| import com.owncloud.android.extensions.collectLatestLifecycleFlow | ||
| import com.owncloud.android.extensions.showErrorInSnackbar | ||
| import org.koin.androidx.viewmodel.ext.android.viewModel | ||
| import org.koin.core.parameter.parametersOf | ||
| import timber.log.Timber | ||
|
|
||
| class AddMemberFragment: Fragment() { | ||
| private var _binding: AddMemberFragmentBinding? = null | ||
| private val binding get() = _binding!! | ||
|
|
||
| private val spaceMembersViewModel: SpaceMembersViewModel by viewModel { | ||
| parametersOf( | ||
| requireArguments().getString(ARG_ACCOUNT_NAME), | ||
| requireArguments().getParcelable<OCSpace>(ARG_CURRENT_SPACE) | ||
| ) | ||
| } | ||
|
|
||
| private lateinit var searchMembersAdapter: SearchMembersAdapter | ||
| private lateinit var recyclerView: RecyclerView | ||
|
|
||
| override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View { | ||
| _binding = AddMemberFragmentBinding.inflate(inflater, container, false) | ||
| return binding.root | ||
| } | ||
|
|
||
| override fun onViewCreated(view: View, savedInstanceState: Bundle?) { | ||
| super.onViewCreated(view, savedInstanceState) | ||
| searchMembersAdapter = SearchMembersAdapter() | ||
| recyclerView = binding.membersRecyclerView | ||
| recyclerView.apply { | ||
| layoutManager = LinearLayoutManager(requireContext()) | ||
| adapter = searchMembersAdapter | ||
| } | ||
|
|
||
| val spaceMembers = requireArguments().getParcelableArrayList<SpaceMember>(ARG_SPACE_MEMBERS) ?: arrayListOf() | ||
|
|
||
| collectLatestLifecycleFlow(spaceMembersViewModel.members) { uiState -> | ||
| if (uiState.isLoading) { | ||
| binding.indeterminateProgressBar.visibility = View.VISIBLE | ||
| binding.emptyDataParent.root.visibility = View.GONE | ||
| binding.membersRecyclerView.visibility = View.GONE | ||
| } else { | ||
| binding.indeterminateProgressBar.visibility = View.GONE | ||
| val listOfMembersFiltered = uiState.members.filter { member -> | ||
| !spaceMembers.any { spaceMember -> | ||
| spaceMember.id == "u:${member.id}" || spaceMember.id == "g:${member.id}" } | ||
| } | ||
| val hasMembers = listOfMembersFiltered.isNotEmpty() | ||
| showOrHideEmptyView(hasMembers) | ||
| if (hasMembers) searchMembersAdapter.setMembers(listOfMembersFiltered) | ||
| uiState.error?.let { | ||
| Timber.e(uiState.error, "Failed to retrieve available users and groups") | ||
| showErrorInSnackbar(R.string.members_search_failed, uiState.error) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| binding.searchBar.apply { | ||
| requestFocus() | ||
| setOnQueryTextListener(object : androidx.appcompat.widget.SearchView.OnQueryTextListener { | ||
| override fun onQueryTextSubmit(query: String): Boolean = true | ||
|
|
||
| override fun onQueryTextChange(newText: String): Boolean { | ||
| if (newText.length > 2) { spaceMembersViewModel.searchMembers(newText) } else { spaceMembersViewModel.clearSearch() } | ||
| return true | ||
| } | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| private fun showOrHideEmptyView(hasMembers: Boolean) { | ||
| binding.membersRecyclerView.isVisible = hasMembers | ||
| binding.emptyDataParent.apply { | ||
| val shouldShow = !hasMembers && binding.searchBar.query.length > 2 | ||
| root.isVisible = shouldShow | ||
| if (shouldShow) { | ||
| listEmptyDatasetIcon.setImageResource(R.drawable.ic_share_generic_white) | ||
| listEmptyDatasetTitle.setText(R.string.members_search_failed) | ||
| listEmptyDatasetSubTitle.setText(R.string.members_search_empty) | ||
| } | ||
| } | ||
jesmrec marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| override fun onActivityCreated(savedInstanceState: Bundle?) { | ||
| super.onActivityCreated(savedInstanceState) | ||
| requireActivity().setTitle(R.string.members_add) | ||
| } | ||
|
|
||
| companion object { | ||
| private const val ARG_ACCOUNT_NAME = "ACCOUNT_NAME" | ||
| private const val ARG_CURRENT_SPACE = "CURRENT_SPACE" | ||
| private const val ARG_SPACE_MEMBERS = "SPACE_MEMBERS" | ||
|
|
||
| fun newInstance( | ||
| accountName: String, | ||
| currentSpace: OCSpace, | ||
| spaceMembers: List<SpaceMember> | ||
| ): AddMemberFragment { | ||
| val args = Bundle().apply { | ||
| putString(ARG_ACCOUNT_NAME, accountName) | ||
| putParcelable(ARG_CURRENT_SPACE, currentSpace) | ||
| putParcelableArrayList(ARG_SPACE_MEMBERS, ArrayList(spaceMembers)) | ||
| } | ||
| return AddMemberFragment().apply { | ||
| arguments = args | ||
| } | ||
| } | ||
| } | ||
| } | ||
82 changes: 82 additions & 0 deletions
82
...pp/src/main/java/com/owncloud/android/presentation/spaces/members/SearchMembersAdapter.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| /** | ||
| * ownCloud Android client application | ||
| * | ||
| * @author Jorge Aguado Recio | ||
| * | ||
| * Copyright (C) 2026 ownCloud GmbH. | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License version 2, | ||
| * as published by the Free Software Foundation. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| package com.owncloud.android.presentation.spaces.members | ||
|
|
||
| import android.view.LayoutInflater | ||
| import android.view.View | ||
| import android.view.ViewGroup | ||
| import androidx.recyclerview.widget.DiffUtil | ||
| import androidx.recyclerview.widget.RecyclerView | ||
| import com.owncloud.android.R | ||
| import com.owncloud.android.databinding.MemberItemBinding | ||
| import com.owncloud.android.domain.members.model.OCMember | ||
| import com.owncloud.android.utils.PreferenceUtils | ||
|
|
||
| class SearchMembersAdapter: RecyclerView.Adapter<SearchMembersAdapter.SearchMembersViewHolder>() { | ||
|
|
||
| private var members = mutableListOf<OCMember>() | ||
|
|
||
| override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SearchMembersViewHolder { | ||
| val inflater = LayoutInflater.from(parent.context) | ||
|
|
||
| val view = inflater.inflate(R.layout.member_item, parent, false) | ||
| view.filterTouchesWhenObscured = PreferenceUtils.shouldDisallowTouchesWithOtherVisibleWindows(parent.context) | ||
|
|
||
| return SearchMembersViewHolder(view) | ||
| } | ||
|
|
||
| override fun onBindViewHolder(holder: SearchMembersViewHolder, position: Int) { | ||
| val member = members[position] | ||
|
|
||
| holder.binding.apply { | ||
| val isGroup = member.surname == GROUP_SURNAME | ||
| memberIcon.setImageResource(if (isGroup) R.drawable.ic_group else R.drawable.ic_user) | ||
| memberName.text = member.displayName | ||
| memberName.contentDescription = holder.itemView.context.getString( | ||
| if (isGroup) R.string.content_description_member_group else R.string.content_description_member_user, member.displayName | ||
| ) | ||
| memberRole.text = if (isGroup) { | ||
| holder.itemView.context.getString(R.string.member_type_group) | ||
| } else { | ||
| if (member.surname == USER_SURNAME) holder.itemView.context.getString(R.string.member_type_user) else member.surname | ||
| } | ||
| } | ||
| } | ||
|
|
||
| override fun getItemCount(): Int = members.size | ||
|
|
||
| fun setMembers(members: List<OCMember>) { | ||
| val diffCallback = SpaceMembersDiffUtil(this.members, members) | ||
| val diffResult = DiffUtil.calculateDiff(diffCallback) | ||
| this.members.clear() | ||
| this.members.addAll(members) | ||
| diffResult.dispatchUpdatesTo(this) | ||
| } | ||
|
|
||
| class SearchMembersViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { | ||
| val binding = MemberItemBinding.bind(itemView) | ||
| } | ||
|
|
||
| companion object { | ||
| private const val USER_SURNAME = "User" | ||
| private const val GROUP_SURNAME = "Group" | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.