filippodb/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-02-03 04:27:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Combine groups and direct chats in home page

Browse Source
This commit is contained in:
SpiritCroc 2020-05-12 16:36:37 +02:00
parent e935a39726
commit 842f8cc3ee
4 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListViewModel.kt
View File

@ -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_FAVOURITE) -> favourites.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)
}
}

3
vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListViewState.kt
View File

@ -84,7 +84,8 @@ enum class RoomCategory(@StringRes val titleRes: Int) {
INVITE(R.string.invitations_header),
FAVOURITE(R.string.bottom_action_favourites),
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),
SERVER_NOTICE(R.string.system_alerts_header)
}

1
vector/src/main/res/values-de/strings.xml
View File

@ -78,6 +78,7 @@
<!-- Home fragment -->
<string name="invitations_header">Einladungen</string>
<string name="low_priority_header">Niedrige Priorität</string>
<string name="normal_priority_header">Normale Priorität</string>
<!-- People fragment -->
<string name="direct_chats_header">Konversationen</string>

1
vector/src/main/res/values/strings.xml
View File

@ -143,6 +143,7 @@
<string name="invitations_header">Invites</string>
<string name="low_priority_header">Low priority</string>
<string name="system_alerts_header">"System Alerts"</string>
<string name="normal_priority_header">Normal priority</string>
<!-- People fragment -->
<string name="direct_chats_header">Conversations</string>