Merge pull request #3908 from nextcloud/show_description_in_open_conversation_list

Show description in open conversation list
2025-06-19 11:39:42 +01:00 · 2024-05-16 12:17:41 +02:00 · 2024-05-16 12:17:41 +02:00 · dff33fdb87
commit dff33fdb87
parent 06027b3c7b 5996699812
7 changed files with 55 additions and 19 deletions
--- a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
@ -182,6 +182,7 @@ import com.nextcloud.talk.ui.recyclerview.MessageSwipeCallback
 import com.nextcloud.talk.utils.ApiUtils
 import com.nextcloud.talk.utils.AudioUtils
 import com.nextcloud.talk.utils.CapabilitiesUtil
+import com.nextcloud.talk.utils.CharPolicy
 import com.nextcloud.talk.utils.ContactUtils
 import com.nextcloud.talk.utils.ConversationUtils
 import com.nextcloud.talk.utils.DateConstants
@ -190,7 +191,6 @@ import com.nextcloud.talk.utils.DisplayUtils
 import com.nextcloud.talk.utils.FileUtils
 import com.nextcloud.talk.utils.FileViewerUtils
 import com.nextcloud.talk.utils.ImageEmojiEditText
-import com.nextcloud.talk.utils.CharPolicy
 import com.nextcloud.talk.utils.Mimetype
 import com.nextcloud.talk.utils.NotificationUtils
 import com.nextcloud.talk.utils.ParticipantPermissions
@ -3474,24 +3474,32 @@ class ChatActivity :
                ""
            }

-        val statusMessageView = binding.chatToolbar.findViewById<TextView>(R.id.chat_toolbar_status_message)
        if (currentConversation?.type == ConversationType.ROOM_TYPE_ONE_TO_ONE_CALL) {
            var statusMessage = ""
            if (currentConversation?.statusIcon != null) {
                statusMessage += currentConversation?.statusIcon
            }
-
            if (currentConversation?.statusMessage != null) {
                statusMessage += currentConversation?.statusMessage
            }
-
-            if (statusMessage.isNotEmpty()) {
-                viewThemeUtils.platform.colorTextView(statusMessageView, ColorRole.ON_SURFACE)
-                statusMessageView.text = statusMessage
-                statusMessageView.visibility = View.VISIBLE
+            statusMessageViewContents(statusMessage)
        } else {
-                statusMessageView.visibility = View.GONE
+            if (currentConversation?.type == ConversationType.ROOM_GROUP_CALL ||
+                currentConversation?.type == ConversationType.ROOM_PUBLIC_CALL
+            ) {
+                var descriptionMessage = ""
+                descriptionMessage += currentConversation?.description
+                statusMessageViewContents(descriptionMessage)
            }
+        }
+    }
+
+    private fun statusMessageViewContents(statusMessageContent: String) {
+        val statusMessageView = binding.chatToolbar.findViewById<TextView>(R.id.chat_toolbar_status_message)
+        if (statusMessageContent.isNotEmpty()) {
+            viewThemeUtils.platform.colorTextView(statusMessageView, ColorRole.ON_SURFACE)
+            statusMessageView.text = statusMessageContent
+            statusMessageView.visibility = View.VISIBLE
        } else {
            statusMessageView.visibility = View.GONE
        }
--- a/app/src/main/java/com/nextcloud/talk/openconversations/adapters/OpenConversationsAdapter.kt
+++ b/app/src/main/java/com/nextcloud/talk/openconversations/adapters/OpenConversationsAdapter.kt
@ -7,7 +7,9 @@
 package com.nextcloud.talk.openconversations.adapters

 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
+import android.widget.RelativeLayout
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
@ -34,8 +36,17 @@ class OpenConversationsAdapter(val user: User, private val onClick: (OpenConvers
        }

        fun bindItem(conversation: OpenConversation) {
+            val nameTextLayoutParams: RelativeLayout.LayoutParams = itemBinding.nameText.layoutParams as
+                RelativeLayout.LayoutParams
+
            currentConversation = conversation
            itemBinding.nameText.text = conversation.displayName
+            if (conversation.description == "") {
+                itemBinding.descriptionText.visibility = View.GONE
+                nameTextLayoutParams.addRule(RelativeLayout.CENTER_VERTICAL)
+            } else {
+                itemBinding.descriptionText.text = conversation.description
+            }

            // load avatar from server when https://github.com/nextcloud/spreed/issues/9600 is solved
            // itemBinding.avatarView.loadUserAvatar(user, conversation.displayName, true, false)
--- a/app/src/main/java/com/nextcloud/talk/openconversations/data/OpenConversation.kt
+++ b/app/src/main/java/com/nextcloud/talk/openconversations/data/OpenConversation.kt
@ -9,5 +9,6 @@ package com.nextcloud.talk.openconversations.data
 data class OpenConversation(
    var roomId: String,
    var roomToken: String,
-    var displayName: String
+    var displayName: String,
+    var description: String?
 )
--- a/app/src/main/java/com/nextcloud/talk/openconversations/data/OpenConversationsRepositoryImpl.kt
+++ b/app/src/main/java/com/nextcloud/talk/openconversations/data/OpenConversationsRepositoryImpl.kt
@ -34,7 +34,8 @@ class OpenConversationsRepositoryImpl(private val ncApi: NcApi, currentUserProvi
                OpenConversation(
                    conversation.roomId!!,
                    conversation.token!!,
-                    conversation.name!!
+                    conversation.name!!,
+                    conversation.description ?: ""
                )
            }
        )
--- a/app/src/main/res/layout/activity_open_conversations.xml
+++ b/app/src/main/res/layout/activity_open_conversations.xml
@ -33,7 +33,7 @@
        android:id="@+id/open_conversations_recycler_view"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
-            app:layoutManager="LinearLayoutManager"/>
+        app:layoutManager="LinearLayoutManager" />

    <LinearLayout
        android:id="@+id/progress_bar_wrapper"
--- a/app/src/main/res/layout/rv_item_open_conversation.xml
+++ b/app/src/main/res/layout/rv_item_open_conversation.xml
@ -21,18 +21,32 @@
        android:id="@+id/name_text"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
        android:layout_toEndOf="@id/avatar_view"
+        android:layout_marginTop="@dimen/standard_quarter_margin"
        android:ellipsize="end"
        android:lines="1"
        android:textAlignment="viewStart"
        android:textAppearance="@style/ListItem"
        tools:text="Jane Doe" />

+    <androidx.emoji2.widget.EmojiTextView
+        android:id="@+id/description_text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_toEndOf="@id/avatar_view"
+        android:layout_below= "@id/name_text"
+        android:paddingTop="@dimen/standard_quarter_margin"
+        android:ellipsize="end"
+        android:lines="1"
+        android:textAlignment="viewStart"
+        android:textColor="@color/low_emphasis_text"
+        android:textSize="13sp"
+        tools:text="Jane Doe" />
+
    <ImageView
        android:id="@+id/avatar_view"
-        android:layout_width="@dimen/avatar_size"
-        android:layout_height="@dimen/avatar_size"
+        android:layout_width="@dimen/avatar_size_open_conversation_list"
+        android:layout_height="@dimen/avatar_size_open_conversation_list"
        android:layout_centerVertical="true"
        android:layout_marginEnd="@dimen/standard_margin"
        android:contentDescription="@string/avatar" />
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@ -23,6 +23,7 @@
    <dimen name="avatar_size">40dp</dimen>
    <dimen name="avatar_size_app_bar">30dp</dimen>
    <dimen name="avatar_size_big">96dp</dimen>
+    <dimen name="avatar_size_open_conversation_list">52dp</dimen>

    <dimen name="chat_text_size">14sp</dimen>
    <dimen name="message_bubble_corners_radius">20dp</dimen>