WIP SAVEPOINT

.gitignore

@@ -10,5 +10,3 @@ bin
 *.autosave
 Makefile
 .qmake.stash
-*_qml.cpp
-*_qmlcache.qrc

README.md

@@ -1,6 +1,6 @@
-# StatusQ
+# Status QML
 
-> An emerging reusable QML UI component library for Status applications.
+> An emerging reusable UI component library for Status applications.
 
 ## Usage
 
@@ -12,7 +12,6 @@ These modules are:
 - [StatusQ.Components](https://github.com/status-im/StatusQ/blob/master/src/StatusQ/Controls/qmldir)
 - [StatusQ.Controls](https://github.com/status-im/StatusQ/blob/master/src/StatusQ/Components/qmldir)
 - [StatusQ.Layout](https://github.com/status-im/StatusQ/blob/master/src/StatusQ/Layout/qmldir)
-- [StatusQ.Platform](https://github.com/status-im/StatusQ/blob/master/src/StatusQ/Platform/qmldir)
 - [StatusQ.Popups](https://github.com/status-im/StatusQ/blob/master/src/StatusQ/Popups/qmldir)
 
 Provided components can be viewed and tested in the [sandbox application](#viewing-and-testing-components) that comes with this repository.
@@ -50,7 +49,5 @@ $ ./scripts/build
 Once that is done, the sandbox can be started with the generated executable:
 
 ```
-$ ./bin/sandbox
+$ ./bin
 ```
-
-More Documentation available on the [wiki](https://hackmd.io/@status-desktop/B1naRjxh_/%2FwFtiXvOiQqCdw2lk6gbOLA)

sandbox/Buttons.qml

@@ -1,261 +1,239 @@
 import QtQuick 2.14
 import QtQuick.Layouts 1.14
-import QtQuick.Dialogs 1.3
 
 import StatusQ.Controls 0.1
 import StatusQ.Core.Theme 0.1
 
+Grid {
 
-Column {
-    spacing: 10
-    Grid {
-        id: buttonGridWidth
-        columns: 3
-        columnSpacing: 38
-        rowSpacing: 10
+    columns: 3
+    columnSpacing: 38
+    rowSpacing: 10
 
-        horizontalItemAlignment: Grid.AlignHCenter
+    horizontalItemAlignment: Grid.AlignHCenter
 
-        // Large
-        StatusButton {
-            text: "Button"
-        }
-
-        StatusButton {
-            text: "Button"
-            enabled: false
-        }
-
-        StatusButton {
-            text: "Button"
-            loading: true
-        }
-
-        StatusButton {
-            text: "Button"
-            type: StatusBaseButton.Type.Danger
-        }
-
-        StatusButton {
-            text: "Button"
-            type: StatusBaseButton.Type.Danger
-            enabled: false
-        }
-
-        StatusButton {
-            text: "Button"
-            loading: true
-            type: StatusBaseButton.Type.Danger
-        }
-
-        StatusFlatButton {
-            text: "Button"
-        }
-
-        StatusFlatButton {
-            text: "Button"
-            enabled: false
-
-        }
-
-        StatusFlatButton {
-            text: "Button"
-            loading: true
-        }
-
-        StatusFlatButton {
-            text: "Button"
-            type: StatusBaseButton.Type.Danger
-        }
-
-        StatusFlatButton {
-            text: "Button"
-            type: StatusBaseButton.Type.Danger
-            enabled: false
-        }
-
-        StatusFlatButton {
-            text: "Button"
-            type: StatusBaseButton.Type.Danger
-            loading: true
-        }
-
-        // Small
-        StatusButton {
-            text: "Button"
-            size: StatusBaseButton.Size.Small
-        }
-
-        StatusButton {
-            text: "Button"
-            enabled: false
-            size: StatusBaseButton.Size.Small
-        }
-
-        StatusButton {
-            text: "Button"
-            size: StatusBaseButton.Size.Small
-            loading: true
-        }
-
-        StatusButton {
-            text: "Button"
-            type: StatusBaseButton.Type.Danger
-            size: StatusBaseButton.Size.Small
-        }
-
-        StatusButton {
-            text: "Button"
-            type: StatusBaseButton.Type.Danger
-            size: StatusBaseButton.Size.Small
-            enabled: false
-        }
-
-        StatusButton {
-            text: "Button"
-            type: StatusBaseButton.Type.Danger
-            size: StatusBaseButton.Size.Small
-            loading: true
-        }
-
-        StatusFlatButton {
-            text: "Button"
-            size: StatusBaseButton.Size.Small
-        }
-
-        StatusFlatButton {
-            text: "Button"
-            enabled: false
-            size: StatusBaseButton.Size.Small
-        }
-
-        StatusFlatButton {
-            text: "Button"
-            enabled: false
-            size: StatusBaseButton.Size.Small
-            loading: true
-        }
-
-        // Icon buttons
-
-        // blue
-
-        StatusRoundButton {
-            icon.name: "info"
-        }
-
-        StatusRoundButton {
-            icon.name: "info"
-            enabled: false
-        }
-
-        StatusRoundButton {
-            icon.name: "info"
-            loading: true
-        }
-
-        // black
-
-        StatusRoundButton {
-            type: StatusRoundButton.Type.Secondary
-            icon.name: "info"
-        }
-
-        StatusRoundButton {
-            type: StatusRoundButton.Type.Secondary
-            icon.name: "info"
-            enabled: false
-        }
-
-        StatusRoundButton {
-            type: StatusRoundButton.Type.Secondary
-            icon.name: "info"
-            loading: true
-        }
-
-        // Rounded blue
-
-        StatusFlatRoundButton {
-            width: 44
-            height: 44
-
-            icon.name: "info"
-        }
-
-        StatusFlatRoundButton {
-            width: 44
-            height: 44
-            icon.name: "info"
-            enabled: false
-        }
-
-        StatusFlatRoundButton {
-            width: 44
-            height: 44
-            icon.name: "info"
-            loading: true
-        }
-
-        // Rounded white
-
-        StatusFlatRoundButton {
-            type: StatusFlatRoundButton.Type.Secondary
-            width: 44
-            height: 44
-
-            icon.name: "info"
-        }
-
-        StatusFlatRoundButton {
-            type: StatusFlatRoundButton.Type.Secondary
-            width: 44
-            height: 44
-            icon.name: "info"
-            enabled: false
-        }
-
-        StatusFlatRoundButton {
-            type: StatusFlatRoundButton.Type.Secondary
-            width: 44
-            height: 44
-            icon.name: "info"
-            loading: true
-        }
-
-        StatusFlatButton {
-            icon.name: "info"
-            text: "Button"
-            size: StatusBaseButton.Size.Small
-        }
-        StatusFlatButton {
-            icon.name: "info"
-            text: "Button"
-            enabled: false
-            size: StatusBaseButton.Size.Small
-        }
-
-        StatusFlatButton {
-            icon.name: "info"
-            text: "Button"
-            loading: true
-            size: StatusBaseButton.Size.Small
-        }
+    // Large
+    StatusButton {
+        text: "Button"
     }
 
-    StatusPickerButton {
-        width: buttonGridWidth.width
-        bgColor: colorDialog.colorSelected ? colorDialog.color : Theme.palette.baseColor2
-        contentColor: colorDialog.colorSelected ? Theme.palette.indirectColor1 : Theme.palette.baseColor1
-        text: colorDialog.colorSelected ? colorDialog.color.toString().toUpperCase() : "Pick a color"
-        onClicked: {
-            colorDialog.open();
-        }
-        ColorDialog {
-            id: colorDialog
-            property bool colorSelected: false
-            onAccepted: {
-                colorSelected = true;
-            }
-        }
+    StatusButton {
+        text: "Button"
+        enabled: false
+    }
+
+    StatusButton {
+        text: "Button"
+        loading: true
+    }
+
+    StatusButton {
+        text: "Button"
+        type: StatusBaseButton.Type.Danger
+    }
+
+    StatusButton {
+        text: "Button"
+        type: StatusBaseButton.Type.Danger
+        enabled: false
+    }
+
+    StatusButton {
+        text: "Button"
+        loading: true
+        type: StatusBaseButton.Type.Danger
+    }
+
+    StatusFlatButton {
+        text: "Button"
+    }
+
+    StatusFlatButton {
+        text: "Button"
+        enabled: false
+
+    }
+
+    StatusFlatButton {
+        text: "Button"
+        loading: true
+    }
+
+    StatusFlatButton {
+        text: "Button"
+        type: StatusBaseButton.Type.Danger
+    }
+
+    StatusFlatButton {
+        text: "Button"
+        type: StatusBaseButton.Type.Danger
+        enabled: false
+    }
+
+    StatusFlatButton {
+        text: "Button"
+        type: StatusBaseButton.Type.Danger
+        loading: true
+    }
+
+    // Small
+    StatusButton {
+        text: "Button"
+        size: StatusBaseButton.Size.Small
+    }
+
+    StatusButton {
+        text: "Button"
+        enabled: false
+        size: StatusBaseButton.Size.Small
+    }
+
+    StatusButton {
+        text: "Button"
+        size: StatusBaseButton.Size.Small
+        loading: true
+    }
+
+    StatusButton {
+        text: "Button"
+        type: StatusBaseButton.Type.Danger
+        size: StatusBaseButton.Size.Small
+    }
+
+    StatusButton {
+        text: "Button"
+        type: StatusBaseButton.Type.Danger
+        size: StatusBaseButton.Size.Small
+        enabled: false
+    }
+
+    StatusButton {
+        text: "Button"
+        type: StatusBaseButton.Type.Danger
+        size: StatusBaseButton.Size.Small
+        loading: true
+    }
+
+    StatusFlatButton {
+        text: "Button"
+        size: StatusBaseButton.Size.Small
+    }
+
+    StatusFlatButton {
+        text: "Button"
+        enabled: false
+        size: StatusBaseButton.Size.Small
+    }
+
+    StatusFlatButton {
+        text: "Button"
+        enabled: false
+        size: StatusBaseButton.Size.Small
+        loading: true
+    }
+
+    // Icon buttons
+
+    // blue
+
+    StatusRoundButton {
+        icon.name: "info"
+    }
+
+    StatusRoundButton {
+        icon.name: "info"
+        enabled: false
+    }
+
+    StatusRoundButton {
+        icon.name: "info"
+        loading: true
+    }
+
+    // black
+
+    StatusRoundButton {
+        type: StatusRoundButton.Type.Secondary
+        icon.name: "info"
+    }
+
+    StatusRoundButton {
+        type: StatusRoundButton.Type.Secondary
+        icon.name: "info"
+        enabled: false
+    }
+
+    StatusRoundButton {
+        type: StatusRoundButton.Type.Secondary
+        icon.name: "info"
+        loading: true
+    }
+
+    // Rounded blue
+
+    StatusFlatRoundButton {
+        width: 44
+        height: 44
+
+        icon.name: "info"
+    }
+
+    StatusFlatRoundButton {
+        width: 44
+        height: 44
+        icon.name: "info"
+        enabled: false
+    }
+
+    StatusFlatRoundButton {
+        width: 44
+        height: 44
+        icon.name: "info"
+        loading: true
+    }
+
+    // Rounded white
+
+    StatusFlatRoundButton {
+        type: StatusFlatRoundButton.Type.Secondary
+        width: 44
+        height: 44
+
+        icon.name: "info"
+    }
+
+    StatusFlatRoundButton {
+        type: StatusFlatRoundButton.Type.Secondary
+        width: 44
+        height: 44
+        icon.name: "info"
+        enabled: false
+    }
+
+    StatusFlatRoundButton {
+        type: StatusFlatRoundButton.Type.Secondary
+        width: 44
+        height: 44
+        icon.name: "info"
+        loading: true
+    }
+
+    StatusFlatButton {
+        icon.name: "info"
+        text: "Button"
+        size: StatusBaseButton.Size.Small
+    }
+    StatusFlatButton {
+        icon.name: "info"
+        text: "Button"
+        enabled: false
+        size: StatusBaseButton.Size.Small
+    }
+
+    StatusFlatButton {
+        icon.name: "info"
+        text: "Button"
+        loading: true
+        size: StatusBaseButton.Size.Small
     }
 }

sandbox/Controls.qml

@@ -5,8 +5,6 @@ import StatusQ.Core 0.1
 import StatusQ.Core.Theme 0.1
 import StatusQ.Controls 0.1
 
-import Sandbox 0.1
-
 GridLayout {
     columns: 6
     columnSpacing: 5
@@ -143,32 +141,4 @@ GridLayout {
         to: 100
         value: 40
     }
-
-    StatusBaseInput {
-        placeholderText: "One line"
-    }
-
-    StatusBaseInput {
-        multiline: true
-        placeholderText: "Multiline"
-    }
-
-    StatusBaseInput {
-        multiline: true
-        placeholderText: "Multiline with static height"
-        implicitHeight: 100
-    }
-
-    Item {
-        implicitHeight: 300
-        implicitWidth: 300
-
-        StatusBaseInput {
-            anchors.centerIn: parent
-            multiline: true
-            placeholderText: "Multiline with max/min"
-            minimumHeight: 80
-            maximumHeight: 200
-        }
-    }
 }

sandbox/DemoApp.qml

@@ -1,6 +1,8 @@
 import QtQuick 2.14
 import QtQuick.Controls 2.14
 
+import Sandbox 0.1
+
 import StatusQ.Core 0.1
 import StatusQ.Core.Theme 0.1
 import StatusQ.Controls 0.1
@@ -44,6 +46,7 @@ Rectangle {
         }
     }
 
+
     StatusAppLayout {
         id: statusAppLayout
         anchors.top: demoApp.top
@@ -172,74 +175,34 @@ Rectangle {
                     text: "Chat"
                 }
 
-                Column {
+                StatusChatList {
+                    width: parent.width
                     anchors.top: headline.bottom
                     anchors.topMargin: 16
-                    width: parent.width
-                    spacing: 8
-
-                    StatusContactRequestsIndicatorListItem {
-                        anchors.horizontalCenter: parent.horizontalCenter
-                        title: "Contact requests"
-                        requestsCount: 3
-                        sensor.onClicked: demoContactRequestsModal.open()
-                    }
-
-                    StatusChatList {
-                        anchors.horizontalCenter: parent.horizontalCenter
-
-                        chatListItems.model: demoChatListItems
-                        selectedChatId: "0"
-                        onChatItemSelected: selectedChatId = id
-                        onChatItemUnmuted: {
-                            for (var i = 0; i < demoChatListItems.count; i++) {
-                                let item = demoChatListItems.get(i);
-                                if (item.chatId === id) {
-                                    demoChatListItems.setProperty(i, "muted", false)
-                                }
-                            }
-                        }
-
-                        popupMenu: StatusPopupMenu {
-
-                            property string chatId
-
-                            openHandler: function (id) {
-                                chatId = id
-                            }
-
-                            StatusMenuItem {
-                                text: "View Profile"
-                                icon.name: "group-chat"
-                            }
-
-                            StatusMenuSeparator {}
-
-                            StatusMenuItem {
-                                text: "Mute chat"
-                                icon.name: "notification"
-                            }
-
-                            StatusMenuItem {
-                                text: "Mark as Read"
-                                icon.name: "checkmark-circle"
-                            }
-
-                            StatusMenuItem {
-                                text: "Clear history"
-                                icon.name: "close-circle"
-                            }
-
-                            StatusMenuSeparator {}
-
-                            StatusMenuItem {
-                                text: "Delete chat"
-                                icon.name: "delete"
-                                type: StatusMenuItem.Type.Danger
-                            }
-                        }
-                    }
+                    anchors.bottom: parent.bottom
+                    chatListItems.model: demoChatListItems
+                    selectedChatId: "0"
+                    onChatItemSelected: selectedChatId = id
                 }
+
+                /* StatusChatListAndCategories { */
+                /*     anchors.top: headline.bottom */
+                /*     anchors.topMargin: 16 */
+                /*     anchors.bottom: parent.bottom */
+                /*     width: parent.width */
+
+                /*     chatList.model: demoChatListItems */
+                /*     selectedChatId: "0" */
+                /*     onChatItemSelected: selectedChatId = id */
+                /*     onChatItemUnmuted: { */
+                /*         for (var i = 0; i < demoChatListItems.count; i++) { */
+                /*             let item = demoChatListItems.get(i); */
+                /*             if (item.chatId === id) { */
+                /*                 demoChatListItems.setProperty(i, "muted", false) */
+                /*             } */
+                /*         } */
+                /*     } */
+                /* } */
             }
 
             rightPanel: Item {
@@ -255,8 +218,6 @@ Rectangle {
                     chatInfoButton.type: StatusChatInfoButton.Type.OneToOneChat
                     chatInfoButton.pinnedMessagesCount: 1
 
-                    searchButton.visible: false
-                    membersButton.visible: false
                     notificationCount: 1
 
                     onNotificationButtonClicked: notificationCount = 0
@@ -298,20 +259,17 @@ Rectangle {
         StatusAppTwoPanelLayout {
 
             leftPanel: Item {
-                id: leftPanel
                 anchors.fill: parent
 
                 StatusChatInfoToolBar {
                     id: statusChatInfoToolBar
-
                     anchors.top: parent.top
-                    anchors.horizontalCenter: parent.horizontalCenter
 
-                    chatInfoButton.title: "CryptoKitties"
+                    chatInfoButton.title: "Cryptokitties"        
                     chatInfoButton.subTitle: "128 Members"
                     chatInfoButton.image.source: "https://pbs.twimg.com/profile_images/1369221718338895873/T_5fny6o_400x400.jpg"
                     chatInfoButton.icon.color: Theme.palette.miscColor6
-                    chatInfoButton.onClicked: demoCommunityDetailModal.open()
+                    anchors.horizontalCenter: parent.horizontalCenter
 
                     popupMenu: StatusPopupMenu {
 
@@ -335,105 +293,63 @@ Rectangle {
                     }
                 }
 
-                ScrollView {
-                    id: scrollView
-
+                StatusChatListAndCategories {
                     anchors.top: statusChatInfoToolBar.bottom
                     anchors.topMargin: 8
                     anchors.bottom: parent.bottom
-                    width: leftPanel.width
+                    width: parent.width
 
-                    contentHeight: communityCategories.height
-                    clip: true
+                    chatList.model: demoCommunityChatListItems
+                    categoryList.model: demoCommunityCategoryItems
 
-                    StatusChatListAndCategories {
-                        id: communityCategories
-                        height: implicitHeight > (leftPanel.height - 64) ? implicitHeight + 8 : leftPanel.height - 64
-                        width: leftPanel.width
+                    showCategoryActionButtons: true
+                    onChatItemSelected: selectedChatId = id
 
-                        chatList.model: demoCommunityChatListItems
-                        categoryList.model: demoCommunityCategoryItems
+                    categoryPopupMenu: StatusPopupMenu {
 
-                        showCategoryActionButtons: true
-                        onChatItemSelected: selectedChatId = id
+                        property string categoryId
 
-                        categoryPopupMenu: StatusPopupMenu {
-
-                            property string categoryId
-
-                            openHandler: function (id) {
-                                categoryId = id
-                            }
-
-                            StatusMenuItem {
-                                text: "Mute Category"
-                                icon.name: "notification"
-                            }
-
-                            StatusMenuItem { 
-                                text: "Mark as Read"
-                                icon.name: "checkmark-circle"
-                            }
-
-                            StatusMenuItem { 
-                                text: "Edit Category"
-                                icon.name: "edit"
-                            }
-
-                            StatusMenuSeparator {}
-
-                            StatusMenuItem {
-                                text: "Delete Category"
-                                icon.name: "delete"
-                                type: StatusMenuItem.Type.Danger
-                            }
+                        StatusMenuItem {
+                            text: "Mute Category"
+                            icon.name: "notification"
                         }
 
-                        chatListPopupMenu: StatusPopupMenu {
-
-                            property string chatId
-
-                            StatusMenuItem {
-                                text: "Mute chat"
-                                icon.name: "notification"
-                            }
-
-                            StatusMenuItem {
-                                text: "Mark as Read"
-                                icon.name: "checkmark-circle"
-                            }
-
-                            StatusMenuItem {
-                                text: "Clear history"
-                                icon.name: "close-circle"
-                            }
-
-                            StatusMenuSeparator {}
-
-                            StatusMenuItem {
-                                text: "Delete chat"
-                                icon.name: "delete"
-                                type: StatusMenuItem.Type.Danger
-                            }
+                        StatusMenuItem { 
+                            text: "Mark as Read"
+                            icon.name: "checkmark-circle"
                         }
 
-                        popupMenu: StatusPopupMenu {
-                            StatusMenuItem {
-                                text: "Create channel"
-                                icon.name: "channel"
-                            }
+                        StatusMenuItem { 
+                            text: "Edit Category"
+                            icon.name: "edit"
+                        }
 
-                            StatusMenuItem {
-                                text: "Create category"
-                                icon.name: "channel-category"
-                            }
+                        StatusMenuSeparator {}
 
-                            StatusMenuSeparator {}
+                        StatusMenuItem {
+                            text: "Delete Category"
+                            icon.name: "delete"
+                            type: StatusMenuItem.Type.Danger
+                        }
+                    }
 
-                            StatusMenuItem {
-                                text: "Invite people"
-                                icon.name: "share-ios"
-                            }
+
+                    popupMenu: StatusPopupMenu {
+                        StatusMenuItem {
+                            text: "Create channel"
+                            icon.name: "channel"
+                        }
+
+                        StatusMenuItem {
+                            text: "Create category"
+                            icon.name: "channel-category"
+                        }
+
+                        StatusMenuSeparator {}
+
+                        StatusMenuItem {
+                            text: "Invite people"
+                            icon.name: "share-ios"
                         }
                     }
                 }
@@ -527,145 +443,6 @@ Rectangle {
         }
     }
 
-    StatusModal {
-        id: demoContactRequestsModal
-        anchors.centerIn: parent
-
-        header.title: "Contact Requests"
-        headerActionButton: StatusFlatRoundButton {
-            type: StatusFlatRoundButton.Type.Secondary
-            width: 32
-            height: 32
-
-            icon.width: 20
-            icon.height: 20
-            icon.name: "notification"
-        }
-
-        content: StatusBaseText {
-            anchors.centerIn: parent
-            text: "Contact request will be shown here"
-            font.pixelSize: 15
-            color: Theme.palette.directColor1
-        }
-
-        rightButtons: [
-            StatusButton {
-                text: "Decline all"
-                type: StatusBaseButton.Type.Danger
-                onClicked: demoContactRequestsModal.close()
-            },
-            StatusButton {
-                text: "Accept all"
-                onClicked: demoContactRequestsModal.close()
-            }
-        ]
-    }
-
-    StatusModal {
-        id: demoCommunityDetailModal
-
-        anchors.centerIn: parent
-
-        header.title: "Cryptokitties"        
-        header.subTitle: "Public Community"
-        header.image.source: "https://pbs.twimg.com/profile_images/1369221718338895873/T_5fny6o_400x400.jpg"
-
-        content: Column {
-            width: demoCommunityDetailModal.width
-
-            StatusModalDivider { 
-                bottomPadding: 8 
-            }
-
-            StatusBaseText {
-                text: "A community of cat lovers, meow!"
-                verticalAlignment: Text.AlignVCenter
-                font.pixelSize: 15
-                height: 46
-                color: Theme.palette.directColor1
-                anchors.left: parent.left
-                anchors.right: parent.right
-                anchors.leftMargin: 16
-                anchors.rightMargin: 16
-            }
-
-            StatusModalDivider {
-                topPadding: 8
-                bottomPadding: 8
-            }
-
-            StatusDescriptionListItem {
-                title: "Share community"
-                subTitle: "https://join.status.im/u/0x04...45f19"
-                tooltip.text: "Copy to clipboard"
-                icon.name: "copy"
-                iconButton.onClicked: tooltip.visible = !tooltip.visible
-                width: parent.width
-            }
-
-            StatusModalDivider {
-                topPadding: 8
-                bottomPadding: 8
-            }
-
-            StatusListItem {
-                anchors.horizontalCenter: parent.horizontalCenter
-                statusListItemTitle.font.pixelSize: 17
-                title: "Members"
-                icon.name: "group-chat"
-                label: "184"
-                components: [
-                    StatusIcon {
-                        icon: "chevron-down"
-                        rotation: 270
-                        color: Theme.palette.baseColor1
-                    }
-                ]
-            }
-
-            StatusListItem {
-                anchors.horizontalCenter: parent.horizontalCenter
-                statusListItemTitle.font.pixelSize: 17
-                title: "Notifications"
-                icon.name: "notification"
-                components: [
-                    StatusSwitch {}
-                ]
-            }
-
-            StatusModalDivider {
-                topPadding: 8
-                bottomPadding: 8
-            }
-
-            StatusListItem {
-                anchors.horizontalCenter: parent.horizontalCenter
-                statusListItemTitle.font.pixelSize: 17
-                title: "Edit community"
-                icon.name: "edit"
-                type: StatusListItem.Type.Secondary
-            }
-
-            StatusListItem {
-                anchors.horizontalCenter: parent.horizontalCenter
-                statusListItemTitle.font.pixelSize: 17
-                title: "Transfer ownership"
-                icon.name: "exchange"
-                type: StatusListItem.Type.Secondary
-            }
-
-            StatusListItem {
-                anchors.horizontalCenter: parent.horizontalCenter
-                statusListItemTitle.font.pixelSize: 17
-                title: "Leave community"
-                icon.name: "arrow-right"
-                icon.rotation: 180
-                type: StatusListItem.Type.Secondary
-            }
-        }
-    }
-
     ListModel {
         id: demoChatListItems
         ListElement {
@@ -673,27 +450,28 @@ Rectangle {
             name: "#status"
             chatType: StatusChatListItem.Type.PublicChat
             muted: false
+            hasUnreadMessages: false
+            hasMention: false
             unreadMessagesCount: 0
-            mentionsCount: 0
-            color: "blue"
+            iconColor: "blue"
         }
         ListElement {
             chatId: "1"
-            name: "status-desktop"
+            name: "#status-desktop"
             chatType: StatusChatListItem.Type.PublicChat
             muted: false
-            color: "red"
+            hasUnreadMessages: true
+            iconColor: "red"
             unreadMessagesCount: 1
-            mentionsCount: 1
         }
         ListElement {
             chatId: "2"
             name: "Amazing Funny Squirrel"
             chatType: StatusChatListItem.Type.OneToOneChat
             muted: false
-            color: "green"
-            identicon: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAYAAAAeP4ixAAAAlklEQVR4nOzW0QmDQBAG4SSkl7SUQlJGCrElq9F3QdjjVhh/5nv3cFhY9vUIYQiNITSG0Bh
-CExPynn1gWf9bx498P7/nzPcxEzGExhBdJGYihtAYQlO+tUZvqrPbqeudo5iJGEJjCE15a3VtodH3q2ImYgiNITTlTdG1nUZ5a92VITQxITFiJmIIjSE0htAYQrMHAAD//+wwFVpz+yqXAAAAAElFTkSuQmCC"
+            hasUnreadMessages: false
+            iconColor: "green"
+            identicon: "https://pbs.twimg.com/profile_images/1369221718338895873/T_5fny6o_400x400.jpg"
             unreadMessagesCount: 0
         }
         ListElement {
@@ -701,7 +479,8 @@ CExPynn1gWf9bx498P7/nzPcxEzGExhBdJGYihtAYQlO+tUZvqrPbqeudo5iJGEJjCE15a3VtodH3q2I
             name: "Black Ops"
             chatType: StatusChatListItem.Type.GroupChat
             muted: false
-            color: "purple"
+            hasUnreadMessages: false
+            iconColor: "purple"
             unreadMessagesCount: 0
         }
         ListElement {
@@ -709,15 +488,196 @@ CExPynn1gWf9bx498P7/nzPcxEzGExhBdJGYihtAYQlO+tUZvqrPbqeudo5iJGEJjCE15a3VtodH3q2I
             name: "Spectacular Growing Otter"
             chatType: StatusChatListItem.Type.OneToOneChat
             muted: true
-            color: "Orange"
+            hasUnreadMessages: false
+            iconColor: "Orange"
             unreadMessagesCount: 0
         }
         ListElement {
-            chatId: "5"
-            name: "channel-with-a-super-duper-long-name"
+            chatId: "0"
+            name: "#status"
             chatType: StatusChatListItem.Type.PublicChat
             muted: false
-            color: "green"
+            hasUnreadMessages: false
+            hasMention: false
+            unreadMessagesCount: 0
+            iconColor: "blue"
+        }
+        ListElement {
+            chatId: "1"
+            name: "#status-desktop"
+            chatType: StatusChatListItem.Type.PublicChat
+            muted: false
+            hasUnreadMessages: true
+            iconColor: "red"
+            unreadMessagesCount: 1
+        }
+        ListElement {
+            chatId: "2"
+            name: "Amazing Funny Squirrel"
+            chatType: StatusChatListItem.Type.OneToOneChat
+            muted: false
+            hasUnreadMessages: false
+            iconColor: "green"
+            identicon: "https://pbs.twimg.com/profile_images/1369221718338895873/T_5fny6o_400x400.jpg"
+            unreadMessagesCount: 0
+        }
+        ListElement {
+            chatId: "3"
+            name: "Black Ops"
+            chatType: StatusChatListItem.Type.GroupChat
+            muted: false
+            hasUnreadMessages: false
+            iconColor: "purple"
+            unreadMessagesCount: 0
+        }
+        ListElement {
+            chatId: "4"
+            name: "Spectacular Growing Otter"
+            chatType: StatusChatListItem.Type.OneToOneChat
+            muted: true
+            hasUnreadMessages: false
+            iconColor: "Orange"
+            unreadMessagesCount: 0
+        }
+        ListElement {
+            chatId: "0"
+            name: "#status"
+            chatType: StatusChatListItem.Type.PublicChat
+            muted: false
+            hasUnreadMessages: false
+            hasMention: false
+            unreadMessagesCount: 0
+            iconColor: "blue"
+        }
+        ListElement {
+            chatId: "1"
+            name: "#status-desktop"
+            chatType: StatusChatListItem.Type.PublicChat
+            muted: false
+            hasUnreadMessages: true
+            iconColor: "red"
+            unreadMessagesCount: 1
+        }
+        ListElement {
+            chatId: "2"
+            name: "Amazing Funny Squirrel"
+            chatType: StatusChatListItem.Type.OneToOneChat
+            muted: false
+            hasUnreadMessages: false
+            iconColor: "green"
+            identicon: "https://pbs.twimg.com/profile_images/1369221718338895873/T_5fny6o_400x400.jpg"
+            unreadMessagesCount: 0
+        }
+        ListElement {
+            chatId: "3"
+            name: "Black Ops"
+            chatType: StatusChatListItem.Type.GroupChat
+            muted: false
+            hasUnreadMessages: false
+            iconColor: "purple"
+            unreadMessagesCount: 0
+        }
+        ListElement {
+            chatId: "4"
+            name: "Spectacular Growing Otter"
+            chatType: StatusChatListItem.Type.OneToOneChat
+            muted: true
+            hasUnreadMessages: false
+            iconColor: "Orange"
+            unreadMessagesCount: 0
+        }
+        ListElement {
+            chatId: "0"
+            name: "#status"
+            chatType: StatusChatListItem.Type.PublicChat
+            muted: false
+            hasUnreadMessages: false
+            hasMention: false
+            unreadMessagesCount: 0
+            iconColor: "blue"
+        }
+        ListElement {
+            chatId: "1"
+            name: "#status-desktop"
+            chatType: StatusChatListItem.Type.PublicChat
+            muted: false
+            hasUnreadMessages: true
+            iconColor: "red"
+            unreadMessagesCount: 1
+        }
+        ListElement {
+            chatId: "2"
+            name: "Amazing Funny Squirrel"
+            chatType: StatusChatListItem.Type.OneToOneChat
+            muted: false
+            hasUnreadMessages: false
+            iconColor: "green"
+            identicon: "https://pbs.twimg.com/profile_images/1369221718338895873/T_5fny6o_400x400.jpg"
+            unreadMessagesCount: 0
+        }
+        ListElement {
+            chatId: "3"
+            name: "Black Ops"
+            chatType: StatusChatListItem.Type.GroupChat
+            muted: false
+            hasUnreadMessages: false
+            iconColor: "purple"
+            unreadMessagesCount: 0
+        }
+        ListElement {
+            chatId: "4"
+            name: "Spectacular Growing Otter"
+            chatType: StatusChatListItem.Type.OneToOneChat
+            muted: true
+            hasUnreadMessages: false
+            iconColor: "Orange"
+            unreadMessagesCount: 0
+        }
+        ListElement {
+            chatId: "0"
+            name: "#status"
+            chatType: StatusChatListItem.Type.PublicChat
+            muted: false
+            hasUnreadMessages: false
+            hasMention: false
+            unreadMessagesCount: 0
+            iconColor: "blue"
+        }
+        ListElement {
+            chatId: "1"
+            name: "#status-desktop"
+            chatType: StatusChatListItem.Type.PublicChat
+            muted: false
+            hasUnreadMessages: true
+            iconColor: "red"
+            unreadMessagesCount: 1
+        }
+        ListElement {
+            chatId: "2"
+            name: "Amazing Funny Squirrel"
+            chatType: StatusChatListItem.Type.OneToOneChat
+            muted: false
+            hasUnreadMessages: false
+            iconColor: "green"
+            identicon: "https://pbs.twimg.com/profile_images/1369221718338895873/T_5fny6o_400x400.jpg"
+            unreadMessagesCount: 0
+        }
+        ListElement {
+            chatId: "3"
+            name: "Black Ops"
+            chatType: StatusChatListItem.Type.GroupChat
+            muted: false
+            hasUnreadMessages: false
+            iconColor: "purple"
+            unreadMessagesCount: 0
+        }
+        ListElement {
+            chatId: "4"
+            name: "Spectacular Growing Otter"
+            chatType: StatusChatListItem.Type.OneToOneChat
+            muted: true
+            hasUnreadMessages: false
+            iconColor: "Orange"
             unreadMessagesCount: 0
         }
     }
@@ -729,16 +689,20 @@ CExPynn1gWf9bx498P7/nzPcxEzGExhBdJGYihtAYQlO+tUZvqrPbqeudo5iJGEJjCE15a3VtodH3q2I
             name: "general"
             chatType: StatusChatListItem.Type.CommunityChat
             muted: false
+            hasUnreadMessages: false
+            hasMention: false
             unreadMessagesCount: 0
-            color: "orange"
+            iconColor: "orange"
         }
         ListElement {
             chatId: "1"
             name: "random"
             chatType: StatusChatListItem.Type.CommunityChat
             muted: false
+            hasUnreadMessages: false
+            hasMention: false
             unreadMessagesCount: 0
-            color: "orange"
+            iconColor: "orange"
             categoryId: "public"
         }
         ListElement {
@@ -746,8 +710,10 @@ CExPynn1gWf9bx498P7/nzPcxEzGExhBdJGYihtAYQlO+tUZvqrPbqeudo5iJGEJjCE15a3VtodH3q2I
             name: "watercooler"
             chatType: StatusChatListItem.Type.CommunityChat
             muted: false
+            hasUnreadMessages: false
+            hasMention: false
             unreadMessagesCount: 0
-            color: "orange"
+            iconColor: "orange"
             categoryId: "public"
         }
         ListElement {
@@ -755,8 +721,225 @@ CExPynn1gWf9bx498P7/nzPcxEzGExhBdJGYihtAYQlO+tUZvqrPbqeudo5iJGEJjCE15a3VtodH3q2I
             name: "language-design"
             chatType: StatusChatListItem.Type.CommunityChat
             muted: false
+            hasUnreadMessages: false
+            hasMention: false
             unreadMessagesCount: 0
-            color: "orange"
+            iconColor: "orange"
+            categoryId: "dev"
+        }
+        ListElement {
+            chatId: "0"
+            name: "general"
+            chatType: StatusChatListItem.Type.CommunityChat
+            muted: false
+            hasUnreadMessages: false
+            hasMention: false
+            unreadMessagesCount: 0
+            iconColor: "orange"
+        }
+        ListElement {
+            chatId: "1"
+            name: "random"
+            chatType: StatusChatListItem.Type.CommunityChat
+            muted: false
+            hasUnreadMessages: false
+            hasMention: false
+            unreadMessagesCount: 0
+            iconColor: "orange"
+            categoryId: "public"
+        }
+        ListElement {
+            chatId: "2"
+            name: "watercooler"
+            chatType: StatusChatListItem.Type.CommunityChat
+            muted: false
+            hasUnreadMessages: false
+            hasMention: false
+            unreadMessagesCount: 0
+            iconColor: "orange"
+            categoryId: "public"
+        }
+        ListElement {
+            chatId: "3"
+            name: "language-design"
+            chatType: StatusChatListItem.Type.CommunityChat
+            muted: false
+            hasUnreadMessages: false
+            hasMention: false
+            unreadMessagesCount: 0
+            iconColor: "orange"
+            categoryId: "dev"
+        }
+        ListElement {
+            chatId: "0"
+            name: "general"
+            chatType: StatusChatListItem.Type.CommunityChat
+            muted: false
+            hasUnreadMessages: false
+            hasMention: false
+            unreadMessagesCount: 0
+            iconColor: "orange"
+        }
+        ListElement {
+            chatId: "1"
+            name: "random"
+            chatType: StatusChatListItem.Type.CommunityChat
+            muted: false
+            hasUnreadMessages: false
+            hasMention: false
+            unreadMessagesCount: 0
+            iconColor: "orange"
+            categoryId: "public"
+        }
+        ListElement {
+            chatId: "2"
+            name: "watercooler"
+            chatType: StatusChatListItem.Type.CommunityChat
+            muted: false
+            hasUnreadMessages: false
+            hasMention: false
+            unreadMessagesCount: 0
+            iconColor: "orange"
+            categoryId: "public"
+        }
+        ListElement {
+            chatId: "3"
+            name: "language-design"
+            chatType: StatusChatListItem.Type.CommunityChat
+            muted: false
+            hasUnreadMessages: false
+            hasMention: false
+            unreadMessagesCount: 0
+            iconColor: "orange"
+            categoryId: "dev"
+        }
+        ListElement {
+            chatId: "0"
+            name: "general"
+            chatType: StatusChatListItem.Type.CommunityChat
+            muted: false
+            hasUnreadMessages: false
+            hasMention: false
+            unreadMessagesCount: 0
+            iconColor: "orange"
+        }
+        ListElement {
+            chatId: "1"
+            name: "random"
+            chatType: StatusChatListItem.Type.CommunityChat
+            muted: false
+            hasUnreadMessages: false
+            hasMention: false
+            unreadMessagesCount: 0
+            iconColor: "orange"
+            categoryId: "public"
+        }
+        ListElement {
+            chatId: "2"
+            name: "watercooler"
+            chatType: StatusChatListItem.Type.CommunityChat
+            muted: false
+            hasUnreadMessages: false
+            hasMention: false
+            unreadMessagesCount: 0
+            iconColor: "orange"
+            categoryId: "public"
+        }
+        ListElement {
+            chatId: "3"
+            name: "language-design"
+            chatType: StatusChatListItem.Type.CommunityChat
+            muted: false
+            hasUnreadMessages: false
+            hasMention: false
+            unreadMessagesCount: 0
+            iconColor: "orange"
+            categoryId: "dev"
+        }
+        ListElement {
+            chatId: "0"
+            name: "general"
+            chatType: StatusChatListItem.Type.CommunityChat
+            muted: false
+            hasUnreadMessages: false
+            hasMention: false
+            unreadMessagesCount: 0
+            iconColor: "orange"
+        }
+        ListElement {
+            chatId: "1"
+            name: "random"
+            chatType: StatusChatListItem.Type.CommunityChat
+            muted: false
+            hasUnreadMessages: false
+            hasMention: false
+            unreadMessagesCount: 0
+            iconColor: "orange"
+            categoryId: "public"
+        }
+        ListElement {
+            chatId: "2"
+            name: "watercooler"
+            chatType: StatusChatListItem.Type.CommunityChat
+            muted: false
+            hasUnreadMessages: false
+            hasMention: false
+            unreadMessagesCount: 0
+            iconColor: "orange"
+            categoryId: "public"
+        }
+        ListElement {
+            chatId: "3"
+            name: "language-design"
+            chatType: StatusChatListItem.Type.CommunityChat
+            muted: false
+            hasUnreadMessages: false
+            hasMention: false
+            unreadMessagesCount: 0
+            iconColor: "orange"
+            categoryId: "dev"
+        }
+        ListElement {
+            chatId: "0"
+            name: "general"
+            chatType: StatusChatListItem.Type.CommunityChat
+            muted: false
+            hasUnreadMessages: false
+            hasMention: false
+            unreadMessagesCount: 0
+            iconColor: "orange"
+        }
+        ListElement {
+            chatId: "1"
+            name: "random"
+            chatType: StatusChatListItem.Type.CommunityChat
+            muted: false
+            hasUnreadMessages: false
+            hasMention: false
+            unreadMessagesCount: 0
+            iconColor: "orange"
+            categoryId: "public"
+        }
+        ListElement {
+            chatId: "2"
+            name: "watercooler"
+            chatType: StatusChatListItem.Type.CommunityChat
+            muted: false
+            hasUnreadMessages: false
+            hasMention: false
+            unreadMessagesCount: 0
+            iconColor: "orange"
+            categoryId: "public"
+        }
+        ListElement {
+            chatId: "3"
+            name: "language-design"
+            chatType: StatusChatListItem.Type.CommunityChat
+            muted: false
+            hasUnreadMessages: false
+            hasMention: false
+            unreadMessagesCount: 0
+            iconColor: "orange"
             categoryId: "dev"
         }
     }

sandbox/ListItems.qml

@@ -224,24 +224,6 @@ GridLayout {
         ]
     }
 
-    StatusListItem {
-        title: "Title"
-        icon.name: "info"
-        type: StatusListItem.Type.Secondary
-    }
-
-    StatusListItem {
-        title: "Title"
-        icon.isLetterIdenticon: true
-        icon.background.color: "orange"
-    }
-
-    StatusListItem {
-        title: "Title"
-        icon.name: "delete"
-        type: StatusListItem.Type.Danger
-    }
-
     StatusDescriptionListItem {
         title: "Title"
         subTitle: "Subtitle"
@@ -255,8 +237,4 @@ GridLayout {
         iconButton.onClicked: tooltip.visible = !tooltip.visible
     }
 
-    StatusContactRequestsIndicatorListItem {
-        title: "Contact requests"
-        requestsCount: 3
-    }
 }

sandbox/Popups.qml

@@ -1,174 +0,0 @@
-import QtQuick 2.14
-
-import StatusQ.Core 0.1
-import StatusQ.Core.Theme 0.1
-import StatusQ.Controls 0.1
-import StatusQ.Popups 0.1
-
-Column {
-    spacing: 20
-
-    StatusButton {
-        text: "Simple modal"
-        onClicked: simpleModal.open()
-    }
-
-    StatusButton {
-        text: "Modal with header image"
-        onClicked: headerImageModal.open()
-    }
-
-    StatusButton {
-        text: "Modal with footer buttons"
-        onClicked: footerButtonsModal.open()
-    }
-
-    StatusButton {
-        text: "Modal with header action button"
-        onClicked: headerActionButtonModal.open()
-    }
-
-    StatusButton {
-        text: "Modal with content"
-        onClicked: modalExample.open()
-    }
-
-    StatusButton {
-        text: "Modal with changable content"
-        onClicked: modalWithContentAccess.open()
-    }
-
-    StatusModal {
-        id: simpleModal
-        anchors.centerIn: parent
-        header.title: "Some Title"
-        header.subTitle: "Subtitle"
-    }
-
-    StatusModal {
-        id: headerImageModal
-        anchors.centerIn: parent
-        header.title: "Some Title"
-        header.subTitle: "Subtitle"
-        header.image.source: "https://pbs.twimg.com/profile_images/1369221718338895873/T_5fny6o_400x400.jpg"
-    }
-
-    StatusModal {
-        id: footerButtonsModal
-        anchors.centerIn: parent
-        header.title: "Some Title"
-        header.subTitle: "Subtitle"
-        header.image.source: "https://pbs.twimg.com/profile_images/1369221718338895873/T_5fny6o_400x400.jpg"
-        leftButtons: [
-            StatusRoundButton {
-                icon.name: "arrow-right"
-                rotation: 180
-            }
-        ]
-        rightButtons: [
-            StatusButton {
-                text: "Button"
-            },
-            StatusButton {
-                text: "Button"
-            }
-        ]
-    }
-
-    StatusModal {
-        id: headerActionButtonModal
-        anchors.centerIn: parent
-        header.title: "Some Title"
-        header.subTitle: "Subtitle"
-        header.image.source: "https://pbs.twimg.com/profile_images/1369221718338895873/T_5fny6o_400x400.jpg"
-
-        headerActionButton: StatusFlatRoundButton {
-            type: StatusFlatRoundButton.Type.Secondary
-            width: 32
-            height: 32
-
-            icon.width: 20
-            icon.height: 20
-            icon.name: "info"
-        }
-
-        leftButtons: [
-            StatusRoundButton {
-                icon.name: "arrow-right"
-                rotation: 180
-            }
-        ]
-        rightButtons: [
-            StatusButton {
-                text: "Button"
-            },
-            StatusButton {
-                text: "Button"
-            }
-        ]
-    }
-
-    StatusModal {
-        id: modalExample
-        anchors.centerIn: parent
-        header.image.source: "https://pbs.twimg.com/profile_images/1369221718338895873/T_5fny6o_400x400.jpg"
-        header.title: "Header"
-        header.subTitle: "SubTitle"
-        rightButtons: [
-            StatusButton {
-                text: "Button"
-            },
-            StatusButton {
-                text: "Button"
-            }
-        ]
-
-        leftButtons: [
-            StatusRoundButton {
-                icon.name: "arrow-right"
-                rotation: 180
-            }
-        ]
-
-        content: StatusBaseText {
-            anchors.centerIn: parent
-            text: "Some text content"
-            font.pixelSize: 15
-            color: Theme.palette.directColor1
-        }
-
-        headerActionButton: StatusFlatRoundButton {
-            type: StatusFlatRoundButton.Type.Secondary
-            width: 32
-            height: 32
-
-            icon.width: 20
-            icon.height: 20
-            icon.name: "info"
-        }
-    }
-
-    StatusModal {
-        id: modalWithContentAccess
-        anchors.centerIn: parent
-        header.title: "Header"
-        header.subTitle: "SubTitle"
-
-        content: StatusBaseText {
-            id: text
-            anchors.centerIn: parent
-            text: "Some text content"
-            font.pixelSize: 15
-            color: Theme.palette.directColor1
-        }
-
-        rightButtons: [
-            StatusButton {
-                text: "Change text"
-                onClicked: {
-                    modalWithContentAccess.contentComponent.text = "Changed!"
-                }
-            }
-        ]
-    }
-}

sandbox/main.qml

@@ -165,12 +165,6 @@ StatusWindow {
                             selected: page.sourceComponent == popupMenuComponent
                             onClicked: page.sourceComponent = popupMenuComponent
                         }
-
-                        StatusNavigationListItem {
-                            title: "StatusModal"
-                            selected: page.sourceComponent == statusModalComponent
-                            onClicked: page.sourceComponent = statusModalComponent
-                        }
                     }
                 }
             }
@@ -178,10 +172,12 @@ StatusWindow {
             rightPanel: Item {
                 id: rightPanel
                 anchors.fill: parent
+
                 ScrollView {
-                    anchors.fill: parent
+                    width: parent.width
+                    height: parent.height
                     contentHeight: (pageWrapper.height + pageWrapper.anchors.topMargin) * rootWindow.factor
-                    contentWidth: (pageWrapper.width * rootWindow.factor)
+                    contentWidth: pageWrapper.width * rootWindow.factor
                     clip: true
 
                     Item {
@@ -266,11 +262,6 @@ StatusWindow {
         StatusChatInfoToolBarPage {}
     }
 
-    Component {
-        id: statusModalComponent
-        Popups {}
-    }
-
     Component {
         id: demoAppCmp
 

sandbox/qml.qrc

@@ -11,6 +11,5 @@
         <file>StatusPopupMenuPage.qml</file>
         <file>ThemeSwitch.qml</file>
         <file>Layout.qml</file>
-        <file>Popups.qml</file>
     </qresource>
 </RCC>

sandbox/sandbox.pro

@@ -53,8 +53,15 @@ HEADERS += \
     sandboxapp.h \
     statuswindow.h
 
-OTHER_FILES += $$files($$PWD/../*.qml, true)
-OTHER_FILES += $$files($$PWD/*.qml, true)
+DISTFILES += \
+    ../src/StatusQ/Components/StatusMacWindowButtons.qml \
+    ../src/StatusQ/Controls/StatusBaseButton.qml \
+    ../src/StatusQ/Controls/StatusButton.qml \
+    ../src/StatusQ/Controls/StatusCheckBox.qml \
+    ../src/StatusQ/Controls/StatusFlatRoundButton.qml \
+    ../src/StatusQ/Controls/StatusRadioButton.qml \
+    ../src/StatusQ/Controls/StatusSlider.qml \
+    ../src/StatusQ/Controls/StatusSwitch.qml
 
 android {
 

src/StatusQ/Components/StatusChatList.qml

@@ -1,104 +1,52 @@
 import QtQuick 2.13
+import QtQuick.Controls 2.14
 
 import StatusQ.Core 0.1
 import StatusQ.Core.Theme 0.1
 import StatusQ.Components 0.1
 import StatusQ.Controls 0.1
 
-Column {
+ScrollView {
     id: statusChatList
-
-    spacing: 4
-    width: 288
+    contentHeight: items.height + 8
+    clip: true
 
     property string categoryId: ""
     property string selectedChatId: ""
     property alias chatListItems: statusChatListItems
 
-    property Component popupMenu
-
     property var filterFn
-    property var profileImageFn
-    property var chatNameFn
 
     signal chatItemSelected(string id)
     signal chatItemUnmuted(string id)
 
-    onPopupMenuChanged: {
-        if (!!popupMenu) {
-            popupMenuSlot.sourceComponent = popupMenu
-        }
-    }
+    Column {
+        id: items
+        spacing: 4
+        Repeater {
+            id: statusChatListItems
+            delegate: StatusChatListItem {
+                chatId: model.chatId
+                name: model.name
+                type: model.chatType
+                muted: !!model.muted
+                hasUnreadMessages: !!model.hasUnreadMessages
+                hasMention: !!model.hasMention
+                badge.value: model.unreadMessagesCount || 0
+                selected: model.chatId === statusChatList.selectedChatId
 
-    Repeater {
-        id: statusChatListItems
-        delegate: StatusChatListItem {
+                icon.color: model.iconColor || ""
+                image.source: model.identicon || ""
 
-            id: statusChatListItem
-
-            property string profileImage: ""
-
-            Component.onCompleted: {
-                if (typeof statusChatList.profileImageFn === "function") {
-                    profileImage = statusChatList.profileImageFn(model.chatId || model.id) || ""
-                }
-            }
-
-            chatId: model.chatId || model.id
-            name: !!statusChatList.chatNameFn ? statusChatList.chatNameFn(model) : model.name
-            type: model.chatType
-            muted: !!model.muted
-            hasUnreadMessages: !!model.hasUnreadMessages || model.unviewedMessagesCount > 0
-            hasMention: model.mentionsCount > 0
-            badge.value: model.chatType === StatusChatListItem.Type.OneToOneChat ?
-                model.unviewedMessagesCount || 0 :
-                model.mentionsCount || 0
-            selected: (model.chatId || model.id) === statusChatList.selectedChatId
-
-            icon.color: model.color || ""
-            image.isIdenticon: !!!profileImage && !!!model.identityImage && !!model.identicon
-            image.source: profileImage || model.identityImage || model.identicon || ""
-
-            onClicked: {
-                if (mouse.button === Qt.RightButton && !!statusChatList.popupMenu) {
-                    statusChatListItem.highlighted = true
-
-                    let originalOpenHandler = popupMenuSlot.item.openHandler
-                    let originalCloseHandler = popupMenuSlot.item.closeHandler
-
-                    popupMenuSlot.item.openHandler = function () {
-                        if (!!originalOpenHandler) {
-                            originalOpenHandler((model.chatId || model.id))
-                        }
+                onClicked: statusChatList.chatItemSelected(model.chatId)
+                onUnmute: statusChatList.chatItemUnmuted(model.chatId)
+                visible: {
+                    if (!!statusChatList.filterFn) {
+                        return statusChatList.filterFn(model, statusChatList.categoryId)
                     }
-
-                    popupMenuSlot.item.closeHandler = function () {
-                        if (statusChatListItem) {
-                            statusChatListItem.highlighted = false
-                        }
-                        if (!!originalCloseHandler) {
-                            originalCloseHandler()
-                        }
-                    }
-
-                    popupMenuSlot.item.popup(mouse.x + 4, statusChatListItem.y + mouse.y + 6)
-                    popupMenuSlot.item.openHandler = originalOpenHandler
-                    return
+                    return true
                 }
-                statusChatList.chatItemSelected(model.chatId || model.id)
-            }
-            onUnmute: statusChatList.chatItemUnmuted(model.chatId || model.id)
-            visible: {
-                if (!!statusChatList.filterFn) {
-                    return statusChatList.filterFn(model, statusChatList.categoryId)
-                }
-                return true
             }
         }
     }
-
-    Loader {
-        id: popupMenuSlot
-        active: !!statusChatList.popupMenu
-    }
 }

src/StatusQ/Components/StatusChatListAndCategories.qml

@@ -4,11 +4,11 @@ import QtQuick.Controls 2.14
 import StatusQ.Components 0.1
 import StatusQ.Popups 0.1
 
-Item {
+ScrollView {
     id: statusChatListAndCategories
 
-    implicitHeight: chatListsAndCategories.height
-    implicitWidth: chatListsAndCategories.width
+    clip: true
+    contentHeight: chatListsAndCategories.height + 8
 
     property string selectedChatId: ""
     property bool showCategoryActionButtons: false
@@ -17,7 +17,6 @@ Item {
     property alias sensor: sensor
 
     property Component categoryPopupMenu
-    property Component chatListPopupMenu
     property Component popupMenu
 
     signal chatItemSelected(string id)
@@ -33,7 +32,7 @@ Item {
     MouseArea {
         id: sensor
         anchors.top: parent.top
-        width: statusChatListAndCategories.width
+        width: parent.width
         height: statusChatListAndCategories.height
         acceptedButtons: Qt.LeftButton | Qt.RightButton
         onClicked: {
@@ -53,14 +52,13 @@ Item {
             StatusChatList {
                 id: statusChatList
                 anchors.horizontalCenter: parent.horizontalCenter
-                visible: !!chatListItems.model && chatListItems.count > 0
+                visible: !!chatListItems.model && chatListItems.model.count > 0
                 selectedChatId: statusChatListAndCategories.selectedChatId
                 onChatItemSelected: statusChatListAndCategories.chatItemSelected(id)
                 onChatItemUnmuted: statusChatListAndCategories.chatItemUnmuted(id)
                 filterFn: function (model) {
                     return !!!model.categoryId
                 }
-                popupMenu: statusChatListAndCategories.chatListPopupMenu
             }
 
             Repeater {
@@ -76,10 +74,8 @@ Item {
                     chatList.chatListItems.model: statusChatListAndCategories.chatList.model
                     chatList.selectedChatId: statusChatListAndCategories.selectedChatId
                     chatList.onChatItemSelected: statusChatListAndCategories.chatItemSelected(id)
-                    chatList.onChatItemUnmuted: statusChatListAndCategories.chatItemUnmuted(id)
 
                     popupMenu: statusChatListAndCategories.categoryPopupMenu
-                    chatListPopupMenu: statusChatListAndCategories.chatListPopupMenu
                 }
             }
         }

src/StatusQ/Components/StatusChatListCategory.qml

@@ -18,7 +18,6 @@ Column {
     property alias toggleButton: statusChatListCategoryItem.toggleButton
     property alias chatList: statusChatList
 
-    property Component chatListPopupMenu
     property Component popupMenu
 
     onPopupMenuChanged: {
@@ -35,7 +34,7 @@ Column {
         showMenuButton: !!statusChatListCategory.popupMenu
 
         onClicked: {
-            if (mouse.button === Qt.RightButton && !!statusChatListCategory.popupMenu) {
+            if (mouse.button === Qt.RightButton) {
                 highlighted = true
                 popupMenuSlot.item.popup(mouse.x + 4, mouse.y + 6)
                 return
@@ -60,29 +59,20 @@ Column {
         filterFn: function (model) {
             return !!model.categoryId && model.categoryId == statusChatList.categoryId
         }
-
-        popupMenu: statusChatListCategory.chatListPopupMenu
     }
 
     Loader {
         id: popupMenuSlot
         active: !!statusChatListCategory.popupMenu
         onLoaded: {
-            let originalOpenHandler = popupMenuSlot.item.openHandler
-            let originalCloseHandler = popupMenuSlot.item.closeHandler
-
             popupMenuSlot.item.openHandler = function () {
-                if (!!originalOpenHandler) {
-                    originalOpenHandler(statusChatListCategory.categoryId)
+                if (popupMenuSlot.item.hasOwnProperty('categoryId')) {
+                    popupMenuSlot.item.categoryId = statusChatListCategory.categoryId
                 }
             }
-
             popupMenuSlot.item.closeHandler = function () {
                 statusChatListCategoryItem.highlighted = false
                 statusChatListCategoryItem.menuButton.highlighted = false
-                if (!!originalCloseHandler) {
-                    originalCloseHandler()
-                }
             }
         }
     }

src/StatusQ/Components/StatusChatListItem.qml

@@ -18,23 +18,19 @@ Rectangle {
         color: Theme.palette.miscColor5
     }
     property int type: StatusChatListItem.Type.PublicChat
-    property bool highlighted: false
     property bool selected: false
 
     signal clicked(var mouse)
     signal unmute()
 
     enum Type {
-        Unknown0, // 0
-        OneToOneChat, // 1
-        PublicChat, // 2
-        GroupChat, // 3
-        Unknown1, // 4
-        Unknown2, // 5
-        CommunityChat // 6
+        PublicChat,
+        GroupChat,
+        CommunityChat,
+        OneToOneChat
     }
 
-    implicitWidth: 288
+    implicitWidth: 287
     implicitHeight: 40
 
     radius: 8
@@ -43,7 +39,7 @@ Rectangle {
         if (selected) {
             return Theme.palette.statusChatListItem.selectedBackgroundColor
         }
-        return sensor.containsMouse || highlighted ? Theme.palette.statusChatListItem.hoverBackgroundColor : Theme.palette.baseColor4
+        return sensor.containsMouse ? Theme.palette.statusChatListItem.hoverBackgroundColor : Theme.palette.baseColor4
     }
 
     MouseArea {
@@ -51,7 +47,6 @@ Rectangle {
 
         anchors.fill: parent
         cursorShape: Qt.PointingHandCursor 
-        acceptedButtons: Qt.LeftButton | Qt.RightButton
         hoverEnabled: true
 
         onClicked: statusChatListItem.clicked(mouse)
@@ -88,11 +83,6 @@ Rectangle {
                     height: parent.height
                     image.source: statusChatListItem.image.source
                     showLoadingIndicator: true
-                    color: statusChatListItem.image.isIdenticon ?
-                        Theme.palette.statusRoundedImage.backgroundColor :
-                        "transparent"
-                    border.width: statusChatListItem.image.isIdenticon ? 1 : 0
-                    border.color: Theme.palette.directColor7
                 }
 
                 Loader {
@@ -111,13 +101,12 @@ Rectangle {
             width: 14
             visible: statusChatListItem.type !== StatusChatListItem.Type.OneToOneChat
             opacity: {
-                if (statusChatListItem.muted && !sensor.containsMouse && !statusChatListItem.highlighted) {
+                if (statusChatListItem.muted && !sensor.containsMouse) {
                     return 0.4
                 }
                 return statusChatListItem.hasMention || 
                   statusChatListItem.hasUnreadMessages || 
                   statusChatListItem.selected ||
-                  statusChatListItem.highlighted ||
                   statusBadge.visible ||
                   sensor.containsMouse ? 1.0 : 0.7
             }
@@ -143,24 +132,16 @@ Rectangle {
             id: chatName
             anchors.left: statusIcon.visible ? statusIcon.right : identicon.right
             anchors.leftMargin: statusIcon.visible ? 1 : 8
-            anchors.right: statusBadge.visible ? statusBadge.left :
-                mutedIcon.visible ? mutedIcon.left : parent.right
-            anchors.rightMargin: 6
             anchors.verticalCenter: parent.verticalCenter
 
-            text: statusChatListItem.type === StatusChatListItem.Type.PublicChat &&
-                !statusChatListItem.name.startsWith("#") ?
-                "#" + statusChatListItem.name :
-                statusChatListItem.name
-            elide: Text.ElideRight
+            text: statusChatListItem.name
             color: {
-                if (statusChatListItem.muted && !sensor.containsMouse && !statusChatListItem.highlighted) {
+                if (statusChatListItem.muted && !sensor.containsMouse) {
                     return Theme.palette.directColor5
                 }
                 return statusChatListItem.hasMention || 
                   statusChatListItem.hasUnreadMessages ||
                   statusChatListItem.selected ||
-                  statusChatListItem.highlighted ||
                   sensor.containsMouse ||
                   statusBadge.visible ? Theme.palette.directColor1 : Theme.palette.directColor4
             }

src/StatusQ/Components/StatusChatToolBar.qml

@@ -14,8 +14,6 @@ Rectangle {
     property alias chatInfoButton: statusChatInfoButton
     property alias menuButton: menuButton
     property alias notificationButton: notificationButton
-    property alias membersButton: membersButton
-    property alias searchButton: searchButton
     property int notificationCount: 0
 
     property Component popupMenu
@@ -23,8 +21,6 @@ Rectangle {
     signal chatInfoButtonClicked()
     signal menuButtonClicked()
     signal notificationButtonClicked()
-    signal membersButtonClicked()
-    signal searchButtonClicked()
 
     onPopupMenuChanged: {
         if (!!popupMenu) {
@@ -48,38 +44,6 @@ Rectangle {
 
         spacing: 8
 
-        StatusFlatRoundButton {
-            id: searchButton
-            width: 32
-            height: 32
-            icon.name: "search"
-            type: StatusFlatRoundButton.Type.Secondary
-            onClicked: statusChatToolBar.searchButtonClicked()
-
-            StatusToolTip {
-                visible: !!text && parent.hovered
-                text: "Search"
-                orientation: StatusToolTip.Orientation.Bottom
-                y: parent.height + 12
-            }
-        }
-
-        StatusFlatRoundButton {
-            id: membersButton
-            width: 32
-            height: 32
-            icon.name: "group-chat"
-            type: StatusFlatRoundButton.Type.Secondary
-            onClicked: statusChatToolBar.membersButtonClicked()
-
-            StatusToolTip {
-                visible: !!text && parent.hovered
-                text: "Members"
-                orientation: StatusToolTip.Orientation.Bottom
-                y: parent.height + 12
-            }
-        }
-
         StatusFlatRoundButton {
             id: menuButton
             width: 32
@@ -91,24 +55,8 @@ Rectangle {
             onClicked: {
                 statusChatToolBar.menuButtonClicked()
                 highlighted = true
-                popupMenuSlot.item.popup(-popupMenuSlot.item.width + menuButton.width, menuButton.height + 4)
-            }
-
-            StatusToolTip {
-                visible: !!text && parent.hovered && !popupMenuSlot.item.opened
-                text: "More"
-                orientation: StatusToolTip.Orientation.Bottom
-                y: parent.height + 12
-            }
-
-            Loader {
-                id: popupMenuSlot
-                active: !!statusChatToolBar.popupMenu
-                onLoaded: {
-                    popupMenuSlot.item.closeHandler = function () {
-                        menuButton.highlighted = false
-                    }
-                }
+                let p = menuButton.mapToItem(statusChatToolBar, menuButton.x, menuButton.y)
+                popupMenuSlot.item.popup(p.x + menuButton.width - popupMenuSlot.item.width, p.y + 4 + menuButton.height)
             }
         }
 
@@ -117,8 +65,7 @@ Rectangle {
             width: 1
             color: Theme.palette.directColor7
             anchors.verticalCenter: parent.verticalCenter
-            visible: notificationButton.visible &&
-                (menuButton.visible || membersButton.visible || searchButton.visible)
+            visible: menuButton.visible && notificationButton.visible
         }
 
         StatusFlatRoundButton {
@@ -153,15 +100,18 @@ Rectangle {
                 border.width: 2
                 border.color: parent.hovered ? Theme.palette.baseColor2 : Theme.palette.statusAppLayout.backgroundColor
             }
-
-            StatusToolTip {
-                visible: !!text && parent.hovered
-                text: "Activity"
-                orientation: StatusToolTip.Orientation.Bottom
-                y: parent.height + 12
-            }
         }
 
     }
+
+    Loader {
+        id: popupMenuSlot
+        active: !!statusChatToolBar.popupMenu
+        onLoaded: {
+            popupMenuSlot.item.closeHandler = function () {
+                menuButton.highlighted = false
+            }
+        }
+    }
 }
 

src/StatusQ/Components/StatusContactRequestsIndicatorListItem.qml

@@ -1,30 +0,0 @@
-import StatusQ.Core 0.1
-import StatusQ.Core.Theme 0.1
-import StatusQ.Components 0.1
-
-StatusListItem {
-    id: statusContactRequestsListItem
-
-    implicitHeight: 64
-    implicitWidth: 288
-
-    color: sensor.containsMouse ? Theme.palette.baseColor2 : "transparent"
-
-    property int requestsCount: 0
-
-    components: [
-        StatusBadge {
-            value: statusContactRequestsListItem.requestsCount
-            anchors.verticalCenter: parent.verticalCenter
-            border.width: 4
-            border.color: color
-        },
-        StatusIcon {
-            icon: "chevron-down"
-            rotation: 270
-            color: Theme.palette.baseColor1
-        }
-    ]
-}
-
-

src/StatusQ/Components/StatusListItem.qml

@@ -10,26 +10,7 @@ Rectangle {
     implicitWidth: 448
     implicitHeight: 64
 
-    enum Type {
-        Primary,
-        Secondary,
-        Danger
-    }
-
-    color: {
-        if (sensor.containsMouse) {
-            switch(type) {
-                case StatusListItem.Type.Primary:
-                    return Theme.palette.baseColor2
-                case StatusListItem.Type.Secondary:
-                    return Theme.palette.statusListItem.secondaryHoverBackgroundColor
-                case StatusListItem.Type.Danger:
-                    return Theme.palette.dangerColor3
-            }
-        }
-        return Theme.palette.statusListItem.backgroundColor
-    }
-
+    color: sensor.containsMouse ? Theme.palette.baseColor2 : Theme.palette.statusListItem.backgroundColor
     radius: 8
 
     property string title: ""
@@ -39,22 +20,10 @@ Rectangle {
     property StatusIconSettings icon: StatusIconSettings {
         height: 20
         width: 20
-        rotation: 0
-        isLetterIdenticon: false
-        color: type === StatusListItem.Type.Danger ? 
-            Theme.palette.dangerColor1 : Theme.palette.primaryColor1
         background: StatusIconBackgroundSettings {
             width: 40
             height: 40
-            color: {
-                if (sensor.containsMouse) {
-                    return type === StatusListItem.Type.Secondary ||
-                           type === StatusListItem.Type.Danger ? "transparent" :
-                           Theme.palette.primaryColor3     
-                }
-                return type === StatusListItem.Type.Danger ? 
-                    Theme.palette.dangerColor3 : Theme.palette.primaryColor3
-            }        
+            color: Theme.palette.primaryColor3
         }
     }
     property StatusImageSettings image: StatusImageSettings {
@@ -63,8 +32,6 @@ Rectangle {
     }
     property string label: ""
 
-    property int type: StatusListItem.Type.Primary
-
     property alias sensor: sensor
     property alias statusListItemTitle: statusListItemTitle
     property alias statusListItemSubTitle: statusListItemSubTitle
@@ -93,15 +60,8 @@ Rectangle {
             anchors.left: parent.left
             anchors.leftMargin: statusListItem.leftPadding
             anchors.verticalCenter: parent.verticalCenter
-            sourceComponent: {
-                if (statusListItem.icon.isLetterIdenticon) {
-                    return statusLetterIdenticon
-                }
-                return !!statusListItem.icon.name ? statusRoundedIcon : statusRoundedImage
-            }
-            active: statusListItem.icon.isLetterIdenticon || 
-                    !!statusListItem.icon.name || 
-                    !!statusListItem.image.source.toString()
+            sourceComponent: !!statusListItem.icon.name ? statusRoundedIcon : statusRoundedImage
+            active: !!statusListItem.icon.name || !!statusListItem.image.source.toString()
         }
 
         Component {
@@ -110,8 +70,6 @@ Rectangle {
                 icon.width: statusListItem.icon.width
                 icon.height: statusListItem.icon.height
                 icon.name: statusListItem.icon.name
-                icon.rotation: statusListItem.icon.rotation
-                icon.color: statusListItem.icon.color
                 color: statusListItem.icon.background.color
                 width: statusListItem.icon.background.width
                 height: statusListItem.icon.background.height
@@ -127,16 +85,6 @@ Rectangle {
             }
         }
 
-        Component {
-            id: statusLetterIdenticon
-            StatusLetterIdenticon {
-                width: statusListItem.icon.background.width
-                height: statusListItem.icon.background.height
-                color: statusListItem.icon.background.color
-                name: statusListItem.title
-            }
-        }
-
         Item {
             anchors.left: iconOrImage.active ? iconOrImage.right : parent.left
             anchors.leftMargin: statusListItem.leftPadding
@@ -147,16 +95,7 @@ Rectangle {
                 id: statusListItemTitle
                 text: statusListItem.title
                 font.pixelSize: 15
-                color: {
-                  switch (statusListItem.type) {
-                      case StatusListItem.Type.Primary:
-                          return Theme.palette.directColor1
-                      case StatusListItem.Type.Secondary:
-                          return Theme.palette.primaryColor1
-                      case StatusListItem.Type.Danger:
-                          return Theme.palette.dangerColor1
-                  }
-                }
+                color: Theme.palette.directColor1
             }
 
             StatusBaseText {

src/StatusQ/Components/StatusLoadingIndicator.qml

@@ -6,7 +6,7 @@ StatusIcon {
     icon: "loading"
     height: 17
     width: 17
-    RotationAnimation {
+    RotationAnimator {
         target: statusIcon;
         from: 0;
         to: 360;

src/StatusQ/Components/StatusRoundIcon.qml

@@ -8,8 +8,6 @@ Rectangle {
     property StatusIconSettings icon: StatusIconSettings {
         width: 24
         height: 24
-        rotation: 0
-        color: Theme.palette.primaryColor1
         background: StatusIconBackgroundSettings {
             width: 40
             height: 40
@@ -30,8 +28,7 @@ Rectangle {
         width: statusRoundedIcon.icon.width
         height: statusRoundedIcon.icon.height
 
-        color: statusRoundedIcon.icon.color
+        color: Theme.palette.primaryColor1
         icon: statusRoundedIcon.icon.name
-        rotation: statusRoundedIcon.icon.rotation
     }
 }

src/StatusQ/Components/StatusRoundedImage.qml

@@ -26,12 +26,9 @@ Rectangle {
 
     Image {
         id: image
-        width: statusRoundImage.width
-        height: statusRoundImage.height
-        sourceSize.width: parent.width * 2
-        sourceSize.height: parent.height * 2
+        sourceSize.width: parent.implicitWidth
+        sourceSize.height: parent.implicitHeight
         fillMode: Image.PreserveAspectFit
-        anchors.centerIn: parent
         cache: true
     }
 

src/StatusQ/Components/qmldir

@@ -8,7 +8,6 @@ StatusChatListCategory 0.1 StatusChatListCategory.qml
 StatusChatListCategoryItem 0.1 StatusChatListCategoryItem.qml
 StatusChatListAndCategories 0.1 StatusChatListAndCategories.qml
 StatusChatToolBar 0.1 StatusChatToolBar.qml
-StatusContactRequestsIndicatorListItem 0.1 StatusContactRequestsIndicatorListItem.qml
 StatusDescriptionListItem 0.1 StatusDescriptionListItem.qml
 StatusLetterIdenticon 0.1 StatusLetterIdenticon.qml
 StatusListItem 0.1 StatusListItem.qml

src/StatusQ/Controls/StatusBaseInput.qml

@@ -1,153 +0,0 @@
-import QtQuick 2.14
-
-import QtQuick.Controls 2.14 as QC
-
-import StatusQ.Controls 0.1
-import StatusQ.Core 0.1
-import StatusQ.Core.Theme 0.1
-
-
-Item {
-    id: statusBaseInput
-
-    property bool multiline: false
-
-    property bool clearable: false
-
-    property alias inputMethodHints: edit.inputMethodHints
-
-    property alias selectedText: edit.selectedText
-    property alias selectedTextColor: edit.selectedTextColor
-    property alias selectionStart: edit.selectionStart
-    property alias selectionEnd: edit.selectionEnd
-
-    property alias color: edit.color
-    property alias font: edit.font
-    property alias verticalAlignmet: edit.verticalAlignment
-    property alias horizontalAlignment: edit.horizontalAlignment
-
-    property alias placeholderText: placeholder.text
-    property alias placeholderTextColor: placeholder.color
-    property alias placeholderFont: placeholder.font
-
-    property real leftPadding: 16
-    property real rightPadding: 16
-    property real topPadding: 11
-    property real bottomPadding: 11
-
-    property real minimumHeight: 0
-    property real maximumHeight: 0
-
-    implicitWidth: 200
-    implicitHeight: multiline ? Math.max(edit.implicitHeight + topPadding + bottomPadding, 40) : 40
-
-    Rectangle {
-        width: parent.width
-        height: maximumHeight != 0 ? Math.min(
-                                        minimumHeight != 0 ? Math.max(statusBaseInput.implicitHeight, minimumHeight)
-                                                          : implicitHeight,
-                                         maximumHeight)
-                                  : parent.height
-        color: Theme.palette.baseColor2
-        radius: 8
-
-        clip: true
-
-        Flickable {
-            id: flick
-
-            anchors.fill: parent
-            anchors.leftMargin: statusBaseInput.leftPadding
-            anchors.rightMargin: statusBaseInput.rightPadding + clearable ? clearButtton.width : 0
-            anchors.topMargin: statusBaseInput.topPadding
-            anchors.bottomMargin: statusBaseInput.bottomPadding
-            contentWidth: edit.paintedWidth
-            contentHeight: edit.paintedHeight
-            clip: true
-
-            QC.ScrollBar.vertical: QC.ScrollBar { interactive: multiline }
-
-
-            function ensureVisible(r) {
-                if (contentX >= r.x)
-                    contentX = r.x;
-                else if (contentX+width <= r.x+r.width)
-                    contentX = r.x+r.width-width;
-                if (contentY >= r.y)
-                    contentY = r.y;
-                else if (contentY+height <= r.y+r.height)
-                    contentY = r.y+r.height-height;
-            }
-
-
-
-            TextEdit {
-                id: edit
-                width: flick.width
-                selectByMouse: true
-                anchors.verticalCenter: parent.verticalCenter
-                focus: true
-
-                font.pixelSize: 15
-                font.family: Theme.palette.baseFont.name
-                color: Theme.palette.directColor1
-
-                onCursorRectangleChanged: flick.ensureVisible(cursorRectangle)
-                wrapMode: TextEdit.NoWrap
-
-                Keys.onReturnPressed: {
-                    if (multiline) {
-                        event.accepted = false
-                    } else {
-                        event.accepted = true
-                    }
-                }
-
-                Keys.onEnterPressed: {
-                    if (multiline) {
-                        event.accepted = false
-                    } else {
-                        event.accepted = true
-                    }
-                }
-
-                StatusBaseText {
-                    id: placeholder
-                    visible: edit.text.length === 0
-                    anchors.left: parent.left
-                    anchors.right: parent.right
-                    font.pixelSize: 15
-
-                    elide: StatusBaseText.ElideRight
-                    font.family: Theme.palette.baseFont.name
-                    color: Theme.palette.baseColor1
-                }
-            }
-        } // Flickable
-
-        MouseArea {
-            anchors.fill: parent
-            cursorShape: Qt.IBeamCursor
-            enabled: !edit.activeFocus
-            onClicked: edit.forceActiveFocus()
-        }
-    } // Rectangle
-
-    StatusFlatRoundButton {
-        id: clearButtton
-        visible: edit.text.length != 0 && statusBaseInput.clearable && !statusBaseInput.multiline
-        anchors.right: parent.right
-        anchors.rightMargin: 11
-        anchors.verticalCenter: parent.verticalCenter
-        type: StatusFlatRoundButton.Type.Secondary
-        width: 14
-        height: 14
-        icon.name: "clear"
-        icon.width: 14
-        icon.height: 14
-        onClicked: {
-            edit.clear()
-        }
-    }
-
-}

src/StatusQ/Controls/StatusChatInfoButton.qml

@@ -22,30 +22,26 @@ Rectangle {
     property StatusIconSettings icon: StatusIconSettings {}
     property int type: StatusChatInfoButton.Type.PublicChat
     property alias tooltip: statusToolTip
-    property alias sensor: sensor
 
     signal clicked(var mouse)
     signal pinnedMessagesCountClicked(var mouse)
     signal unmute()
 
     enum Type {
-        Unknown0, // 0
-        OneToOneChat, // 1
-        PublicChat, // 2
-        GroupChat, // 3
-        Unknown1, // 4
-        Unknown2, // 5
-        CommunityChat // 6
+        PublicChat,
+        GroupChat,
+        CommunityChat,
+        OneToOneChat
     }
 
     radius: 8
-    color: sensor.enabled && sensor.containsMouse ? Theme.palette.baseColor2 : "transparent"
+    color: sensor.containsMouse ? Theme.palette.baseColor2 : "transparent"
 
     MouseArea {
         id: sensor
         anchors.fill: parent
         hoverEnabled: true
-        cursorShape: enabled ? Qt.PointingHandCursor : Qt.ArrowCursor
+        cursorShape: Qt.PointingHandCursor
 
         onClicked: statusChatInfoButton.clicked(mouse)
 
@@ -73,8 +69,6 @@ Rectangle {
                     height: parent.height
                     image.source: statusChatInfoButton.image.source
                     showLoadingIndicator: true
-                    border.width: statusChatInfoButton.image.isIdenticon ? 1 : 0
-                    border.color: Theme.palette.directColor7
                 }
                 Loader {
                     sourceComponent: statusLetterIdenticonComponent
@@ -99,7 +93,6 @@ Rectangle {
         Item {
             id: statusChatInfoButtonTitle
             anchors.top: identicon.top
-            anchors.topMargin: statusChatInfoButtonSubTitle.visible ? 0 : 8
             anchors.left: identicon.right
             anchors.leftMargin: 8
 
@@ -139,10 +132,7 @@ Rectangle {
                 anchors.leftMargin: statusIcon.visible ? 1 : 0
                 anchors.top: parent.top
 
-                text: statusChatInfoButton.type === StatusChatInfoButton.Type.PublicChat &&
-                    !statusChatInfoButton.title.startsWith("#") ?
-                    "#" + statusChatInfoButton.title :
-                    statusChatInfoButton.title
+                text: statusChatInfoButton.title
                 color: statusChatInfoButton.muted ? Theme.palette.directColor5 : Theme.palette.directColor1
                 font.pixelSize: 15
                 font.weight: Font.Medium
@@ -181,8 +171,7 @@ Rectangle {
             id: statusChatInfoButtonSubTitle
             anchors.left: statusChatInfoButtonTitle.left
             anchors.top: statusChatInfoButtonTitle.bottom
-            visible: !!statusChatInfoButton.subTitle
-            height: visible ? chatType.height : 0
+            height: chatType.height
             width: childrenRect.width
 
             StatusBaseText {

src/StatusQ/Controls/StatusPickerButton.qml

@@ -1,59 +0,0 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.12
-
-import StatusQ.Core 0.1
-import StatusQ.Core.Theme 0.1
-
-Button {
-    id: root
-    implicitWidth: 446
-    implicitHeight: 44
-
-    property color bgColor: Theme.palette.baseColor2
-    property color contentColor: Theme.palette.baseColor1
-    signal clicked()
-
-    background: Item {
-        anchors.fill: parent
-        Rectangle {
-            id: background
-            anchors.fill: parent
-            radius: 8
-            color: root.bgColor
-        }
-        StatusIcon {
-            id: nextIcon
-            anchors.right: parent.right
-            anchors.rightMargin: 8
-            anchors.verticalCenter: parent.verticalCenter
-            icon: "next"
-            color: !Qt.colorEqual(root.contentColor, Theme.palette.baseColor1)
-                   ? root.contentColor : Theme.palette.directColor1
-        }
-    }
-
-    contentItem: Item {
-        anchors.fill: parent
-        StatusBaseText {
-            id: textLabel
-            anchors {
-                fill: parent
-                leftMargin: 16
-            }
-            verticalAlignment: Text.AlignVCenter
-            font.pixelSize: 15
-            color: root.contentColor
-            text: root.text
-        }
-    }
-
-    MouseArea {
-        id: mouseArea
-        anchors.fill: parent
-        hoverEnabled: true
-        cursorShape: Qt.PointingHandCursor
-        onClicked: {
-            root.clicked();
-        }
-    }
-}

src/StatusQ/Controls/qmldir

@@ -14,5 +14,3 @@ StatusSwitch 0.1 StatusSwitch.qml
 StatusRadioButton 0.1 StatusRadioButton.qml
 StatusCheckBox 0.1 StatusCheckBox.qml
 StatusSlider 0.1 StatusSlider.qml
-StatusBaseInput 0.1 StatusBaseInput.qml
-StatusPickerButton 0.1 StatusPickerButton.qml

src/StatusQ/Core/StatusIcon.qml

@@ -12,20 +12,19 @@ Image {
     sourceSize.height: height
     fillMode: Image.PreserveAspectFit
 
-    antialiasing: true
-    mipmap: true
-
     onIconChanged: {
         if (icon !== "") {
             source = "../../assets/img/icons/" + icon + ".svg";
         }
     }
 
-    layer.mipmap: true
-    layer.smooth: true
-    layer.format: ShaderEffectSource.RGBA
-    layer.enabled:!Qt.colorEqual(statusIcon.color, "transparent")
-    layer.effect: ColorOverlay {
+    ColorOverlay {
+        visible: !Qt.colorEqual(statusIcon.color, "transparent")
+        anchors.fill: statusIcon
+        source: statusIcon
         color: statusIcon.color
+        antialiasing: true
+        smooth: true
     }
 }
+

src/StatusQ/Core/StatusIconSettings.qml

@@ -10,6 +10,5 @@ QtObject {
     property color color
     property url source
     property int rotation
-    property bool isLetterIdenticon
     property StatusIconBackgroundSettings background: StatusIconBackgroundSettings {}
 }

src/StatusQ/Core/StatusImageSettings.qml

@@ -6,6 +6,5 @@ QtObject {
     property url source
     property real width
     property real height
-    property bool isIdenticon: false
 }
 

src/StatusQ/Core/StatusModalHeaderSettings.qml

@@ -1,11 +0,0 @@
-import QtQuick 2.14
-
-QtObject {
-    property string title
-    property string subTitle
-
-    property StatusImageSettings image: StatusImageSettings {
-        width: 40
-        height: 40
-    }
-}

src/StatusQ/Core/Theme/StatusColors.qml

@@ -13,7 +13,6 @@ QtObject {
         'blue3': '#88B0FF',
         'blue4': '#869EFF',
         'blue5': '#AAC6FF',
-        'blue6': '#ECEFFC',
 
         'brown': '#8B3131',
         'brown2': '#9B832F',

src/StatusQ/Core/Theme/StatusDarkTheme.qml

@@ -132,7 +132,6 @@ ThemePalette {
 
     property QtObject statusListItem: QtObject {
         property color backgroundColor: baseColor3
-        property color secondaryHoverBackgroundColor: primaryColor3
     }
 
     property QtObject statusChatListItem: QtObject {
@@ -164,13 +163,5 @@ ThemePalette {
         property color hoverBackgroundColor: directColor7
         property color separatorColor: directColor7
     }
-
-    property QtObject statusModal: QtObject {
-        property color backgroundColor: baseColor3
-    }
-
-    property QtObject statusRoundedImage: QtObject {
-        property color backgroundColor: baseColor3
-    }
 }
 

src/StatusQ/Core/Theme/StatusLightTheme.qml

@@ -130,7 +130,6 @@ ThemePalette {
 
     property QtObject statusListItem: QtObject {
         property color backgroundColor: white
-        property color secondaryHoverBackgroundColor: getColor('blue6')
     }
 
     property QtObject statusChatListItem: QtObject {
@@ -162,13 +161,5 @@ ThemePalette {
         property color hoverBackgroundColor: baseColor2
         property color separatorColor: baseColor2
     }
-
-    property QtObject statusModal: QtObject {
-        property color backgroundColor: white
-    }
-
-    property QtObject statusRoundedImage: QtObject {
-        property color backgroundColor: white
-    }
 }
 

src/StatusQ/Core/Theme/ThemePalette.qml

@@ -28,7 +28,6 @@ QtObject {
     property color white: getColor('white')
 
     property color dropShadow: getColor('black', 0.12)
-    property color backdropColor: getColor('black', 0.4)
 
     property color baseColor1
     property color baseColor2
@@ -92,7 +91,6 @@ QtObject {
 
     property QtObject statusListItem: QtObject {
         property color backgroundColor
-        property color secondaryHoverBackgroundColor
     }
 
     property QtObject statusChatListItem: QtObject {
@@ -126,14 +124,6 @@ QtObject {
         property color separatorColor
     }
 
-    property QtObject statusModal: QtObject {
-        property color backgroundColor
-    }
-
-    property QtObject statusRoundedImage: QtObject {
-        property color backgroundColor
-    }
-
     function alphaColor(color, alpha) {
         let actualColor = Qt.darker(color, 1)
         actualColor.a = alpha

src/StatusQ/Core/qmldir

@@ -5,5 +5,4 @@ StatusIcon 0.1 StatusIcon.qml
 StatusIconSettings 0.1 StatusIconSettings.qml
 StatusIconBackgroundSettings 0.1 StatusIconBackgroundSettings.qml
 StatusImageSettings 0.1 StatusImageSettings.qml
-StatusModalHeaderSettings 0.1 StatusModalHeaderSettings.qml
 

src/StatusQ/Popups/StatusMenuSeparator.qml

@@ -4,7 +4,6 @@ import QtQuick.Controls 2.13
 import StatusQ.Core.Theme 0.1
 
 MenuSeparator {
-    height: visible && enabled ? implicitHeight : 0
     contentItem: Rectangle {
         implicitWidth: 176
         implicitHeight: 1

src/StatusQ/Popups/StatusModal.qml

@@ -1,71 +0,0 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14 as QC
-
-import StatusQ.Core 0.1
-import StatusQ.Core.Theme 0.1
-import StatusQ.Controls 0.1
-
-
-import "statusModal" as Spares
-
-QC.Popup {
-    id: statusModal
-
-    property Component content
-
-    property alias headerActionButton: headerImpl.actionButton
-
-    property StatusModalHeaderSettings header: StatusModalHeaderSettings {}
-    property alias contentComponent: contentLoader.item
-    property alias rightButtons: footerImpl.rightButtons
-    property alias leftButtons: footerImpl.leftButtons
-
-    signal editButtonClicked()
-
-    parent: QC.Overlay.overlay
-
-    width: 480
-    height: contentItem.implicitHeight
-
-    margins: 0
-    padding: 0
-
-    modal: true
-
-    QC.Overlay.modal: Rectangle {
-        color: Theme.palette.backdropColor
-    }
-
-
-    background: Rectangle {
-        color: Theme.palette.statusModal.backgroundColor
-        radius: 8
-    }
-
-    contentItem: Column {
-        width: parent.width
-        Spares.StatusModalHeader {
-            id: headerImpl
-            width: 480
-
-            title: header.title
-            subTitle: header.subTitle
-            image: header.image
-
-            onEditButtonClicked: statusModal.editButtonClicked()
-            onClose: statusModal.close()
-        }
-
-        Loader {
-            id: contentLoader
-            active: true
-            anchors.horizontalCenter: parent.horizontalCenter
-            sourceComponent: statusModal.content
-        }
-
-        Spares.StatusModalFooter {
-            id: footerImpl
-            width: 480
-        }
-    }
-}

src/StatusQ/Popups/StatusModalDivider.qml

@@ -1,31 +0,0 @@
-import QtQuick 2.14
-
-import StatusQ.Core.Theme 0.1
-
-Column {
-    spacing: 0
-
-    property real topPadding: 0
-    property real bottomPadding: 0
-
-    width: 480
-
-    Item {
-        id: topPaddingItem
-        height: parent.topPadding
-        width: parent.width
-    }
-
-    Rectangle {
-        id: divider
-        color: Theme.palette.baseColor2
-        height: 1
-        width: parent.width
-    }
-
-    Item {
-        id: bottomPaddingItem
-        height: parent.bottomPadding
-        width: parent.width
-    }
-}

src/StatusQ/Popups/qmldir

@@ -3,5 +3,3 @@ module StatusQ.Popups
 StatusMenuSeparator 0.1 StatusMenuSeparator.qml
 StatusPopupMenu 0.1 StatusPopupMenu.qml
 StatusMenuItem 0.1 StatusMenuItem.qml
-StatusModal 0.1 StatusModal.qml
-StatusModalDivider 0.1 StatusModalDivider.qml

src/StatusQ/Popups/statusModal/StatusImageWithTitle.qml

@@ -1,69 +0,0 @@
-import QtQuick 2.14
-import StatusQ.Core 0.1
-import StatusQ.Core.Theme 0.1
-import StatusQ.Components 0.1
-import StatusQ.Controls 0.1
-
-Row {
-    id: statusImageWithTitle
-
-    property alias title: headerTitle.text
-    property alias subTitle: headerSubTitle.text
-    property bool editable: false
-
-    signal editButtonClicked
-
-    property StatusImageSettings image: StatusImageSettings {
-        width: 40
-        height: 40
-    }
-
-    spacing: 8
-
-    StatusRoundedImage {
-        id: headerImage
-        anchors.verticalCenter: parent.verticalCenter
-        width: statusImageWithTitle.image.width
-        height: statusImageWithTitle.image.height
-        image.source:  statusImageWithTitle.image.source
-        showLoadingIndicator: true
-        visible: !!statusImageWithTitle.image.source.toString()
-    }
-
-    Column {
-        id: textLayout
-
-        Row {
-            spacing: 4
-            StatusBaseText {
-                id: headerTitle
-                font.family: Theme.palette.baseFont.name
-                font.pixelSize: 17
-                font.bold: true
-                color: Theme.palette.directColor1
-            }
-            StatusFlatRoundButton {
-                id: editButton
-                visible: statusImageWithTitle.editable
-                anchors.bottom: headerTitle.bottom
-                anchors.bottomMargin: -1
-                height: 24
-                width: 24
-                type: StatusFlatRoundButton.Type.Secondary
-                icon.name: "pencil"
-                icon.color: Theme.palette.directColor1
-                icon.width: 12.5
-                icon.height: 12.5
-
-                onClicked: statusImageWithTitle.editButtonClicked()
-            }
-        }
-
-        StatusBaseText {
-            id: headerSubTitle
-            font.family: Theme.palette.baseFont.name
-            font.pixelSize: 15
-            color:Theme.palette.baseColor1
-        }
-    }
-}

src/StatusQ/Popups/statusModal/StatusModalFooter.qml

@@ -1,69 +0,0 @@
-import QtQuick 2.14
-import QtQuick.Layouts 1.14
-
-import StatusQ.Core 0.1
-import StatusQ.Core.Theme 0.1
-import StatusQ.Components 0.1
-import StatusQ.Controls 0.1
-
-
-Rectangle {
-    id: statusModalFooter
-
-    property list<Item> leftButtons
-    property list<StatusBaseButton> rightButtons
-
-    radius: 8
-
-    color: Theme.palette.statusModal.backgroundColor
-
-    onLeftButtonsChanged: {
-        for (let idx in leftButtons) {
-            leftButtons[idx].parent = leftButtonsLayout
-        }
-    }
-
-    onRightButtonsChanged: {
-        for (let idx in rightButtons) {
-            rightButtons[idx].parent = rightButtonsLayout
-        }
-    }
-
-    implicitHeight: rootLayout.implicitHeight + 30
-
-    RowLayout {
-        id: rootLayout
-        anchors.verticalCenter: parent.verticalCenter
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.leftMargin: 16
-        anchors.rightMargin: 18
-
-        Row {
-            id: leftButtonsLayout
-            Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
-
-            spacing: 16
-        }
-
-        Item {
-            Layout.fillWidth: true
-            implicitHeight: 1
-        }
-
-        Row {
-            id: rightButtonsLayout
-            Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
-
-            spacing: 16
-
-        }
-    }
-
-    Rectangle {
-        anchors.top: parent.top
-        width: parent.width
-        height: parent.radius
-        color: parent.color
-    }
-}

src/StatusQ/Popups/statusModal/StatusModalHeader.qml

@@ -1,70 +0,0 @@
-import QtQuick 2.14
-import QtQuick.Layouts 1.14
-import StatusQ.Core 0.1
-import StatusQ.Core.Theme 0.1
-import StatusQ.Components 0.1
-import StatusQ.Controls 0.1
-
-Rectangle {
-    id: statusModalHeader
-
-    property alias title: imageWithTitle.title
-    property alias subTitle: imageWithTitle.subTitle
-    property alias actionButton: actionButtonLoader.sourceComponent
-
-    property alias image: imageWithTitle.image
-    property bool editable: false
-
-    signal editButtonClicked
-    signal close
-
-    implicitHeight: Math.max(closeButton.height, imageWithTitle.implicitHeight) + 32
-    implicitWidth: 480
-
-    radius: 16
-
-    color: Theme.palette.statusModal.backgroundColor
-
-
-    StatusImageWithTitle {
-        id: imageWithTitle
-        anchors.verticalCenter: parent.verticalCenter
-        anchors.left: parent.left
-        anchors.leftMargin: 16
-
-        editable: statusModalHeader.editable
-        onEditButtonClicked: statusModalHeader.editButtonClicked()
-    }
-
-    Loader {
-        id: actionButtonLoader
-        anchors.right: closeButton.left
-        anchors.rightMargin: 8
-        anchors.top: parent.top
-        anchors.topMargin: 16
-    }
-
-    StatusFlatRoundButton {
-        id: closeButton
-        anchors.right: parent.right
-        anchors.rightMargin: 20
-        anchors.top: parent.top
-        anchors.topMargin: 16
-        width: 32
-        height: 32
-        type: StatusFlatRoundButton.Type.Secondary
-        icon.name: "close"
-        icon.color: Theme.palette.directColor1
-        icon.width: 20
-        icon.height: 20
-
-        onClicked: statusModalHeader.close()
-    }
-
-    Rectangle {
-        anchors.bottom: parent.bottom
-        width: parent.width
-        height: parent.radius
-        color: parent.color
-    }
-}

src/assets/img/icons/pencil.svg

@@ -1,4 +0,0 @@
-<svg width="13" height="13" viewBox="0 0 13 13" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M0.100954 12.5959L0.798362 9.80623C0.830588 9.67733 0.871226 9.55116 0.919852 9.42847C0.981714 9.27239 1.18145 9.24231 1.30017 9.36102L3.63897 11.6998C3.75769 11.8185 3.7276 12.0183 3.57152 12.0801C3.44883 12.1288 3.32266 12.1694 3.19376 12.2016L0.404123 12.899C0.221028 12.9448 0.0551798 12.779 0.100954 12.5959Z" fill="black"/>
-<path d="M4.32312 10.2627C4.71364 10.6532 5.34681 10.6532 5.73733 10.2627L12.2928 3.7072C12.6833 3.31668 12.6833 2.68351 12.2928 2.29299L10.707 0.7072C10.3165 0.316676 9.68332 0.316675 9.29279 0.707199L2.73733 7.26266C2.34681 7.65318 2.34681 8.28635 2.73733 8.67687L4.32312 10.2627Z" fill="black"/>
-</svg>

statusq.qrc

@@ -16,12 +16,10 @@
         <file>src/StatusQ/Popups/StatusPopupMenu.qml</file>
         <file>src/StatusQ/Popups/StatusMenuSeparator.qml</file>
         <file>src/StatusQ/Popups/StatusMenuItem.qml</file>
-        <file>src/StatusQ/Popups/StatusModalDivider.qml</file>
         <file>src/StatusQ/Components/qmldir</file>
         <file>src/StatusQ/Components/StatusChatListItem.qml</file>
         <file>src/StatusQ/Components/StatusChatListAndCategories.qml</file>
         <file>src/StatusQ/Components/StatusChatInfoToolBar.qml</file>
-        <file>src/StatusQ/Components/StatusContactRequestsIndicatorListItem.qml</file>
         <file>src/StatusQ/Components/StatusNavigationListItem.qml</file>
         <file>src/StatusQ/Components/StatusNavigationPanelHeadline.qml</file>
         <file>src/StatusQ/Components/StatusChatToolBar.qml</file>
@@ -241,13 +239,7 @@
         <file>src/assets/img/icons/activity.svg</file>
         <file>src/StatusQ/Components/StatusChatListCategoryItem.qml</file>
         <file>src/StatusQ/Components/StatusChatListCategory.qml</file>
-        <file>src/StatusQ/Controls/StatusBaseInput.qml</file>
         <file>src/StatusQ/Controls/StatusChatListCategoryItemButton.qml</file>
         <file>src/StatusQ/Components/StatusChatList.qml</file>
-        <file>src/StatusQ/Popups/statusModal/StatusImageWithTitle.qml</file>
-        <file>src/StatusQ/Popups/statusModal/StatusModalFooter.qml</file>
-        <file>src/StatusQ/Popups/statusModal/StatusModalHeader.qml</file>
-        <file>src/StatusQ/Popups/StatusModal.qml</file>
-        <file>src/StatusQ/Core/StatusModalHeaderSettings.qml</file>
     </qresource>
 </RCC>