Room filtering.

qml/Room.qml

@@ -9,6 +9,7 @@ import "form"
 
 Page {
     property alias connection: roomListModel.connection
+    property alias filter: roomListForm.filter
 
     id: page
 

qml/Setting.qml

@@ -213,13 +213,6 @@ Page {
 
                 onCheckedChanged: MSettings.miniMode = checked
             }
-
-            Switch {
-                text: "Rearrange rooms by activity"
-                checked: MSettings.rearrangeByActivity
-
-                onCheckedChanged: MSettings.rearrangeByActivity = checked
-            }
         }
     }
 

qml/SpectralSettings.qml

@@ -4,7 +4,6 @@ import Qt.labs.settings 1.0
 
 Settings {
     property bool pressAndHold
-    property bool rearrangeByActivity
 
     property bool darkTheme
     property bool miniMode

qml/form/RoomListForm.qml

@@ -14,6 +14,7 @@ import "qrc:/js/util.js" as Util
 
 Item {
     property alias listModel: roomListProxyModel.sourceModel
+    property int filter: 0
     property var enteredRoom: null
 
     Label {
@@ -51,11 +52,25 @@ Item {
         SortFilterProxyModel {
             id: roomListProxyModel
 
-            filters: RegExpFilter {
+            filters: [
+                RegExpFilter {
                     roleName: "name"
                     pattern: searchField.text
                     caseSensitivity: Qt.CaseInsensitive
+                },
+                ExpressionFilter {
+                    enabled: filter === 1
+                    expression: unreadCount > 0
+                },
+                ExpressionFilter {
+                    enabled: filter === 2
+                    expression: category === 1 || category === 2 || category === 4
+                },
+                ExpressionFilter {
+                    enabled: filter === 3
+                    expression: category === 3 || category === 5
                 }
+            ]
             proxyRoles: ExpressionRole {
                 name: "display"
                 expression: {
@@ -72,11 +87,9 @@ Item {
             sorters: [
                 RoleSorter { roleName: "category" },
                 RoleSorter {
-                    enabled: MSettings.rearrangeByActivity
                     roleName: "lastActiveTime"
                     sortOrder: Qt.DescendingOrder
-                },
+                }
-                StringSorter { roleName: "name" }
             ]
         }
 

qml/main.qml

@@ -116,7 +116,14 @@ ApplicationWindow {
 
                     clip: true
 
-                    delegate: SideNavButton {
+                    delegate: Column {
+                        property bool expanded: accountListView.currentConnection === connection
+
+                        width: parent.width
+
+                        spacing: 0
+
+                        SideNavButton {
                             width: parent.width
                             height: width
 
@@ -134,7 +141,65 @@ ApplicationWindow {
 
                             page: roomPage
 
-                        onClicked: accountListView.currentConnection = connection
+                            onClicked: {
+                                accountListView.currentConnection = connection
+                                roomPage.filter = 0
+                            }
+                        }
+
+                        Column {
+                            width: parent.width
+                            height: expanded ? implicitHeight : 0
+
+                            spacing: 0
+                            clip: true
+
+                            SideNavButton {
+                                width: parent.width
+                                height: width
+
+                                MaterialIcon {
+                                    anchors.fill: parent
+
+                                    icon: "\ue7f7"
+                                    color:  "white"
+                                }
+
+                                onClicked: roomPage.filter = 1
+                            }
+
+                            SideNavButton {
+                                width: parent.width
+                                height: width
+
+                                MaterialIcon {
+                                    anchors.fill: parent
+
+                                    icon: "\ue7fd"
+                                    color:  "white"
+                                }
+
+                                onClicked: roomPage.filter = 2
+                            }
+
+                            SideNavButton {
+                                width: parent.width
+                                height: width
+
+                                MaterialIcon {
+                                    anchors.fill: parent
+
+                                    icon: "\ue886"
+                                    color:  "white"
+                                }
+
+                                onClicked: roomPage.filter = 3
+                            }
+
+                            Behavior on height {
+                                PropertyAnimation { easing.type: Easing.InOutCubic; duration: 200 }
+                            }
+                        }
                     }
                 }