Add room owner name to post header for circles

app/src/main/java/org/futo/circles/view/PostHeaderView.kt

@@ -45,7 +45,8 @@ class PostHeaderView(
             sender.avatarUrl,
             data.postInfo.timestamp,
             data.postInfo.isEncrypted,
-            data.timelineName
+            data.timelineName,
+            data.timelineOwnerName
         )
     }
 
@@ -55,7 +56,8 @@ class PostHeaderView(
         avatarUrl: String?,
         timestamp: Long,
         isEncrypted: Boolean,
-        roomName: String? = null
+        roomName: String? = null,
+        timelineOwnerName: String? = null
     ) {
         with(binding) {
             ivSenderImage.apply {
@@ -69,8 +71,10 @@ class PostHeaderView(
             tvUserId.text = UserUtils.removeDomainSuffix(userId)
             ivEncrypted.setIsEncryptedIcon(isEncrypted)
             tvMessageTime.text = DateFormat.format("MMM dd, h:mm a", Date(timestamp))
+
             roomName?.let {
-                val nameFormat = "($it)"
+                val nameFormat =
+                    context.getString(R.string.in_timeline_format, timelineOwnerName ?: "", it)
                 tvRoomName.text = nameFormat
             }
         }

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

@@ -215,6 +215,7 @@
     <string name="rich_text_editor_code_block">Toggle code block</string>
     <string name="general">General</string>
     <string name="empty_media_storage_info">0 MB used</string>
+    <string name="in_timeline_format">(in %1$s / %2$s)</string>
 
     <string-array name="debug_domains">
         <item>nl.circles-dev.net</item>

core/src/main/java/org/futo/circles/core/extensions/MatrixUserExtensions.kt

 package org.futo.circles.core.extensions
 
 import org.futo.circles.core.utils.UserUtils
+import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
 import org.matrix.android.sdk.api.session.room.sender.SenderInfo
 import org.matrix.android.sdk.api.session.user.model.User
 
 
 fun User.notEmptyDisplayName(): String = getName(userId, displayName)
 
+fun RoomMemberSummary.notEmptyDisplayName(): String = getName(userId, displayName)
+
 fun SenderInfo.notEmptyDisplayName(): String = getName(userId, displayName)
 
 private fun getName(userId: String, displayName: String?): String {

core/src/main/java/org/futo/circles/core/feature/timeline/builder/MultiTimelineBuilder.kt

 package org.futo.circles.core.feature.timeline.builder
 
+import org.futo.circles.core.extensions.getRoomOwner
+import org.futo.circles.core.extensions.notEmptyDisplayName
 import org.futo.circles.core.mapping.nameOrId
 import org.futo.circles.core.mapping.toPost
 import org.futo.circles.core.model.Post
@@ -18,8 +20,9 @@ class MultiTimelineBuilder @Inject constructor() : BaseTimelineBuilder() {
         val room = MatrixSessionProvider.currentSession?.getRoom(roomId)
             ?: return getAllTimelinesPostsList()
         val roomName = room.roomSummary()?.nameOrId()
+        val roomOwnerName = getRoomOwner(roomId)?.notEmptyDisplayName()
         val receipts = getReadReceipts(room).also { readReceiptMap[roomId] = it }
-        currentSnapshotMap[roomId] = this.map { it.toPost(receipts, roomName) }
+        currentSnapshotMap[roomId] = this.map { it.toPost(receipts, roomName, roomOwnerName) }
         return sortList(getAllTimelinesPostsList(), isThread)
     }
 

core/src/main/java/org/futo/circles/core/mapping/TimelineEventMapping.kt

@@ -12,7 +12,8 @@ import org.matrix.android.sdk.api.session.room.timeline.hasBeenEdited
 
 fun TimelineEvent.toPost(
     readReceipts: List<Long> = emptyList(),
-    timelineName: String? = null
+    timelineName: String? = null,
+    timelineOwnerName: String? = null
 ): Post = Post(
     postInfo = toPostInfo(),
     content = toPostContent(),
@@ -22,7 +23,8 @@ fun TimelineEvent.toPost(
     reactionsData = annotations?.reactionsSummary?.map {
         ReactionsData(it.key, it.count, it.addedByMe)
     } ?: emptyList(),
-    timelineName = timelineName
+    timelineName = timelineName,
+    timelineOwnerName = timelineOwnerName
 )
 
 fun TimelineEvent.toPostInfo(): PostInfo = PostInfo(

core/src/main/java/org/futo/circles/core/model/Post.kt

@@ -10,7 +10,8 @@ data class Post(
     val readByCount: Int,
     val repliesCount: Int,
     val reactionsData: List<ReactionsData>,
-    val timelineName: String? = null
+    val timelineName: String? = null,
+    val timelineOwnerName: String? = null
 ) : IdEntity<String> {
     override val id: String get() = postInfo.id
     fun isMyPost(): Boolean = postInfo.isMyPost()