Combine groups and direct chats in home page
This commit is contained in:
parent
e935a39726
commit
842f8cc3ee
|
@ -236,7 +236,7 @@ class RoomListViewModel @Inject constructor(initialState: RoomListViewState,
|
||||||
tags.contains(RoomTag.ROOM_TAG_SERVER_NOTICE) -> serverNotices.add(room)
|
tags.contains(RoomTag.ROOM_TAG_SERVER_NOTICE) -> serverNotices.add(room)
|
||||||
tags.contains(RoomTag.ROOM_TAG_FAVOURITE) -> favourites.add(room)
|
tags.contains(RoomTag.ROOM_TAG_FAVOURITE) -> favourites.add(room)
|
||||||
tags.contains(RoomTag.ROOM_TAG_LOW_PRIORITY) -> lowPriorities.add(room)
|
tags.contains(RoomTag.ROOM_TAG_LOW_PRIORITY) -> lowPriorities.add(room)
|
||||||
room.isDirect -> directChats.add(room)
|
//room.isDirect -> directChats.add(room)
|
||||||
else -> groupRooms.add(room)
|
else -> groupRooms.add(room)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -84,7 +84,8 @@ enum class RoomCategory(@StringRes val titleRes: Int) {
|
||||||
INVITE(R.string.invitations_header),
|
INVITE(R.string.invitations_header),
|
||||||
FAVOURITE(R.string.bottom_action_favourites),
|
FAVOURITE(R.string.bottom_action_favourites),
|
||||||
DIRECT(R.string.bottom_action_people_x),
|
DIRECT(R.string.bottom_action_people_x),
|
||||||
GROUP(R.string.bottom_action_rooms),
|
//GROUP(R.string.bottom_action_rooms),
|
||||||
|
GROUP(R.string.normal_priority_header),
|
||||||
LOW_PRIORITY(R.string.low_priority_header),
|
LOW_PRIORITY(R.string.low_priority_header),
|
||||||
SERVER_NOTICE(R.string.system_alerts_header)
|
SERVER_NOTICE(R.string.system_alerts_header)
|
||||||
}
|
}
|
||||||
|
|
|
@ -78,6 +78,7 @@
|
||||||
<!-- Home fragment -->
|
<!-- Home fragment -->
|
||||||
<string name="invitations_header">Einladungen</string>
|
<string name="invitations_header">Einladungen</string>
|
||||||
<string name="low_priority_header">Niedrige Priorität</string>
|
<string name="low_priority_header">Niedrige Priorität</string>
|
||||||
|
<string name="normal_priority_header">Normale Priorität</string>
|
||||||
|
|
||||||
<!-- People fragment -->
|
<!-- People fragment -->
|
||||||
<string name="direct_chats_header">Konversationen</string>
|
<string name="direct_chats_header">Konversationen</string>
|
||||||
|
|
|
@ -143,6 +143,7 @@
|
||||||
<string name="invitations_header">Invites</string>
|
<string name="invitations_header">Invites</string>
|
||||||
<string name="low_priority_header">Low priority</string>
|
<string name="low_priority_header">Low priority</string>
|
||||||
<string name="system_alerts_header">"System Alerts"</string>
|
<string name="system_alerts_header">"System Alerts"</string>
|
||||||
|
<string name="normal_priority_header">Normal priority</string>
|
||||||
|
|
||||||
<!-- People fragment -->
|
<!-- People fragment -->
|
||||||
<string name="direct_chats_header">Conversations</string>
|
<string name="direct_chats_header">Conversations</string>
|
||||||
|
|
Loading…
Reference in New Issue