filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

RoomPreviewNoPreviewFragment use room alias if there is no name

Browse Source
This commit is contained in:
Benoit Marty 2020-02-20 19:19:31 +01:00
parent fd05fe36f5
commit aefffc0c05
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vector/src/main/java/im/vector/riotx/features/roomdirectory/roompreview/RoomPreviewActivity.kt
View File

@ -32,12 +32,13 @@ import kotlinx.android.parcel.Parcelize
data class RoomPreviewData( data class RoomPreviewData(
val roomId: String, val roomId: String,
val roomName: String?, val roomName: String?,
val roomAlias: String?,
val topic: String?, val topic: String?,
val worldReadable: Boolean, val worldReadable: Boolean,
val avatarUrl: String? val avatarUrl: String?
) : Parcelable { ) : Parcelable {
val matrixItem: MatrixItem val matrixItem: MatrixItem
get() = MatrixItem.RoomItem(roomId, roomName, avatarUrl) get() = MatrixItem.RoomItem(roomId, roomName ?: roomAlias, avatarUrl)
} }
class RoomPreviewActivity : VectorBaseActivity(), ToolbarConfigurable { class RoomPreviewActivity : VectorBaseActivity(), ToolbarConfigurable {
@ -50,6 +51,7 @@ class RoomPreviewActivity : VectorBaseActivity(), ToolbarConfigurable {
putExtra(ARG, RoomPreviewData( putExtra(ARG, RoomPreviewData(
roomId = publicRoom.roomId, roomId = publicRoom.roomId,
roomName = publicRoom.name, roomName = publicRoom.name,
roomAlias = publicRoom.getPrimaryAlias(),
topic = publicRoom.topic, topic = publicRoom.topic,
worldReadable = publicRoom.worldReadable, worldReadable = publicRoom.worldReadable,
avatarUrl = publicRoom.avatarUrl avatarUrl = publicRoom.avatarUrl

4
vector/src/main/java/im/vector/riotx/features/roomdirectory/roompreview/RoomPreviewNoPreviewFragment.kt
View File

@ -50,11 +50,11 @@ class RoomPreviewNoPreviewFragment @Inject constructor(
setupToolbar(roomPreviewNoPreviewToolbar) setupToolbar(roomPreviewNoPreviewToolbar)
// Toolbar // Toolbar
avatarRenderer.render(roomPreviewData.matrixItem, roomPreviewNoPreviewToolbarAvatar) avatarRenderer.render(roomPreviewData.matrixItem, roomPreviewNoPreviewToolbarAvatar)
roomPreviewNoPreviewToolbarTitle.text = roomPreviewData.roomName roomPreviewNoPreviewToolbarTitle.text = roomPreviewData.roomName ?: roomPreviewData.roomAlias
// Screen // Screen
avatarRenderer.render(roomPreviewData.matrixItem, roomPreviewNoPreviewAvatar) avatarRenderer.render(roomPreviewData.matrixItem, roomPreviewNoPreviewAvatar)
roomPreviewNoPreviewName.text = roomPreviewData.roomName roomPreviewNoPreviewName.text = roomPreviewData.roomName ?: roomPreviewData.roomAlias
roomPreviewNoPreviewTopic.setTextOrHide(roomPreviewData.topic) roomPreviewNoPreviewTopic.setTextOrHide(roomPreviewData.topic)
if (roomPreviewData.worldReadable) { if (roomPreviewData.worldReadable) {