Merge pull request #4728 from owncloud/feature/show_members_of_a_space

[FEATURE REQUEST] Show members of a space

Author: joragua

CHANGELOG.md

@@ -41,6 +41,7 @@ ownCloud admins and users.
 ## Summary
 
 * Change - Migrate tests to the new kotlinx-coroutines-test API: [#4710](https://github.com/owncloud/android/issues/4710)
+* Enhancement - Show members of a space: [#4612](https://github.com/owncloud/android/issues/4612)
 * Enhancement - Set emoji as space image: [#4707](https://github.com/owncloud/android/issues/4707)
 
 ## Details
@@ -53,6 +54,16 @@ ownCloud admins and users.
    https://github.com/owncloud/android/issues/4710
    https://github.com/owncloud/android/pull/4722
 
+* Enhancement - Show members of a space: [#4612](https://github.com/owncloud/android/issues/4612)
+
+   A new option to view all members of a space has been added to the bottom sheet,
+   available when the three-dot menu button is tapped. This new option opens a new
+   view that shows information like member names, roles, and expiration dates (if
+   available).
+
+   https://github.com/owncloud/android/issues/4612
+   https://github.com/owncloud/android/pull/4728
+
 * Enhancement - Set emoji as space image: [#4707](https://github.com/owncloud/android/issues/4707)
 
    A new option to set an emoji as space image has been added to the bottom sheet,

changelog/unreleased/4728

@@ -0,0 +1,7 @@
+Enhancement: Show members of a space
+
+A new option to view all members of a space has been added to the bottom sheet, available when the three-dot menu button is tapped.
+This new option opens a new view that shows information like member names, roles, and expiration dates (if available).
+
+https://github.com/owncloud/android/issues/4612
+https://github.com/owncloud/android/pull/4728

owncloudApp/src/main/AndroidManifest.xml

@@ -226,6 +226,12 @@
                 android:name="android.app.searchable"
                 android:resource="@xml/users_and_groups_searchable" />
         </activity>
+        <activity
+            android:name=".presentation.spaces.members.SpaceMembersActivity"
+            android:exported="false"
+            android:label="@string/space_members_label"
+            android:launchMode="singleTop"
+            android:theme="@style/Theme.ownCloud.Toolbar"/>
         <activity
             android:name=".presentation.security.pattern.PatternActivity"
             android:screenOrientation="portrait"

owncloudApp/src/main/java/com/owncloud/android/dependecyinjection/RemoteDataSourceModule.kt

@@ -2,7 +2,9 @@
  * ownCloud Android client application
  *
  * @author David González Verdugo
- * Copyright (C) 2020 ownCloud GmbH.
+ * @author Jorge Aguado Recio
+ *
+ * Copyright (C) 2025 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,
@@ -33,6 +35,8 @@ import com.owncloud.android.data.files.datasources.RemoteFileDataSource
 import com.owncloud.android.data.files.datasources.implementation.OCRemoteFileDataSource
 import com.owncloud.android.data.oauth.datasources.RemoteOAuthDataSource
 import com.owncloud.android.data.oauth.datasources.implementation.OCRemoteOAuthDataSource
+import com.owncloud.android.data.roles.datasources.RemoteRolesDataSource
+import com.owncloud.android.data.roles.datasources.implementation.OCRemoteRolesDataSource
 import com.owncloud.android.data.server.datasources.RemoteServerInfoDataSource
 import com.owncloud.android.data.server.datasources.implementation.OCRemoteServerInfoDataSource
 import com.owncloud.android.data.sharing.sharees.datasources.RemoteShareeDataSource
@@ -73,6 +77,7 @@ val remoteDataSourceModule = module {
     singleOf(::OCRemoteCapabilitiesDataSource) bind RemoteCapabilitiesDataSource::class
     singleOf(::OCRemoteFileDataSource) bind RemoteFileDataSource::class
     singleOf(::OCRemoteOAuthDataSource) bind RemoteOAuthDataSource::class
+    singleOf(::OCRemoteRolesDataSource) bind RemoteRolesDataSource::class
     singleOf(::OCRemoteServerInfoDataSource) bind RemoteServerInfoDataSource::class
     singleOf(::OCRemoteShareDataSource) bind RemoteShareDataSource::class
     singleOf(::OCRemoteShareeDataSource) bind RemoteShareeDataSource::class

owncloudApp/src/main/java/com/owncloud/android/dependecyinjection/RepositoryModule.kt

@@ -4,8 +4,9 @@
  * @author David González Verdugo
  * @author Abel García de Prada
  * @author Juan Carlos Garrote Gascón
+ * @author Jorge Aguado Recio
  *
- * Copyright (C) 2022 ownCloud GmbH.
+ * Copyright (C) 2025 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,
@@ -28,6 +29,7 @@ import com.owncloud.android.data.capabilities.repository.OCCapabilityRepository
 import com.owncloud.android.data.files.repository.OCFileRepository
 import com.owncloud.android.data.folderbackup.repository.OCFolderBackupRepository
 import com.owncloud.android.data.oauth.repository.OCOAuthRepository
+import com.owncloud.android.data.roles.repository.OCRolesRepository
 import com.owncloud.android.data.server.repository.OCServerInfoRepository
 import com.owncloud.android.data.sharing.sharees.repository.OCShareeRepository
 import com.owncloud.android.data.sharing.shares.repository.OCShareRepository
@@ -41,6 +43,7 @@ import com.owncloud.android.domain.authentication.oauth.OAuthRepository
 import com.owncloud.android.domain.automaticuploads.FolderBackupRepository
 import com.owncloud.android.domain.capabilities.CapabilityRepository
 import com.owncloud.android.domain.files.FileRepository
+import com.owncloud.android.domain.roles.RolesRepository
 import com.owncloud.android.domain.server.ServerInfoRepository
 import com.owncloud.android.domain.sharing.sharees.ShareeRepository
 import com.owncloud.android.domain.sharing.shares.ShareRepository
@@ -59,6 +62,7 @@ val repositoryModule = module {
     factoryOf(::OCFileRepository) bind FileRepository::class
     factoryOf(::OCFolderBackupRepository) bind FolderBackupRepository::class
     factoryOf(::OCOAuthRepository) bind OAuthRepository::class
+    factoryOf(::OCRolesRepository) bind RolesRepository::class
     factoryOf(::OCServerInfoRepository) bind ServerInfoRepository::class
     factoryOf(::OCShareRepository) bind ShareRepository::class
     factoryOf(::OCShareeRepository) bind ShareeRepository::class

owncloudApp/src/main/java/com/owncloud/android/dependecyinjection/UseCaseModule.kt

@@ -79,6 +79,7 @@ import com.owncloud.android.domain.files.usecases.SetLastUsageFileUseCase
 import com.owncloud.android.domain.files.usecases.SortFilesUseCase
 import com.owncloud.android.domain.files.usecases.SortFilesWithSyncInfoUseCase
 import com.owncloud.android.domain.files.usecases.UpdateAlreadyDownloadedFilesPathUseCase
+import com.owncloud.android.domain.roles.usecases.GetRolesAsyncUseCase
 import com.owncloud.android.domain.server.usecases.GetServerInfoAsyncUseCase
 import com.owncloud.android.domain.sharing.sharees.GetShareesAsyncUseCase
 import com.owncloud.android.domain.sharing.shares.usecases.CreatePrivateShareAsyncUseCase
@@ -105,6 +106,7 @@ import com.owncloud.android.domain.spaces.usecases.GetSpacePermissionsAsyncUseCa
 import com.owncloud.android.domain.spaces.usecases.GetSpaceWithSpecialsByIdForAccountUseCase
 import com.owncloud.android.domain.spaces.usecases.GetSpacesFromEveryAccountUseCaseAsStream
 import com.owncloud.android.domain.spaces.usecases.RefreshSpacesFromServerAsyncUseCase
+import com.owncloud.android.domain.spaces.usecases.GetSpaceMembersUseCase
 import com.owncloud.android.domain.transfers.usecases.ClearSuccessfulTransferByIdUseCase
 import com.owncloud.android.domain.transfers.usecases.ClearSuccessfulTransfersUseCase
 import com.owncloud.android.domain.transfers.usecases.GetAllTransfersAsStreamUseCase
@@ -241,6 +243,7 @@ val useCaseModule = module {
     factoryOf(::GetPersonalSpacesWithSpecialsForAccountAsStreamUseCase)
     factoryOf(::GetProjectSpacesWithSpecialsForAccountAsStreamUseCase)
     factoryOf(::GetSpaceByIdForAccountUseCase)
+    factoryOf(::GetSpaceMembersUseCase)
     factoryOf(::GetSpacePermissionsAsyncUseCase)
     factoryOf(::GetSpaceWithSpecialsByIdForAccountUseCase)
     factoryOf(::GetSpacesFromEveryAccountUseCaseAsStream)
@@ -300,4 +303,7 @@ val useCaseModule = module {
 
     // Accounts
     factoryOf(::RemoveAccountUseCase)
+
+    // Roles
+    factoryOf(::GetRolesAsyncUseCase)
 }

owncloudApp/src/main/java/com/owncloud/android/dependecyinjection/ViewModelModule.kt

@@ -55,6 +55,7 @@ import com.owncloud.android.presentation.settings.more.SettingsMoreViewModel
 import com.owncloud.android.presentation.settings.security.SettingsSecurityViewModel
 import com.owncloud.android.presentation.sharing.ShareViewModel
 import com.owncloud.android.presentation.spaces.SpacesListViewModel
+import com.owncloud.android.presentation.spaces.members.SpaceMembersViewModel
 import com.owncloud.android.presentation.transfers.TransfersViewModel
 import com.owncloud.android.ui.ReceiveExternalFilesViewModel
 import com.owncloud.android.ui.preview.PreviewImageViewModel
@@ -84,6 +85,7 @@ val viewModelModule = module {
     viewModelOf(::SettingsSecurityViewModel)
     viewModelOf(::SettingsVideoUploadsViewModel)
     viewModelOf(::SettingsViewModel)
+    viewModelOf(::SpaceMembersViewModel)
     viewModelOf(::FileOperationsViewModel)
 
     viewModel { (accountName: String) -> CapabilityViewModel(accountName, get(), get(), get(), get()) }

owncloudApp/src/main/java/com/owncloud/android/extensions/SpaceMenuOptionExt.kt

@@ -31,6 +31,7 @@ fun SpaceMenuOption.toStringResId() =
         SpaceMenuOption.ENABLE -> R.string.enable_space
         SpaceMenuOption.DELETE -> R.string.delete_space
         SpaceMenuOption.SET_ICON -> R.string.set_space_icon
+        SpaceMenuOption.MEMBERS -> R.string.space_members
     }
 
 fun SpaceMenuOption.toDrawableResId() =
@@ -41,4 +42,5 @@ fun SpaceMenuOption.toDrawableResId() =
         SpaceMenuOption.ENABLE -> R.drawable.ic_enable_space
         SpaceMenuOption.DELETE -> R.drawable.ic_action_delete_white
         SpaceMenuOption.SET_ICON -> R.drawable.ic_set_space_icon
+        SpaceMenuOption.MEMBERS -> R.drawable.ic_share_generic_white
     }

owncloudApp/src/main/java/com/owncloud/android/presentation/releasenotes/ReleaseNotesViewModel.kt

@@ -43,6 +43,11 @@ class ReleaseNotesViewModel(
 
     companion object {
         val releaseNotesList = listOf(
+            ReleaseNote(
+                title = R.string.release_notes_4_8_0_title_space_membership,
+                subtitle = R.string.release_notes_4_8_0_subtitle_space_membership,
+                type = ReleaseNoteType.ENHANCEMENT
+            ),
             ReleaseNote(
                 title = R.string.release_notes_4_8_0_title_set_emoji_as_space_image,
                 subtitle = R.string.release_notes_4_8_0_subtitle_set_emoji_as_space_image,

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

@@ -72,6 +72,7 @@ import com.owncloud.android.presentation.common.BottomSheetFragmentItemView
 import com.owncloud.android.utils.DisplayUtils
 import com.owncloud.android.presentation.common.UIResult
 import com.owncloud.android.presentation.spaces.createspace.CreateSpaceDialogFragment
+import com.owncloud.android.presentation.spaces.members.SpaceMembersActivity
 import com.owncloud.android.presentation.transfers.TransfersViewModel
 import com.owncloud.android.presentation.spaces.setspaceicon.SetSpaceIconDialogFragment
 import kotlinx.coroutines.flow.SharedFlow
@@ -461,6 +462,11 @@ class SpacesListFragment :
                         val setIconDialog = SetSpaceIconDialogFragment.newInstance(listener = this@SpacesListFragment)
                         setIconDialog.show(requireActivity().supportFragmentManager, DIALOG_SET_ICON)
                     }
+                    SpaceMenuOption.MEMBERS -> {
+                        val intent = Intent(requireActivity(), SpaceMembersActivity::class.java)
+                        intent.putExtra(SpaceMembersActivity.EXTRA_SPACE, currentSpace)
+                        startActivity(intent)
+                    }
                 }
             }
         }