feat: add "(me)" label for current user in space members list

Author: joragua

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

@@ -73,7 +73,8 @@ class SpaceMembersActivity: FileActivity(), SpaceMembersFragment.SpaceMemberFrag
 
         supportFragmentManager.transaction {
             if (savedInstanceState == null && currentSpace != null) {
-                val fragment = SpaceMembersFragment.newInstance(account.name, currentSpace)
+                val accountId = AccountManager.get(baseContext).getUserData(account, KEY_UUID)
+                val fragment = SpaceMembersFragment.newInstance(account.name, accountId, currentSpace)
                 replace(R.id.members_fragment_container, fragment, TAG_SPACE_MEMBERS_FRAGMENT)
             }
         }
@@ -124,6 +125,7 @@ class SpaceMembersActivity: FileActivity(), SpaceMembersFragment.SpaceMemberFrag
         private const val TAG_ADD_MEMBER_FRAGMENT ="ADD_MEMBER_FRAGMENT"
         private const val TYPE_PLAIN = "text/plain"
         private const val KEY_DISPLAY_NAME = "oc_display_name"
+        private const val KEY_UUID = "oc_uuid"
 
         const val EXTRA_SPACE = "EXTRA_SPACE"
     }

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

@@ -35,7 +35,8 @@ import com.owncloud.android.utils.DisplayUtils
 import com.owncloud.android.utils.PreferenceUtils
 
 class SpaceMembersAdapter(
-    private val listener: SpaceMembersAdapterListener
+    private val listener: SpaceMembersAdapterListener,
+    private val accountId: String?
 ): RecyclerView.Adapter<SpaceMembersAdapter.SpaceMembersViewHolder>() {
 
     private var members: List<SpaceMember> = emptyList()
@@ -59,8 +60,14 @@ class SpaceMembersAdapter(
 
         holder.binding.apply {
             val isGroup = member.id.startsWith(GROUP_PREFIX)
+            val isMyAccount = accountId?.let { member.id.contains(it) }
+            val displayName = if (isMyAccount == true) {
+                "${member.displayName} ${holder.itemView.context.getString(R.string.my_account_label)}"
+            } else {
+                member.displayName
+            }
             memberIcon.setImageResource(if (isGroup) R.drawable.ic_group else R.drawable.ic_user)
-            memberName.text = member.displayName
+            memberName.text = displayName
             memberName.contentDescription = holder.itemView.context.getString(
                 if (isGroup) R.string.content_description_member_group else R.string.content_description_member_user, member.displayName
             )

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

@@ -75,7 +75,8 @@ class SpaceMembersFragment : Fragment(), SpaceMembersAdapter.SpaceMembersAdapter
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        spaceMembersAdapter = SpaceMembersAdapter(this)
+        val accountId = requireArguments().getString(ARG_ACCOUNT_ID)
+        spaceMembersAdapter = SpaceMembersAdapter(this, accountId)
         recyclerView = binding.membersRecyclerView
         recyclerView.apply {
             layoutManager = LinearLayoutManager(requireContext())
@@ -257,6 +258,7 @@ class SpaceMembersFragment : Fragment(), SpaceMembersAdapter.SpaceMembersAdapter
     companion object {
         private const val ARG_CURRENT_SPACE = "CURRENT_SPACE"
         private const val ARG_ACCOUNT_NAME = "ACCOUNT_NAME"
+        private const val ARG_ACCOUNT_ID = "ACCOUNT_ID"
         private const val DRIVES_CREATE_PERMISSION = "libre.graph/driveItem/permissions/create"
         private const val DRIVES_DELETE_PERMISSION = "libre.graph/driveItem/permissions/delete"
         private const val DRIVES_UPDATE_PERMISSION = "libre.graph/driveItem/permissions/update"
@@ -265,10 +267,12 @@ class SpaceMembersFragment : Fragment(), SpaceMembersAdapter.SpaceMembersAdapter
 
         fun newInstance(
             accountName: String,
-            currentSpace: OCSpace
+            accountId: String,
+            currentSpace: OCSpace,
         ): SpaceMembersFragment {
             val args = Bundle().apply {
                 putString(ARG_ACCOUNT_NAME, accountName)
+                putString(ARG_ACCOUNT_ID, accountId)
                 putParcelable(ARG_CURRENT_SPACE, currentSpace)
             }
             return SpaceMembersFragment().apply {

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

@@ -904,6 +904,7 @@
     <string name="members_edit_failed">Member could not be edited</string>
     <string name="member_type_user">User</string>
     <string name="member_type_group">Group</string>
+    <string name="my_account_label">(me)</string>
 
     <string name="feedback_dialog_get_in_contact_description"><![CDATA[ Ask for help in our <a href=\"%1$s\"><b>forum</b></a> or contribute in our <a href=\"%2$s\"><b>GitHub repo</b></a>]]></string>