Room list : add chronological and alphabetical comparators

build.gradle

@@ -11,7 +11,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.2'
+        classpath 'com.android.tools.build:gradle:3.4.1'
         classpath 'com.google.gms:google-services:4.2.0'
         classpath "com.airbnb.okreplay:gradle-plugin:1.4.0"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

vector/src/main/java/im/vector/riotredesign/core/di/AppModule.kt

@@ -25,7 +25,8 @@ import im.vector.riotredesign.core.resources.StringArrayProvider
 import im.vector.riotredesign.core.resources.StringProvider
 import im.vector.riotredesign.features.home.HomeRoomListObservableStore
 import im.vector.riotredesign.features.home.group.SelectedGroupStore
-import im.vector.riotredesign.features.home.room.list.RoomSummaryComparator
+import im.vector.riotredesign.features.home.room.list.AlphabeticalRoomComparator
+import im.vector.riotredesign.features.home.room.list.ChronologicalRoomComparator
 import im.vector.riotredesign.features.notifications.NotificationDrawerManager
 import org.koin.dsl.module.module
 
@@ -58,7 +59,11 @@ class AppModule(private val context: Context) {
         }
 
         single {
-            RoomSummaryComparator()
+            ChronologicalRoomComparator()
+        }
+
+        single {
+            AlphabeticalRoomComparator()
         }
 
         single {

vector/src/main/java/im/vector/riotredesign/features/home/room/list/AlphabeticalRoomComparator.kt

@@ -0,0 +1,32 @@
+/*
+ * Copyright 2019 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.riotredesign.features.home.room.list
+
+import im.vector.matrix.android.api.session.room.model.RoomSummary
+
+class AlphabeticalRoomComparator
+    : Comparator<RoomSummary> {
+
+    override fun compare(leftRoomSummary: RoomSummary?, rightRoomSummary: RoomSummary?): Int {
+        return when {
+            rightRoomSummary?.displayName == null -> -1
+            leftRoomSummary?.displayName == null  -> 1
+            else                                  -> leftRoomSummary.displayName.compareTo(rightRoomSummary.displayName)
+        }
+
+    }
+}

vector/src/main/java/im/vector/riotredesign/features/home/room/list/ChronologicalRoomComparator.kt

@@ -0,0 +1,47 @@
+/*
+ * Copyright 2019 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.riotredesign.features.home.room.list
+
+import im.vector.matrix.android.api.session.room.model.RoomSummary
+
+class ChronologicalRoomComparator : Comparator<RoomSummary> {
+
+    override fun compare(leftRoomSummary: RoomSummary?, rightRoomSummary: RoomSummary?): Int {
+        var rightTimestamp = 0L
+        var leftTimestamp = 0L
+        if (null != leftRoomSummary) {
+            leftTimestamp = leftRoomSummary.lastMessage?.originServerTs ?: 0
+        }
+        if (null != rightRoomSummary) {
+            rightTimestamp = rightRoomSummary.lastMessage?.originServerTs ?: 0
+        }
+        return if (rightRoomSummary?.lastMessage == null) {
+            -1
+        } else if (leftRoomSummary?.lastMessage == null) {
+            1
+        } else {
+            val deltaTimestamp = rightTimestamp - leftTimestamp
+            if (deltaTimestamp > 0) {
+                1
+            } else if (deltaTimestamp < 0) {
+                -1
+            } else {
+                0
+            }
+        }
+    }
+}

vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomListViewModel.kt

@@ -37,7 +37,8 @@ typealias RoomListFilterName = CharSequence
 class RoomListViewModel(initialState: RoomListViewState,
                         private val session: Session,
                         private val homeRoomListObservableSource: HomeRoomListObservableStore,
-                        private val roomSummaryComparator: RoomSummaryComparator)
+                        private val alphabeticalRoomComparator: AlphabeticalRoomComparator,
+                        private val chronologicalRoomComparator: ChronologicalRoomComparator)
     : VectorViewModel<RoomListViewState>(initialState) {
 
     companion object : MvRxViewModelFactory<RoomListViewModel, RoomListViewState> {
@@ -46,8 +47,9 @@ class RoomListViewModel(initialState: RoomListViewState,
         override fun create(viewModelContext: ViewModelContext, state: RoomListViewState): RoomListViewModel? {
             val currentSession = viewModelContext.activity.get<Session>()
             val homeRoomListObservableSource = viewModelContext.activity.get<HomeRoomListObservableStore>()
-            val roomSummaryComparator = viewModelContext.activity.get<RoomSummaryComparator>()
+            val chronologicalRoomComparator = viewModelContext.activity.get<ChronologicalRoomComparator>()
-            return RoomListViewModel(state, currentSession, homeRoomListObservableSource, roomSummaryComparator)
+            val alphabeticalRoomComparator = viewModelContext.activity.get<AlphabeticalRoomComparator>()
+            return RoomListViewModel(state, currentSession, homeRoomListObservableSource, alphabeticalRoomComparator, chronologicalRoomComparator)
         }
     }
 
@@ -135,13 +137,19 @@ class RoomListViewModel(initialState: RoomListViewState,
             }
         }
 
+        val roomComparator = when (displayMode) {
+            RoomListFragment.DisplayMode.HOME   -> chronologicalRoomComparator
+            RoomListFragment.DisplayMode.PEOPLE -> chronologicalRoomComparator
+            RoomListFragment.DisplayMode.ROOMS  -> alphabeticalRoomComparator
+        }
+
         return RoomSummaries().apply {
-            put(RoomCategory.INVITE, invites.sortedWith(roomSummaryComparator))
+            put(RoomCategory.INVITE, invites.sortedWith(roomComparator))
-            put(RoomCategory.FAVOURITE, favourites.sortedWith(roomSummaryComparator))
+            put(RoomCategory.FAVOURITE, favourites.sortedWith(roomComparator))
-            put(RoomCategory.DIRECT, directChats.sortedWith(roomSummaryComparator))
+            put(RoomCategory.DIRECT, directChats.sortedWith(roomComparator))
-            put(RoomCategory.GROUP, groupRooms.sortedWith(roomSummaryComparator))
+            put(RoomCategory.GROUP, groupRooms.sortedWith(roomComparator))
-            put(RoomCategory.LOW_PRIORITY, lowPriorities.sortedWith(roomSummaryComparator))
+            put(RoomCategory.LOW_PRIORITY, lowPriorities.sortedWith(roomComparator))
-            put(RoomCategory.SERVER_NOTICE, serverNotices.sortedWith(roomSummaryComparator))
+            put(RoomCategory.SERVER_NOTICE, serverNotices.sortedWith(roomComparator))
         }
     }