Merge pull request #1770 from Tunous/members-user-status

[NEW] Display user status indicator in members list

app/src/main/java/chat/rocket/android/members/adapter/MembersAdapter.kt

@@ -43,6 +43,7 @@ class MembersAdapter(private val listener: (MemberUiModel) -> Unit) :
         fun bind(memberUiModel: MemberUiModel, listener: (MemberUiModel) -> Unit) = with(itemView) {
             image_avatar.setImageURI(memberUiModel.avatarUri)
             text_member.content = memberUiModel.displayName
+            text_member.setCompoundDrawablesRelativeWithIntrinsicBounds(DrawableHelper.getUserStatusDrawable(memberUiModel.status, context), null, null, null)
             setOnClickListener { listener(memberUiModel) }
         }
     }

app/src/main/java/chat/rocket/android/members/uimodel/MemberUiModel.kt

@@ -3,6 +3,7 @@ package chat.rocket.android.members.uimodel
 import chat.rocket.android.server.domain.useRealName
 import chat.rocket.android.util.extensions.avatarUrl
 import chat.rocket.common.model.User
+import chat.rocket.common.model.UserStatus
 import chat.rocket.core.model.Value
 
 class MemberUiModel(
@@ -16,6 +17,7 @@ class MemberUiModel(
     val username: String?
     val email: String?
     val utcOffset: Float?
+    val status: UserStatus?
 
     init {
         avatarUri = getUserAvatar()
@@ -24,6 +26,7 @@ class MemberUiModel(
         username = getUserUsername()
         email = getUserEmail()
         utcOffset = getUserUtcOffset()
+        status = getUserStatus()
     }
 
     private fun getUserAvatar(): String? {
@@ -47,4 +50,6 @@ class MemberUiModel(
     private fun getUserEmail(): String? = member.emails?.get(0)?.address
 
     private fun getUserUtcOffset(): Float? = member.utcOffset
+
+    private fun getUserStatus(): UserStatus? = member.status
 }
\ No newline at end of file

app/src/main/res/layout/item_member.xml

@@ -5,10 +5,10 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?android:attr/selectableItemBackground"
-    android:paddingBottom="@dimen/member_item_top_and_bottom_padding"
-    android:paddingEnd="@dimen/screen_edge_left_and_right_padding"
     android:paddingStart="@dimen/screen_edge_left_and_right_padding"
-    android:paddingTop="@dimen/member_item_top_and_bottom_padding">
+    android:paddingTop="@dimen/member_item_top_and_bottom_padding"
+    android:paddingEnd="@dimen/screen_edge_left_and_right_padding"
+    android:paddingBottom="@dimen/member_item_top_and_bottom_padding">
 
     <include
         android:id="@+id/layout_avatar"
@@ -24,9 +24,11 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
+        android:drawablePadding="@dimen/text_view_drawable_padding"
         app:layout_constraintBottom_toBottomOf="@+id/layout_avatar"
         app:layout_constraintLeft_toRightOf="@+id/layout_avatar"
         app:layout_constraintTop_toTopOf="@+id/layout_avatar"
+        tools:drawableStart="@drawable/ic_status_invisible_12dp"
         tools:text="Ronald Perkins" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file