feat: show a message when there are no matches for users and groups

Author: joragua

owncloudApp/src/main/java/com/owncloud/android/presentation/spaces/members/AddMemberFragment.kt

@@ -24,6 +24,7 @@ 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
@@ -33,7 +34,6 @@ 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 com.owncloud.android.presentation.common.UIResult
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 import timber.log.Timber
@@ -68,24 +68,17 @@ class AddMemberFragment: Fragment() {
 
         val spaceMembers = requireArguments().getParcelableArrayList<SpaceMember>(ARG_SPACE_MEMBERS) ?: arrayListOf()
 
-        collectLatestLifecycleFlow(spaceMembersViewModel.members) { event ->
-            event?.let {
-                when (val uiResult = event.peekContent()) {
-                    is UIResult.Success -> {
-                        uiResult.data?.let { listOfMembers ->
-                            val listOfMembersFiltered = listOfMembers.filter { member ->
-                                !spaceMembers.any { spaceMember ->
-                                    spaceMember.id == "u:${member.id}" || spaceMember.id == "g:${member.id}" }
-                            }
-                            searchMembersAdapter.setMembers(listOfMembersFiltered)
-                        }
-                    }
-                    is UIResult.Loading -> { }
-                    is UIResult.Error -> {
-                        Timber.e(uiResult.error, "Failed to retrieve available users and groups")
-                        showErrorInSnackbar(R.string.members_search_failed, uiResult.error)
-                    }
-                }
+        collectLatestLifecycleFlow(spaceMembersViewModel.members) { uiState ->
+            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)
             }
         }
 
@@ -102,6 +95,19 @@ class AddMemberFragment: Fragment() {
         }
     }
 
+    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)
+            }
+        }
+    }
+
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
         requireActivity().setTitle(R.string.members_add)

owncloudApp/src/main/java/com/owncloud/android/presentation/spaces/members/SpaceMembersViewModel.kt

@@ -21,6 +21,8 @@
 package com.owncloud.android.presentation.spaces.members
 
 import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.owncloud.android.domain.UseCaseResult
 import com.owncloud.android.domain.members.model.OCMember
 import com.owncloud.android.domain.roles.model.OCRole
 import com.owncloud.android.domain.spaces.model.OCSpace
@@ -33,8 +35,11 @@ import com.owncloud.android.domain.utils.Event
 import com.owncloud.android.extensions.ViewModelExt.runUseCaseWithResult
 import com.owncloud.android.presentation.common.UIResult
 import com.owncloud.android.providers.CoroutinesDispatcherProvider
+import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.launch
 
 class SpaceMembersViewModel(
     private val getRolesAsyncUseCase: GetRolesAsyncUseCase,
@@ -55,8 +60,8 @@ class SpaceMembersViewModel(
     private val _spacePermissions = MutableStateFlow<Event<UIResult<List<String>>>?>(null)
     val spacePermissions: StateFlow<Event<UIResult<List<String>>>?> = _spacePermissions
 
-    private val _members = MutableStateFlow<Event<UIResult<List<OCMember>>>?>(null)
-    val members: StateFlow<Event<UIResult<List<OCMember>>>?> = _members
+    private val _members: MutableSharedFlow<MembersUIState> = MutableSharedFlow()
+    val members: SharedFlow<MembersUIState> = _members
 
     init {
         runUseCaseWithResult(
@@ -88,16 +93,23 @@ class SpaceMembersViewModel(
         requiresConnection = true
     )
 
-    fun searchMembers(query: String) = runUseCaseWithResult(
-        coroutineDispatcher = coroutineDispatcherProvider.io,
-        flow = _members,
-        useCase = searchMembersUseCase,
-        useCaseParams = SearchMembersUseCase.Params(accountName = accountName, query = query),
-        showLoading = false,
-        requiresConnection = true
-    )
+    fun searchMembers(query: String) {
+        viewModelScope.launch(coroutineDispatcherProvider.io) {
+            when (val result = searchMembersUseCase(SearchMembersUseCase.Params(accountName, query))) {
+                is UseCaseResult.Success -> _members.emit(MembersUIState(members = result.data, error = null))
+                is UseCaseResult.Error -> _members.emit(MembersUIState(members = emptyList(), error = result.getThrowableOrNull()))
+            }
+        }
+    }
 
     fun clearSearch() {
-        _members.value = Event(UIResult.Success(emptyList()))
+        viewModelScope.launch(coroutineDispatcherProvider.io) {
+            _members.emit(MembersUIState(members = emptyList(), error = null))
+        }
     }
+
+    data class MembersUIState (
+        val members: List<OCMember>,
+        val error: Throwable?
+    )
 }

owncloudApp/src/main/res/layout/add_member_fragment.xml

@@ -46,6 +46,13 @@
             android:scrollbars="vertical"
             android:visibility="visible" />
 
+        <include
+            android:id="@+id/empty_data_parent"
+            layout="@layout/item_empty_dataset"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
     </LinearLayout>
 
 </ScrollView>

owncloudApp/src/main/res/values/strings.xml

@@ -880,6 +880,7 @@
     <string name="members_title">Members</string>
     <string name="members_add">Add member</string>
     <string name="members_search_failed">No results found</string>
+    <string name="members_search_empty">No user or groups matches your search</string>
     <string name="member_type_user">User</string>
     <string name="member_type_group">Group</string>