fix(StatusSelect): Expose a property to make arrow in the select item visible/invisible

This component also has dependecy on BE and hence should be moved out.

BREAKING CHANGE:

sandbox/DemoApp.qml

@@ -174,7 +174,9 @@ Rectangle {
 
                     StatusMenuItem {
                         text: qsTr("Leave Community")
-                        icon.name: "arrow-left"
+                        icon.name: "arrow-right"
+                        icon.width: 14
+                        iconRotation: 180
                         type: StatusMenuItem.Type.Danger
                     }
                 }

sandbox/controls/Buttons.qml

@@ -17,24 +17,6 @@ Column {
 
         horizontalItemAlignment: Grid.AlignHCenter
 
-        // Primary
-        StatusButton {
-            text: "Button"
-            type: StatusBaseButton.Type.Primary
-        }
-
-        StatusButton {
-            text: "Button"
-            enabled: false
-            type: StatusBaseButton.Type.Primary
-        }
-
-        StatusButton {
-            text: "Button"
-            loading: true
-            type: StatusBaseButton.Type.Primary
-        }
-
         // Large
         StatusButton {
             text: "Button"

sandbox/controls/Layout.qml

@@ -223,7 +223,9 @@ Column {
 
                     StatusMenuItem {
                         text: qsTr("Leave Community")
-                        icon.name: "arrow-left"
+                        icon.name: "arrow-right"
+                        icon.width: 14
+                        iconRotation: 180
                         type: StatusMenuItem.Type.Danger
                     }
                 }
@@ -306,7 +308,9 @@ Column {
 
                     StatusMenuItem {
                         text: qsTr("Leave Community")
-                        icon.name: "arrow-left"
+                        icon.name: "arrow-right"
+                        icon.width: 14
+                        iconRotation: 180
                         type: StatusMenuItem.Type.Danger
                     }
                 }
@@ -394,7 +398,9 @@ Column {
 
                     StatusMenuItem {
                         text: qsTr("Leave Community")
-                        icon.name: "arrow-left"
+                        icon.name: "arrow-right"
+                        icon.width: 14
+                        iconRotation: 180
                         type: StatusMenuItem.Type.Danger
                     }
                 }
@@ -487,7 +493,9 @@ Column {
 
                     StatusMenuItem {
                         text: qsTr("Leave Community")
-                        icon.name: "arrow-left"
+                        icon.name: "arrow-right"
+                        icon.width: 14
+                        iconRotation: 180
                         type: StatusMenuItem.Type.Danger
                     }
                 }

sandbox/controls/Others.qml

@@ -57,8 +57,5 @@ ColumnLayout {
             }
         }
     }
-
-    StatusDatePicker {
-        label: "Select date"
-    }
 }
+

sandbox/controls/Popups.qml

@@ -119,7 +119,10 @@ Column {
         header.subTitle: "Subtitle"
         header.image.source: "qrc:/demoapp/data/profile-image-1.jpeg"
         leftButtons: [
-            StatusBackButton { }
+            StatusRoundButton {
+                icon.name: "arrow-right"
+                rotation: 180
+            }
         ]
         rightButtons: [
             StatusButton {
@@ -149,7 +152,10 @@ Column {
         }
 
         leftButtons: [
-            StatusBackButton { }
+            StatusRoundButton {
+                icon.name: "arrow-right"
+                rotation: 180
+            }
         ]
         rightButtons: [
             StatusButton {
@@ -177,7 +183,10 @@ Column {
         ]
 
         leftButtons: [
-            StatusBackButton { }
+            StatusRoundButton {
+                icon.name: "arrow-right"
+                rotation: 180
+            }
         ]
 
         contentItem: StatusBaseText {

sandbox/demoapp/DemoCommunityDetailModal.qml

@@ -103,7 +103,8 @@ StatusModal {
             anchors.horizontalCenter: parent.horizontalCenter
             statusListItemTitle.font.pixelSize: 17
             title: "Leave community"
-            icon.name: "arrow-left"
+            icon.name: "arrow-right"
+            icon.rotation: 180
             type: StatusListItem.Type.Secondary
         }
     }

sandbox/demoapp/StatusAppChatView.qml

@@ -199,7 +199,9 @@ StatusAppThreePanelLayout {
 
                 StatusMenuItem {
                     text: "Leave Chat"
-                    icon.name: "arrow-left"
+                    icon.name: "arrow-right"
+                    icon.width: 14
+                    iconRotation: 180
                     type: StatusMenuItem.Type.Danger
                 }
             }

sandbox/handler.cpp

@@ -0,0 +1,6 @@
+#include "handler.h"
+
+Handler::Handler(QObject *parent) : QObject(parent)
+{
+
+}

sandbox/handler.h

@@ -0,0 +1,16 @@
+#ifndef HANDLER_H
+#define HANDLER_H
+
+#include <QObject>
+
+class Handler : public QObject
+{
+    Q_OBJECT
+public:
+    explicit Handler(QObject *parent = nullptr);
+
+signals:
+    void restartQml();
+};
+
+#endif // HANDLER_H

sandbox/main.qml

@@ -197,21 +197,11 @@ StatusWindow {
                         selected: viewLoader.source.toString().includes(title)
                         onClicked: mainPageView.page(title);
                     }
-                    StatusNavigationListItem {
-                        title: "StatusTextArea"
-                        selected: viewLoader.source.toString().includes(title)
-                        onClicked: mainPageView.page(title);
-                    }
                     StatusNavigationListItem {
                         title: "StatusSelect"
                         selected: viewLoader.source.toString().includes(title)
                         onClicked: mainPageView.page(title);
                     }
-                    StatusNavigationListItem {
-                        title: "StatusComboBox"
-                        selected: viewLoader.source.toString().includes(title)
-                        onClicked: mainPageView.page(title);
-                    }
                     StatusNavigationListItem {
                         title: "StatusAccountSelector"
                         selected: viewLoader.source.toString().includes(title)

sandbox/pages/StatusAccountSelectorPage.qml

@@ -8,61 +8,57 @@ import StatusQ.Core.Theme 0.1
 import StatusQ.Controls 0.1
 import StatusQ.Popups 0.1
 
+
 Column {
     spacing: 8
 
     StatusAccountSelector {
-        id: selector1
-        width: 300
-        accounts: accountsModel
-    }
-
-    ListModel {
-        id: accountsModel
-
-        ListElement {
-            name: "Pascal"
-            address: "0x1234567891011"
-            path: ""
-            color: "red"
-            publicKey: ""
-            walletType: "generated"
-            isChat: ""
-            currencyBalance:  "1199.02"
-            assets: []
-        }
-        ListElement {
-            name: "Boris"
-            address: "0x123"
-            path: ""
-            color: "red"
-            publicKey: ""
-            walletType: "generated"
-            isChat: ""
-            currencyBalance:  "42.42"
-            assets: []
-        }
-        ListElement {
-            name: "Alexandra"
-            address: "0x123"
-            path: ""
-            color: "yellow"
-            publicKey: ""
-            walletType: "generated"
-            isChat: ""
-            currencyBalance:  "0"
-            assets: []
-        }
-        ListElement {
-            name: "Khushboo"
-            address: "0x123"
-            path: ""
-            color: "blue"
-            publicKey: ""
-            walletType: "watch" // Will be automatically filtered by StatusAccountSelector
-            isChat: ""
-            currencyBalance:  "0"
-            assets: []
+        id: accountSelector
+        accounts: ListModel {
+            ListElement {
+                name: "Pascal"
+                address: "0x1234567891011"
+                path: ""
+                color: "red"
+                publicKey: ""
+                walletType: "generated"
+                isChat: ""
+                currencyBalance:  "1199.02"
+                assets: []
+            }
+            ListElement {
+                name: "Boris"
+                address: "0x123"
+                path: ""
+                color: "red"
+                publicKey: ""
+                walletType: "generated"
+                isChat: ""
+                currencyBalance:  "0"
+                assets: []
+            }
+            ListElement {
+                name: "Alexandra"
+                address: "0x123"
+                path: ""
+                color: "yellow"
+                publicKey: ""
+                walletType: "generated"
+                isChat: ""
+                currencyBalance:  "0"
+                assets: []
+            }
+            ListElement {
+                name: "Khushboo"
+                address: "0x123"
+                path: ""
+                color: "blue"
+                publicKey: ""
+                walletType: "generated"
+                isChat: ""
+                currencyBalance:  "0"
+                assets: []
+            }
         }
     }
 }

sandbox/pages/StatusAddressPage.qml

@@ -2,97 +2,24 @@ import QtQuick 2.14
 import QtQuick.Controls 2.14
 import QtQuick.Layouts 1.14
 
-import StatusQ.Core 0.1
 import StatusQ.Components 0.1
 
 import Sandbox 0.1
 
-Item {
-    id: root
+Column {
+    spacing: 8
 
-    implicitWidth: mainLayout.implicitWidth
-    implicitHeight: mainLayout.implicitHeight
+    StatusAddress {
+        text: "0x9ce0056c5fc6bb9459a4dcfa35eaad8c1fee5ce9"
+    }
 
-    GridLayout {
-        id: mainLayout
-
-        columns: 2
-
-        anchors.fill: parent
-
-        columnSpacing: 15
-        rowSpacing: 8
-
-        StatusBaseText { text: "StatusAddress\nsimple" }
+    Item {
+        width: 200
+        height: childrenRect.height
         StatusAddress {
             text: "0x9ce0056c5fc6bb9459a4dcfa35eaad8c1fee5ce9"
-        }
-
-        StatusBaseText { text: "StatusAddress\nclick-expandable" }
-        StatusAddress {
-            text: "0x9ce0056c5fc6bb9459a4dcfa35eaad8c1fee5ce9"
-
-            Layout.preferredWidth: 200
-
             expandable: true
-        }
-
-        StatusBaseText { text: `StatusAddressPanel\nfont.pixelSize: 13, copyable, no frame`}
-        StatusAddressPanel {
-            address: "0xDC2c4826f6C56F61C1b9cC6Bb531d0Fe45402fC9"
-
-            font.pixelSize: 13
-            font.weight: Font.Normal
-
-            showFrame: false
-
-            onDoCopy: copyAction.text = address
-        }
-
-        StatusBaseText { text: `StatusAddressPanel\ncompact; width ${simpleAddressPanel.width}px ${simpleAddressPanel.height}px`}
-        StatusAddressPanel {
-            id: simpleAddressPanel
-            address: "0xd8593DEACe2f44dF35dd23fD2BAFC2daeC2ae033"
-            showCopy: false
-            expanded: false
-            onDoCopy: copyAction.text = address
-            expandable: true
-        }
-
-        StatusBaseText { text: "StatusAddressPanel\ncopy-icon, non-expandable" }
-        StatusAddressPanel {
-            address: "0xDd5A0755e99D66a583253372B569231968A6CF7b"
-            onDoCopy: copyAction.text = address
-        }
-
-        StatusBaseText { text: "StatusAddressPanel\ncopy hiden" }
-        StatusAddressPanel {
-            address: "0xd2D44C2A1E78975506e474Ecdc7E4F272D7e9A6c"
-            autHideCopyIcon: true
-            onDoCopy: copyAction.text = address
-            expandable: true
-        }
-        StatusBaseText { text: "StatusAddressPanel\ncopy hiden, non-expandable" }
-        StatusAddressPanel {
-            address: "0xd2a44BA31E78975506e474Ecdc7E4F272D7F3BC5"
-            autHideCopyIcon: true
-            expanded: false
-            onDoCopy: copyAction.text = address
-        }
-
-        Rectangle {
-            color: "lightblue"
-
-            Layout.fillWidth: true
-            Layout.columnSpan: mainLayout.columns
-            Layout.preferredHeight: 2
-        }
-
-        StatusBaseText {
-            text: qsTr("Copy Action: ")
-        }
-        StatusBaseText {
-            id: copyAction
+            width: parent.width
         }
     }
 }

sandbox/pages/StatusCardPage.qml

@@ -19,24 +19,9 @@ Item {
         spacing: 20
 
         RowLayout {
-            Layout.fillWidth: true
-
-            StatusCard {
-                id: card
-                Layout.alignment: Qt.AlignVCenter
-                primaryText: "Mainnet"
-                secondaryText: state === "unavailable" ? "No Gas" : "75"
-                tertiaryText: state === "unpreferred"  ? "UNPREFERRED" : "BALANCE: " + 250
-                cardIconName: "status"
-                advancedInputText: "75"
-                disabledText: "Disabled"
-            }
-
-            StatusComboBox {
-                Layout.alignment: Qt.AlignVCenter
-                Layout.maximumWidth: 200
-                label: "Card State"
-                onCurrentValueChanged: card.state = currentValue
+            StatusSelect {
+                id: select
+                label: "Select Card State"
                 model: ListModel {
                     ListElement {
                         name: "default"
@@ -51,18 +36,47 @@ Item {
                         name: "unpreferred"
                     }
                 }
+                selectMenu.delegate: StatusMenuItemDelegate {
+                    statusPopupMenu: select
+                    action: StatusMenuItem {
+                        text: name
+                        onTriggered: {
+                            selectedItem.text = name
+                            card.state = name
+                        }
+                    }
+                }
+                selectedItemComponent: Item {
+                    id: selectedItem
+                    anchors.fill: parent
+                    property string text: "default"
+
+                    StatusBaseText {
+                        text: selectedItem.text
+                        anchors.centerIn: parent
+                        color: Theme.palette.directColor1
+                    }
+                }
             }
 
             StatusCheckBox {
-                Layout.alignment: Qt.AlignVCenter
                 text: "advancedMode"
-                font.family: Theme.palette.monoFont.name
                 onClicked: {
                     card.advancedMode = checked
                 }
             }
         }
 
+        StatusCard {
+            id: card
+            primaryText: "Mainnet"
+            secondaryText: state === "unavailable" ? "No Gas" : "75"
+            tertiaryText: state === "unpreferred"  ? "UNPREFERRED" : "BALANCE: " + 250
+            cardIconName: "status"
+            advancedInputText: "75"
+            disabledText: "Disabled"
+        }
+
         Rectangle {
             height: 1
             width: 700

sandbox/pages/StatusColorSelectorPage.qml

@@ -8,7 +8,7 @@ import StatusQ.Controls 0.1
 
 import Sandbox 0.1
 
-Row {
+Column {
     spacing: 8
 
     StatusColorSelector {

sandbox/pages/StatusComboBoxPage.qml

@@ -1,72 +0,0 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Layouts 1.14
-
-import StatusQ.Core 0.1
-import StatusQ.Core.Theme 0.1
-import StatusQ.Controls 0.1
-import StatusQ.Popups 0.1
-
-import Sandbox 0.1
-
-Column {
-    spacing: 20
-
-    ListModel {
-        id: commmonModel
-        ListElement {
-            name: "Pascal"
-        }
-        ListElement {
-            name: "Khushboo"
-        }
-        ListElement {
-            name: "Alexandra"
-        }
-        ListElement {
-            name: "Eric"
-        }
-    }
-
-    StatusComboBox {
-        id: combobox
-        label: "ComboBox"
-        model: commmonModel
-    }
-
-    StatusComboBox {
-        id: comboBox1
-        label: "ComboBox with custom delegate"
-        model: commmonModel
-        delegate: StatusItemDelegate {
-            width: comboBox1.control.width
-            highlighted: comboBox1.control.highlightedIndex === index
-            text: modelData
-            font: comboBox1.control.font
-            icon {
-                name: "filled-account"
-                color: Theme.palette.primaryColor1
-            }
-            enabled: index != 2
-        }
-    }
-
-    StatusComboBox {
-        model: commmonModel
-        label: "Disabled ComboBox"
-        enabled: false
-    }
-
-    StatusComboBox {
-        model: commmonModel
-        label: "ComboBox with validation error"
-        validationError: "Validation failed example"
-    }
-
-    StatusComboBox {
-        model: commmonModel
-        label: "Mirrored ComboBox"
-        LayoutMirroring.enabled: true
-    }
-}
-

sandbox/pages/StatusImageCropPanelPage.qml

@@ -1,20 +1,11 @@
 import QtQuick 2.14
-import QtQuick.Controls 2.14
 import QtQuick.Layouts 1.14
-import QtQuick.Dialogs 1.3
-import QtQml 2.14
 
 import StatusQ.Controls 0.1
 import StatusQ.Components 0.1
 
 import QtGraphicalEffects 1.14
 
-import StatusQ.Components 0.1
-import StatusQ.Controls 0.1
-import StatusQ.Core 0.1
-import StatusQ.Core.Theme 0.1
-import StatusQ.Popups 0.1
-
 Item {
     id: root
 
@@ -24,12 +15,6 @@ Item {
     property var testControls: [ctrl1, ctrl2, ctrl3]
 
     property bool globalStylePreferRound: true
-    property var testImageList: ["qrc:/demoapp/data/logo-test-image.png",
-                                 "qrc:/demoapp/data/profile-image-2.jpeg",
-                                 "qrc:/demoapp/data/profile-image-1.jpeg"]
-    property int testImageIndex: 0
-    property int testSpacing: 0
-    property int testFrameMargins: 10
 
     ColumnLayout {
         id: mainLayout
@@ -37,12 +22,7 @@ Item {
         anchors.fill: parent
 
         RowLayout {
-            spacing: root.testSpacing
-
             ColumnLayout {
-                spacing: root.testSpacing
-                Layout.margins: root.testSpacing
-
                 Text {
                     text: `AR: ${ctrl1.aspectRatio.toFixed(2)}`
                 }
@@ -52,9 +32,8 @@ Item {
                     Layout.fillWidth: true
                     Layout.fillHeight: true
 
-                    source: root.testImageList[root.testImageIndex]
+                    source: "qrc:/demoapp/data/logo-test-image.png"
                     windowStyle: globalStylePreferRound ? StatusImageCrop.WindowStyle.Rounded : StatusImageCrop.WindowStyle.Rectangular
-                    margins: root.testFrameMargins
                 }
                 Text {
                     text: `AR: ${ctrl2.aspectRatio.toFixed(2)}`
@@ -64,15 +43,13 @@ Item {
                     Layout.fillWidth: true
                     Layout.fillHeight: true
 
-                    source: root.testImageList[root.testImageIndex]
+                    source: "qrc:/demoapp/data/logo-test-image.png"
                     windowStyle: globalStylePreferRound ? StatusImageCrop.WindowStyle.Rectangular : StatusImageCrop.WindowStyle.Rounded
                     aspectRatio: 16/9
                     enableCheckers: true
-                    margins: root.testFrameMargins + 2
                 }
             }
             ColumnLayout {
-                Layout.margins: root.testSpacing
                 Text {
                     text: `AR: ${ctrl3.aspectRatio.toFixed(2)}`
                 }
@@ -82,178 +59,36 @@ Item {
                     Layout.fillWidth: true
                     Layout.fillHeight: true
 
-                    source: root.testImageList[root.testImageIndex]
+                    source: "qrc:/demoapp/data/logo-test-image.png"
                     windowStyle: globalStylePreferRound ? StatusImageCrop.WindowStyle.Rounded : StatusImageCrop.WindowStyle.Rectangular
                     aspectRatio: 0.8
-
-                    margins: root.testFrameMargins + 5.3
                 }
             }
         }
-        RowLayout {
-            StatusButton {
-                text: qsTr("Cycle image")
-                onClicked: {
-                    let newIndex = root.testImageIndex
-                    newIndex++
-                    if(newIndex >= root.testImageList.length)
-                        newIndex = 0
-                    root.testImageIndex = newIndex
-                }
-            }
-            StatusButton {
-                text: qsTr("Cycle spacing")
-                onClicked: {
-                    root.testSpacing += (root.testSpacing/2) + 1
-                    if(root.testSpacing > 35)
-                        root.testSpacing = 0
-                }
-            }
-            StatusButton {
-                text: qsTr("Cycle frame margins")
-                onClicked: {
-                    root.testFrameMargins += (root.testFrameMargins/2) + 1
-                    if(root.testFrameMargins > 50)
-                        root.testFrameMargins = 0
-                }
-            }
-            StatusButton {
-                text: qsTr("Load external image")
-                onClicked: workflowLoader.active = true
-            }
-        }
-    }
 
-    Loader {
-        id: workflowLoader
-
-        sourceComponent: workflowComponent
-        active: false
-        onStatusChanged: {
-            if(status === Loader.Ready) {
-                item.imageFileDialogTitle = qsTr("Test Title")
-                item.title = "Test popup"
-                item.acceptButtonText = "Load Custom Image"
-                item.chooseImageToCrop()
+        Shortcut {
+            sequence: StandardKey.ZoomIn
+            onActivated: {
+                for(let i in testControls) {
+                    const c = testControls[i]
+                    c.setCropRect(ctrl1.inflateRectBy(c.cropRect, -0.05))
+                }
             }
         }
 
-        Connections {
-            target: workflowLoader.item
-            function onImageCropped(image, cropRect) {
-                ctrl1.source = image
-                ctrl2.source = image
-                ctrl3.source = image
-            }
-            function onCanceled() {
-                workflowLoader.active = false
-            }
-        }
-    }
-
-    Component {
-        id: workflowComponent
-
-        Item {
-            id: workflowItem
-
-            property alias aspectRatio: imageCropper.aspectRatio
-            property alias windowStyle: imageCropper.windowStyle
-            /*required*/ property string imageFileDialogTitle: ""
-            /*required*/ property string title: ""
-            /*required*/ property string acceptButtonText: ""
-            property bool roundedImage: true
-
-            signal imageCropped(var image, var cropRect)
-            signal canceled()
-
-            function chooseImageToCrop() {
-                fileDialog.open()
-            }
-
-            FileDialog {
-                id: fileDialog
-
-                title: workflowItem.imageFileDialogTitle
-                folder: workflowItem.userSelectedImage ? imageCropper.source.substr(0, imageCropper.source.lastIndexOf("/")) : shortcuts.pictures
-                nameFilters: [qsTr("Supported image formats (%1)").arg("*.jpg *.jpeg *.jfif *.webp *.png *.heif")]
-                onAccepted: {
-                    if (fileDialog.fileUrls.length > 0) {
-                        imageCropper.source = fileDialog.fileUrls[0]
-                        imageCropperModal.open()
-                    }
+        Shortcut {
+            sequence: StandardKey.ZoomOut
+            onActivated: {
+                for(let i in testControls) {
+                    const c = testControls[i]
+                    c.setCropRect(ctrl1.inflateRectBy(c.cropRect, 0.05))
                 }
-                onRejected: workflowItem.canceled()
-            } // FileDialog
-
-            StatusModal {
-                id: imageCropperModal
-
-                header.title: workflowItem.title
-
-                anchors.centerIn: Overlay.overlay
-
-                width: workflowItem.roundedImage ? 480 : 580
-
-                onClosed: workflowItem.canceled()
-
-                StatusImageCropPanel {
-                    id: imageCropper
-
-                    implicitHeight: workflowItem.roundedImage ? 350 : 370
-
-                    anchors {
-                         fill: parent
-                         leftMargin: 10 * 2
-                         rightMargin: 10 * 2
-                         topMargin: 15
-                         bottomMargin: 15
-                    }
-
-                    margins: workflowItem.roundedImage ? 10 : 20
-                    windowStyle: workflowItem.roundedImage ? StatusImageCrop.WindowStyle.Rounded : StatusImageCrop.WindowStyle.Rectangular
-                    enableCheckers: true
-                }
-
-                rightButtons: [
-                    StatusButton {
-                        text: workflowItem.acceptButtonText
-
-                        enabled: imageCropper.sourceSize.width > 0 && imageCropper.sourceSize.height > 0
-
-                        onClicked: {
-                            workflowItem.imageCropped(imageCropper.source, imageCropper.cropRect)
-                            imageCropperModal.close()
-                        }
-                    }
-                ]
-            } // StatusModal
-        } // Item
-    }
-
-
-    Shortcut {
-        sequence: StandardKey.ZoomIn
-        onActivated: {
-            for(let i in testControls) {
-                const c = testControls[i]
-                c.setCropRect(ctrl1.inflateRectBy(c.cropRect, -0.05))
             }
         }
-    }
 
-    Shortcut {
-        sequence: StandardKey.ZoomOut
-        onActivated: {
-            for(let i in testControls) {
-                const c = testControls[i]
-                c.setCropRect(ctrl1.inflateRectBy(c.cropRect, 0.05))
-            }
+        Shortcut {
+            sequences: ["Ctrl+W"]
+            onActivated: globalStylePreferRound = !globalStylePreferRound
         }
     }
-
-    Shortcut {
-        sequences: ["Ctrl+W"]
-        onActivated: globalStylePreferRound = !globalStylePreferRound
-    }
 }

sandbox/pages/StatusInputPage.qml

@@ -69,34 +69,19 @@ Column {
             textEdit.input.anchors.leftMargin: 16
             textEdit.input.anchors.rightMargin: 16
             textEdit.input.anchors.topMargin: 11
-            textEdit.label: "Input with drop down selection list" + (insertedWord ? ` (${insertedWord})` : "")
+            textEdit.label: "Input with drop down selection list"
             leftComponentText: "1"
             inputList: ListModel {
-                ListElement {
-                    seedWord: "add"
-                }
-                ListElement {
-                    seedWord: "address"
-                }
                 ListElement {
                     seedWord: "panda"
                 }
                 ListElement {
                     seedWord: "posible"
                 }
-                ListElement {
-                    seedWord: "win"
-                }
-                ListElement {
-                    seedWord: "wine"
-                }
                 ListElement {
                     seedWord: "wing"
                 }
             }
-
-            property string insertedWord: ""
-            onDoneInsertingWord: insertedWord = word
         }
     }
 
@@ -122,8 +107,7 @@ Column {
         label: "Label"
         secondaryLabel: "secondary label"
         placeholderText: "Placeholder"
-        minimumHeight: 56
-        maximumHeight: 56
+        input.implicitHeight: 56
     }
 
     StatusInput {
@@ -178,8 +162,7 @@ Column {
     StatusInput {
         input.multiline: true
         placeholderText: "Multiline with static height"
-        minimumHeight: 100
-        maximumHeight: 100
+        input.implicitHeight: 100
     }
 
     StatusInput {

sandbox/pages/StatusListPickerPage.qml

@@ -34,7 +34,6 @@ GridLayout {
             inputList: Models.languageNoImagePickerModel
             placeholderSearchText: qsTr("Search Languages")
             menuAlignment: StatusListPicker.MenuAlignment.Center
-            multiSelection: true
         }
 
         StatusListPicker {
@@ -61,7 +60,7 @@ GridLayout {
         width: 500
         text: "4 different configurations for the `StatusListPicker` component:\n
     * Single selection. \n
-    * Multiple selection without images.\n
+    * Single selection but dynamically changed to multiple selection (model provides multiple selected items).\n
     * Multiple selection.\n
     * Multiple selection and displayed name is the symbol + shortName\n"
         color: Theme.palette.baseColor1

sandbox/pages/StatusPopupMenuPage.qml

@@ -22,8 +22,8 @@ GridLayout {
         onClicked: complexMenu.popup()
     }
 
+
     StatusButton {
-        id: customPopupButton
         text: "Menu with custom images and icons"
         onClicked: customMenu.popup()
     }
@@ -51,7 +51,7 @@ GridLayout {
 
     StatusPopupMenu {
         id: complexMenu
-//        subMenuItemIcons: [{ icon: 'info' }]
+        subMenuItemIcons: [{ icon: 'info' }]
 
         StatusMenuItem { 
             text: "One" 
@@ -68,13 +68,10 @@ GridLayout {
         StatusMenuItem { 
             text: "Three"
             iconSettings.name: "info"
-            enabled: false
         }
 
         StatusPopupMenu {
             title: "Four"
-            iconSettings.name: "info"
-
             StatusMenuItem { 
                 text: "One"
                 iconSettings.name: "info"
@@ -88,24 +85,17 @@ GridLayout {
 
     StatusPopupMenu {
         id: customMenu
-        width: customPopupButton.width
 
-//        subMenuItemIcons: [
-//            {
-//                icon: "chat"
-//            },
-//            {
-//                source: "qrc:/demoapp/data/profile-image-1.jpeg"
-//            },
-//            {
-//                isLetterIdenticon: true,
-//                color: "red"
-//            }
-//        ]
-
-        MenuItem {
-            text: "Default MenuItem, action: " + action
-        }
+        subMenuItemIcons: [
+            { icon: "chat" },
+            { 
+                source: "qrc:/demoapp/data/profile-image-1.jpeg"
+            },
+            { 
+                isLetterIdenticon: true, 
+                color: "red" 
+            }
+        ]
 
         StatusMenuItem {
             text: "Anywhere"
@@ -114,8 +104,7 @@ GridLayout {
         StatusMenuSeparator {}
 
         StatusPopupMenu {
-            title: "Chat"
-            iconSettings.name: "chat"
+            title: "Chat" 
 
             StatusMenuItem { 
                 text: "vitalik.eth"
@@ -132,7 +121,6 @@ CExPynn1gWf9bx498P7/nzPcxEzGExhBdJGYihtAYQlO+tUZvqrPbqeudo5iJGEJjCE15a3VtodH3q2I
 
         StatusPopupMenu {
             title: "Cryptokitties"
-            imageSettings.source: "qrc:/demoapp/data/profile-image-1.jpeg"
 
             StatusMenuItem { 
                 text: "welcome" 
@@ -156,8 +144,6 @@ CExPynn1gWf9bx498P7/nzPcxEzGExhBdJGYihtAYQlO+tUZvqrPbqeudo5iJGEJjCE15a3VtodH3q2I
 
         StatusPopupMenu {
             title: "Another community"
-            iconSettings.isLetterIdenticon: true
-            iconSettings.color: "red"
 
             StatusMenuItem { 
                 text: "welcome" 

sandbox/pages/StatusSelectPage.qml

@@ -8,39 +8,28 @@ import StatusQ.Controls 0.1
 import StatusQ.Popups 0.1
 
 import Sandbox 0.1
-
 Column {
-    spacing: 20
-
-    ListModel {
-        id: commmonModel
-        ListElement {
-            name: "Pascal"
-        }
-        ListElement {
-            name: "Khushboo"
-        }
-        ListElement {
-            name: "Alexandra"
-        }
-        ListElement {
-            name: "Eric"
-        }
-    }
-
-    StatusBaseText {
-        font.pixelSize: 16
-        color: Theme.palette.dangerColor1
-        text: "This component should no longer be used.<br />Please, use `StatusComboBox` instead."
-        textFormat: Text.MarkdownText
-    }
+    spacing: 8
 
     StatusSelect {
         id: select
         label: "Some label"
-        model: commmonModel
-
+        model: ListModel {
+            ListElement {
+                name: "Pascal"
+            }
+            ListElement {
+                name: "Khushboo"
+            }
+            ListElement {
+                name: "Alexandra"
+            }
+            ListElement {
+                name: "Eric"
+            }
+        }
         selectMenu.delegate: StatusMenuItemDelegate {
+            statusPopupMenu: select
             action: StatusMenuItem {
                 iconSettings.name: "filled-account"
                 text: name
@@ -49,7 +38,6 @@ Column {
                 }
             }
         }
-
         selectedItemComponent: Item {
             id: selectedItem
             anchors.fill: parent

sandbox/pages/StatusTextAreaPage.qml

@@ -1,61 +0,0 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-
-import StatusQ.Core 0.1
-import StatusQ.Core.Theme 0.1
-import StatusQ.Controls 0.1
-
-Column {
-    id: root
-
-    spacing: 8
-
-    Component.onCompleted: {
-        focusedTextArea.forceActiveFocus()
-    }
-
-    StatusTextArea {
-        id: focusedTextArea
-        width: parent.width
-        placeholderText: "Initially focused text area"
-        KeyNavigation.tab: unfocusedTextArea
-    }
-
-    StatusTextArea {
-        id: unfocusedTextArea
-        width: parent.width
-        placeholderText: "Unfocused text area (hover me to see the color change)"
-        KeyNavigation.tab: invalidTextArea
-    }
-
-    StatusTextArea {
-        id: invalidTextArea
-        width: parent.width
-        valid: false
-        placeholderText: "Invalid text area, should display red border"
-        KeyNavigation.tab: longTextArea
-    }
-
-    StatusScrollView {
-        padding: 0 // use our own (StatusTextArea) padding
-        width: parent.width
-        height: 120
-        TextArea.flickable: longTextArea
-        StatusTextArea {
-            id: longTextArea
-            text: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Integer imperdiet lectus quis justo. Sed vel lectus. \
-            Donec odio tempus molestie, porttitor ut, iaculis quis, sem. Morbi scelerisque luctus velit. Nunc auctor. Nullam at \
-            arcu a est sollicitudin euismod. Cras elementum. Class aptent taciti sociosqu ad litora torquent per conubia nostra, \
-            per inceptos hymenaeos. Fusce aliquam vestibulum ipsum. Etiam sapien elit, consequat eget, tristique non, venenatis quis, ante. \
-            Nullam sit amet magna in magna gravida vehicula. Cras pede libero, dapibus nec, pretium sit amet, tempor quis. Nullam faucibus \
-            mi quis velit. Nam sed tellus id magna elementum tincidunt. Duis bibendum, lectus ut viverra rhoncus, dolor nunc faucibus libero, \
-            eget facilisis enim ipsum id lacus. Maecenas aliquet accumsan leo. Aliquam erat volutpat."
-            KeyNavigation.tab: focusedTextArea
-        }
-    }
-
-    StatusTextArea {
-        enabled: false
-        placeholderText: "Disabled text area"
-    }
-}

sandbox/qml.qrc

@@ -44,6 +44,7 @@
         <file>images/SuperRareCommunityBanner.png</file>
         <file>pages/StatusAccountSelectorPage.qml</file>
         <file>pages/StatusAddressPage.qml</file>
+        <file>pages/StatusAssetSelectorPage.qml</file>
         <file>pages/StatusCardPage.qml</file>
         <file>pages/StatusChatCommandButtonPage.qml</file>
         <file>pages/StatusChatInfoToolBarPage.qml</file>
@@ -79,7 +80,5 @@
         <file>images/SRToken.png</file>
         <file>demoapp/data/profile-image-1.jpeg</file>
         <file>demoapp/data/profile-image-2.jpeg</file>
-        <file>pages/StatusItemSelectorPage.qml</file>
-        <file>pages/StatusComboBoxPage.qml</file>
     </qresource>
 </RCC>

sandbox/sandboxapp.cpp

@@ -3,20 +3,15 @@
 #include <QQmlContext>
 #include <QWindow>
 #include <QDebug>
-#include <QDirIterator>
 
 #include "statuswindow.h"
 #include "spellchecker.h"
 
 SandboxApp::SandboxApp(int &argc, char **argv)
-    : QGuiApplication(argc, argv)
+    : QGuiApplication(argc, argv),
+      m_handler(new Handler(this))
 {
-#ifdef QT_DEBUG
-    connect(&m_watcher, &QFileSystemWatcher::directoryChanged, [this](const QString&) {
-        restartEngine();
-    });
-
-#endif
+    connect(m_handler, &Handler::restartQml, this, &SandboxApp::restartEngine, Qt::QueuedConnection);
 }
 
 void SandboxApp::startEngine()
@@ -26,18 +21,13 @@ void SandboxApp::startEngine()
 
 #ifdef QT_DEBUG
     const QUrl url = QUrl::fromLocalFile(SRC_DIR + QStringLiteral("/main.qml"));
-    m_watcher.addPath(applicationDirPath() + "/../");
-    QDirIterator it(applicationDirPath() + "/../", QDir::Dirs | QDir::NoDotAndDotDot, QDirIterator::Subdirectories);
-    while (it.hasNext()) {
-        if (!it.filePath().isEmpty()) {
-            m_watcher.addPath(it.filePath());
-        }
-        it.next();
-    }
 #else
     const QUrl url(QStringLiteral("qrc:/main.qml"));
 #endif
 
+    m_engine.rootContext()->setContextProperty("app", m_handler);
+
+
 #ifdef QT_DEBUG
     m_engine.addImportPath(SRC_DIR + QStringLiteral("/../src"));
 #else
@@ -54,7 +44,7 @@ void SandboxApp::startEngine()
 
 void SandboxApp::restartEngine()
 {
-    const QUrl url = QUrl::fromLocalFile(SRC_DIR + QStringLiteral("/main.qml"));
+    const QUrl url(applicationDirPath() + "/../main.qml");
     QWindow *rootWindow = qobject_cast<QWindow*>(m_engine.rootObjects().at(0));
     if (rootWindow) {
         rootWindow->close();

sandbox/sandboxapp.h

@@ -4,9 +4,7 @@
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
 
-#ifdef QT_DEBUG
-#include <QFileSystemWatcher>
-#endif
+#include "handler.h"
 
 class SandboxApp : public QGuiApplication
 {
@@ -20,10 +18,7 @@ public slots:
 
 private:
     QQmlApplicationEngine m_engine;
-
-#ifdef QT_DEBUG
-    QFileSystemWatcher m_watcher;
-#endif
+    Handler *m_handler;
 };
 
 #endif // SANDBOXAPP_H

src/StatusQ/Components/StatusAddress.qml

@@ -4,7 +4,6 @@ import StatusQ.Core 0.1
 import StatusQ.Core.Theme 0.1
 import StatusQ.Controls 0.1
 
-/// Forces size, hard to reuse it
 StatusBaseText {
     id: root 
 
@@ -19,6 +18,7 @@ StatusBaseText {
     color: Theme.palette.baseColor1
 
     Component.onCompleted: {
+        maxWidth = width
         expanded = actualWidth <= maxWidth
     }
 
@@ -29,9 +29,9 @@ StatusBaseText {
 
         onClicked: {
             if (root.expanded) {
-                root.width = root.maxWidth
+                width = root.width = root.maxWidth
             } else {
-                root.width = root.actualWidth
+                width = root.width = root.actualWidth
             }
             root.expanded = !root.expanded
         }

src/StatusQ/Components/StatusAddressPanel.qml

@@ -1,189 +0,0 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Layouts 1.14
-
-import StatusQ.Core 0.1
-import StatusQ.Core.Theme 0.1
-import StatusQ.Controls 0.1
-
-/*!
-    \qmltype StatusAddressPanel
-    \inherits Item
-    \inqmlmodule StatusQ.Components
-    \since StatusQ.Components 0.1
-    \brief Show an address as defined efined in design https://www.figma.com/file/FkFClTCYKf83RJWoifWgoX/Wallet-v2?node-id=4222%3A178403 and https://www.figma.com/file/h2Ab3k4wy1Y7SFHEvbcZZx/%E2%9A%99%EF%B8%8F-Settings-%7C-Desktop-(Copy)?node-id=1009%3A106451
-
-    Panel's components:
-      - Address: displays the rquired \c address property
-      - Frame: a rounded frame and the \c 0x icon prefix
-      - Copy action: clickable copy icon. Activable using \c showCopy
-
-    \qmlproperty string address address to show
-    \qmlproperty bool showCopy if \c true shows the copy action which triggers \c doCopy signal
-    \qmlproperty bool autHideCopyIcon if \c true shows the copy action when hovered. \see showCopy
-    \qmlproperty alias showFrame if \c true displays frame and \c 0x prefix
-    \qmlproperty bool expandable if \c true user can toggle between expanded and compact version; \see expanded
-    \qmlproperty bool expanded if \c true show address in full; if \c false show the address in compact mode eliding in the middle
-
-    \qmlproperty font: statusAddress.font
-
-    signal doCopy(string address)
-
-    \see StatusImageCrop for more details
-
-    Usage example:
-    \qml
-        StatusAddressPanel {
-            address: currentAccount.mixedcaseAddress
-
-            autHideCopyIcon: true
-            expanded: false
-
-            onDoCopy: (address) => root.store.copyToClipboard(address)
-        }
-    \endqml
-    For a list of components available see StatusQ.
- */
-Item {
-    id: root
-
-    /*required*/ property string address: ""
-    property bool showCopy: true
-    property bool autHideCopyIcon: false
-    property alias showFrame: frameRect.visible
-    property bool expandable: false
-    property bool expanded: true
-
-    property alias font: statusAddress.font
-
-    signal doCopy(string address)
-
-    implicitWidth: frameLayout.implicitWidth
-    implicitHeight: frameLayout.implicitHeight
-
-    RowLayout {
-        id: frameLayout
-
-        anchors.fill: parent
-
-        RowLayout {
-            Layout.leftMargin: frameRect.visible ? 8 : undefined // Theme.geometry.halfPadding
-            Layout.rightMargin: Layout.leftMargin
-            Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
-            Layout.minimumWidth: 120
-            Layout.preferredHeight: 32
-
-            spacing: 6
-
-            StatusIcon {
-                icon: "address"
-
-                Layout.alignment: Qt.AlignVCenter
-                Layout.preferredWidth: 19
-                Layout.preferredHeight: 19
-
-                visible: frameRect.visible
-
-                color: Theme.palette.baseColor1
-                opacity: 0.5
-            }
-
-            // Ensure the eliding is done in the middle of the value not taking into account `0x`
-            RowLayout {
-                spacing: 0
-
-                Layout.alignment: Qt.AlignVCenter
-
-                StatusBaseText {
-                    text: "0x"
-
-                    Layout.alignment: Qt.AlignVCenter
-
-                    font: statusAddress.font
-                    color: statusAddress.color
-                }
-
-                StatusBaseText {
-                    id: statusAddress
-
-                    text: root.address.replace("0x", "").replace("0X", "")
-
-                    Layout.preferredWidth: expanded ? implicitWidth : (implicitWidth * 0.25).toFixed()
-                    Layout.alignment: Qt.AlignVCenter
-
-                    font.family: Theme.palette.monoFont.name
-                    font.pixelSize: 15
-                    font.weight: Font.Medium
-                    elide: Text.ElideMiddle
-                    color: Theme.palette.baseColor1
-                }
-            }
-
-            StatusIcon {
-                icon: "copy"
-
-                visible: root.autHideCopyIcon ? (mainMouseArea.containsMouse || copyMouseArea.containsMouse )
-                                              : root.showCopy
-
-                Layout.alignment: Qt.AlignVCenter
-                Layout.preferredWidth: (statusAddress.font.pixelSize * 1.2).toFixed()
-                Layout.preferredHeight: Layout.preferredWidth
-
-                color: Theme.palette.baseColor1
-
-                MouseArea {
-                    id: copyMouseArea
-
-                    anchors.fill: parent
-
-                    hoverEnabled: true
-                    cursorShape: Qt.ArrowCursor
-                    preventStealing: true
-
-                    onClicked: root.doCopy(root.address)
-                    z: frameRect.z + 1
-                }
-
-                StatusIcon {
-                    icon: parent.icon
-
-                    x: 1
-                    y: 1
-                    width: parent.width
-                    height: parent.height
-
-                    visible: copyMouseArea.containsMouse && !copyMouseArea.pressed
-
-                    color: "black"
-                    opacity: 0.4
-                    z: parent.z + 1
-                }
-            }
-        }
-    }
-
-    Rectangle {
-        id: frameRect
-
-        anchors.fill: frameLayout
-
-        color: "transparent"
-        border.width: 1
-        border.color: Theme.palette.baseColor2
-        radius: 36
-    }
-
-    MouseArea {
-        id: mainMouseArea
-
-        anchors.fill: parent
-
-        hoverEnabled: root.expandable || root.autHideCopyIcon
-        enabled: (root.autHideCopyIcon && root.showCopy) || root.expandable
-        acceptedButtons: root.expandable ? Qt.LeftButton : Qt.NoButton
-        cursorShape: root.expandable ? Qt.PointingHandCursor : Qt.ArrowCursor
-
-        onClicked: root.expanded = !root.expanded
-        z: frameLayout.z - 1
-    }
-}

src/StatusQ/Components/StatusChatList.qml

@@ -9,7 +9,7 @@ import StatusQ.Components 0.1
 import StatusQ.Controls 0.1
 
 Column {
-    id: root
+    id: statusChatList
 
     spacing: 4
     width: 288
@@ -23,6 +23,8 @@ Column {
 
     property Component popupMenu
 
+    property var filterFn
+
     signal chatItemSelected(string categoryId, string id)
     signal chatItemUnmuted(string id)
     signal chatItemReordered(string id, int from, int to)
@@ -33,36 +35,22 @@ Column {
         }
     }
 
-    onDraggableItemsChanged: delegateModel.items.setGroups(0, delegateModel.items.count, "unsorted")
-
-    QtObject {
-        id: d
-
-        property int destinationPosition: -1
-    }
-
     DelegateModel {
         id: delegateModel
-        model: root.model
-
-        items.includeByDefault: !root.draggableItems
-
-        groups: DelegateModelGroup {
-            id: unsortedItems
-
-            name: "unsorted"
-            includeByDefault: root.draggableItems
-            onChanged: Utils.delegateModelSort(unsortedItems, delegateModel.items,
-                                               (a, b) => a.position < b.position)
-        }
-
+        model: statusChatList.model
         delegate: Item {
             id: draggable
-            objectName: model.name
-            width: root.width
+            width: statusChatList.width
             height: statusChatListItem.height
             property alias chatListItem: statusChatListItem
 
+            visible: {
+                if (!!statusChatList.filterFn) {
+                    return statusChatList.filterFn(model)
+                }
+                return true
+            }
+
             MouseArea {
                 id: dragSensor
 
@@ -70,7 +58,7 @@ Column {
                 cursorShape: active ? Qt.ClosedHandCursor : Qt.PointingHandCursor
                 hoverEnabled: true
                 pressAndHoldInterval: 150
-                enabled: root.draggableItems
+                enabled: statusChatList.draggableItems
 
                 property bool active: false
                 property real startY: 0
@@ -86,8 +74,8 @@ Column {
                 }
                 onPressAndHold: active = true
                 onReleased: {
-                    if (active && d.destinationPosition !== -1 && statusChatListItem.originalOrder !== d.destinationPosition) {
-                        root.chatItemReordered(statusChatListItem.chatId, statusChatListItem.originalOrder, d.destinationPosition)
+                    if (active) {
+                        statusChatList.chatItemReordered(statusChatListItem.chatId, statusChatListItem.originalOrder, statusChatListItem.originalOrder)
                     }
                     active = false
                 }
@@ -101,7 +89,6 @@ Column {
                         active = true
                     }
                 }
-                onActiveChanged: d.destinationPosition = -1
 
                 StatusChatListItem {
                     id: statusChatListItem
@@ -117,7 +104,7 @@ Column {
                     hasUnreadMessages: model.hasUnreadMessages
                     notificationsCount: model.notificationsCount
                     highlightWhenCreated: !!model.highlight
-                    selected: (model.active && root.highlightItem)
+                    selected: (model.active && statusChatList.highlightItem)
 
                     icon.emoji: model.emoji
                     icon.color: !!model.color ? model.color : Theme.palette.userCustomizationColors[model.colorId]
@@ -126,26 +113,10 @@ Column {
                     ringSettings.ringSpecModel: model.colorHash
 
                     sensor.cursorShape: dragSensor.cursorShape
-
-                    Connections {
-                        target: statusChatListItem
-                        enabled: root.draggableItems
-
-                        function onOriginalOrderChanged() {
-                            Qt.callLater(() => {
-                                if (!delegateModel)
-                                    return
-
-                                delegateModel.items.setGroups(0, delegateModel.items.count, "unsorted")
-                            })
-                        }
-
-                    }
-
                     onClicked: {
                         highlightWhenCreated = false
 
-                        if (mouse.button === Qt.RightButton && !!root.popupMenu) {
+                        if (mouse.button === Qt.RightButton && !!statusChatList.popupMenu) {
                             statusChatListItem.highlighted = true
 
                             let originalOpenHandler = popupMenuSlot.item.openHandler
@@ -166,17 +137,17 @@ Column {
                                 }
                             }
 
-                            let p = statusChatListItem.mapToItem(root, mouse.x, mouse.y)
+                            let p = statusChatListItem.mapToItem(statusChatList, mouse.x, mouse.y)
 
                             popupMenuSlot.item.popup(p.x + 4, p.y + 6)
                             popupMenuSlot.item.openHandler = originalOpenHandler
                             return
                         }
                         if (!statusChatListItem.selected) {
-                            root.chatItemSelected(model.parentItemId, model.itemId)
+                            statusChatList.chatItemSelected(model.parentItemId, model.itemId)
                         }
                     }
-                    onUnmute: root.chatItemUnmuted(model.itemId)
+                    onUnmute: statusChatList.chatItemUnmuted(model.itemId)
                 }
             }
 
@@ -187,6 +158,7 @@ Column {
                 keys: ["chat-item-category-" + statusChatListItem.categoryId]
 
                 onEntered: reorderDelay.start()
+                onDropped: statusChatList.chatItemReordered(statusChatListItem.chatId, drag.source.originalOrder, statusChatListItem.DelegateModel.itemsIndex)
 
                 Timer {
                     id: reorderDelay
@@ -194,7 +166,7 @@ Column {
                     repeat: false
                     onTriggered: {
                         if (dropArea.containsDrag) {
-                            d.destinationPosition = delegateModel.model.get(draggable.DelegateModel.itemsIndex).position
+                            dropArea.drag.source.chatListItem.originalOrder = statusChatListItem.originalOrder
                             delegateModel.items.move(dropArea.drag.source.DelegateModel.itemsIndex, draggable.DelegateModel.itemsIndex)
                         }
                     }
@@ -238,12 +210,11 @@ Column {
 
     Repeater {
         id: statusChatListItems
-        objectName: "chatListItems"
         model: delegateModel
     }
 
     Loader {
         id: popupMenuSlot
-        active: !!root.popupMenu
+        active: !!statusChatList.popupMenu
     }
 }

src/StatusQ/Components/StatusChatListAndCategories.qml

@@ -7,10 +7,8 @@ import StatusQ.Components 0.1
 import StatusQ.Popups 0.1
 import StatusQ.Core 0.1
 
-import SortFilterProxyModel 0.2
-
 Item {
-    id: root
+    id: statusChatListAndCategories
 
     implicitHeight: chatListsAndCategories.height
     implicitWidth: chatListsAndCategories.width
@@ -53,11 +51,11 @@ Item {
     MouseArea {
         id: sensor
         anchors.top: parent.top
-        width: root.width
-        height: root.height
+        width: statusChatListAndCategories.width
+        height: statusChatListAndCategories.height
         acceptedButtons: Qt.LeftButton | Qt.RightButton
         onClicked: {
-            if (mouse.button === Qt.RightButton && showPopupMenu && !!root.popupMenu) {
+            if (mouse.button === Qt.RightButton && showPopupMenu && !!statusChatListAndCategories.popupMenu) {
                 popupMenuSlot.item.popup(mouse.x + 4, mouse.y + 6)
                 return
             }
@@ -73,44 +71,20 @@ Item {
             StatusChatList {
                 id: statusChatList
                 visible: statusChatList.model.count > 0
-                onChatItemSelected: root.chatItemSelected(categoryId, id)
-                onChatItemUnmuted: root.chatItemUnmuted(id)
-                onChatItemReordered: root.chatItemReordered(categoryId, id, from, to)
-                draggableItems: root.draggableItems
-
-                model: SortFilterProxyModel {
-                    sourceModel: root.model
-
-                    filters: ValueFilter { roleName: "isCategory"; value: false }
-                    sorters: RoleSorter { roleName: "position" }
+                onChatItemSelected: statusChatListAndCategories.chatItemSelected(categoryId, id)
+                onChatItemUnmuted: statusChatListAndCategories.chatItemUnmuted(id)
+                onChatItemReordered: statusChatListAndCategories.chatItemReordered(categoryId, id, from, to)
+                draggableItems: statusChatListAndCategories.draggableItems
+                model: statusChatListAndCategories.model
+                filterFn: function (model) {
+                    return !model.isCategory
                 }
-
-                popupMenu: root.chatListPopupMenu
+                popupMenu: statusChatListAndCategories.chatListPopupMenu
             }
 
             DelegateModel {
                 id: delegateModel
-
-                property int destinationPosition: -1
-
-                model: SortFilterProxyModel {
-                    sourceModel: root.model
-
-                    filters: ValueFilter { roleName: "isCategory"; value: true }
-                    sorters: RoleSorter { roleName: "position" }
-                }
-
-                items.includeByDefault: false
-
-                groups: DelegateModelGroup {
-                    id: unsortedItems
-
-                    name: "unsorted"
-                    includeByDefault: true
-                    onChanged: Utils.delegateModelSort(unsortedItems, delegateModel.items,
-                                                       (a, b) => a.position < b.position)
-                }
-
+                model: statusChatListAndCategories.model
                 delegate: Item {
                     id: draggable
                     width: statusChatListCategory.width
@@ -130,13 +104,13 @@ Item {
                         dragSensor.drag.threshold: 0.1
                         dragSensor.drag.filterChildren: true
                         dragSensor.onPressAndHold: {
-                            if (root.draggableCategories) {
+                            if (statusChatListAndCategories.draggableCategories) {
                                 dragActive = true
                             }
                         }
                         dragSensor.onReleased: {
-                            if (dragActive && delegateModel.destinationPosition !== -1 && statusChatListCategory.originalOrder !== delegateModel.destinationPosition) {
-                                root.chatListCategoryReordered(statusChatListCategory.categoryId, statusChatListCategory.originalOrder, delegateModel.destinationPosition)
+                            if (dragActive) {
+                                statusChatListAndCategories.chatListCategoryReordered(statusChatListCategory.categoryId, statusChatListCategory.originalOrder, statusChatListCategory.originalOrder)
                             }
                             dragActive = false
                         }
@@ -146,44 +120,38 @@ Item {
                             startX = dragSensor.mouseX
                         }
                         dragSensor.onMouseYChanged: {
-                            if (root.draggableCategories && (Math.abs(startY - dragSensor.mouseY) > 1) && dragSensor.pressed) {
+                            if (statusChatListAndCategories.draggableCategories && (Math.abs(startY - dragSensor.mouseY) > 1) && dragSensor.pressed) {
                                 dragActive = true
                             }
                         }
                         dragSensor.onMouseXChanged: {
-                            if (root.draggableCategories && (Math.abs(startX - dragSensor.mouseX) > 1) && dragSensor.pressed) {
+                            if (statusChatListAndCategories.draggableCategories && (Math.abs(startX - dragSensor.mouseX) > 1) && dragSensor.pressed) {
                                 dragActive = true
                             }
                         }
-                        onDragActiveChanged: delegateModel.destinationPosition = -1
 
-                        addButton.tooltip: root.categoryAddButtonToolTip
-                        menuButton.tooltip: root.categoryMenuButtonToolTip
+                        addButton.tooltip: statusChatListAndCategories.categoryAddButtonToolTip
+                        menuButton.tooltip: statusChatListAndCategories.categoryMenuButtonToolTip
 
                         originalOrder: model.position
                         categoryId: model.itemId
                         name: model.name
+                        showActionButtons: statusChatListAndCategories.showCategoryActionButtons
+                        addButton.onClicked: statusChatListAndCategories.categoryAddButtonClicked(model.itemId)
 
-                        showActionButtons: root.showCategoryActionButtons
-                        addButton.onClicked: root.categoryAddButtonClicked(model.itemId)
+                        chatList.model: model.subItems
+                        chatList.onChatItemSelected: statusChatListAndCategories.chatItemSelected(categoryId, id)
+                        chatList.onChatItemUnmuted: statusChatListAndCategories.chatItemUnmuted(id)
+                        chatList.onChatItemReordered: statusChatListAndCategories.chatItemReordered(model.itemId, id, from, to)
+                        chatList.draggableItems: statusChatListAndCategories.draggableItems
 
-                        chatList.model: SortFilterProxyModel {
-                            sourceModel: model.subItems
-                            sorters: RoleSorter { roleName: "position" }
-                        }
-
-                        chatList.onChatItemSelected: root.chatItemSelected(categoryId, id)
-                        chatList.onChatItemUnmuted: root.chatItemUnmuted(id)
-                        chatList.onChatItemReordered: root.chatItemReordered(model.itemId, id, from, to)
-                        chatList.draggableItems: root.draggableItems
-
-                        popupMenu: root.categoryPopupMenu
-                        chatListPopupMenu: root.chatListPopupMenu
+                        popupMenu: statusChatListAndCategories.categoryPopupMenu
+                        chatListPopupMenu: statusChatListAndCategories.chatListPopupMenu
 
                         // Used to set the initial value of "opened" when the
                         // model is bound/changed.
                         opened: {
-                            let openedState = root.openedCategoryState[model.itemId]
+                            let openedState = statusChatListAndCategories.openedCategoryState[model.itemId]
                             return openedState !== undefined ? openedState : true // defaults to open
                         }
 
@@ -192,18 +160,7 @@ Item {
                         // as the state would be lost each time the model is
                         // changed.
                         onOpenedChanged: {
-                            root.openedCategoryState[model.itemId] = statusChatListCategory.opened
-                        }
-
-                        Connections {
-                            function onOriginalOrderChanged() {
-                                Qt.callLater(() => {
-                                    if (!delegateModel)
-                                        return
-
-                                    delegateModel.items.setGroups(0, delegateModel.items.count, "unsorted")
-                                })
-                            }
+                            statusChatListAndCategories.openedCategoryState[model.itemId] = statusChatListCategory.opened
                         }
                     }
 
@@ -214,6 +171,7 @@ Item {
                         keys: ["chat-category"]
 
                         onEntered: reorderDelay.start()
+                        onDropped: statusChatListAndCategories.chatListCategoryReordered(statusChatListCategory.categoryId, drag.source.originalOrder, statusChatListCategory.DelegateModel.itemsIndex)
 
                         Timer {
                             id: reorderDelay
@@ -221,7 +179,7 @@ Item {
                             repeat: false
                             onTriggered: {
                                 if (dropArea.containsDrag) {
-                                    delegateModel.destinationPosition = delegateModel.model.get(draggable.DelegateModel.itemsIndex).position
+                                    dropArea.drag.source.chatListCategory.originalOrder = statusChatListCategory.originalOrder
                                     delegateModel.items.move(dropArea.drag.source.DelegateModel.itemsIndex, draggable.DelegateModel.itemsIndex)
                                 }
                             }
@@ -267,6 +225,6 @@ Item {
 
     Loader {
         id: popupMenuSlot
-        active: !!root.popupMenu
+        active: !!statusChatListAndCategories.popupMenu
     }
 }

src/StatusQ/Components/StatusChatListCategory.qml

@@ -35,6 +35,7 @@ Column {
     StatusChatListCategoryItem {
         id: statusChatListCategoryItem
         title: statusChatListCategory.name
+        visible: model.isCategory
         opened: statusChatListCategory.opened
         sensor.pressAndHoldInterval: 150
 
@@ -65,6 +66,9 @@ Column {
         anchors.horizontalCenter: parent.horizontalCenter
         visible: statusChatListCategory.opened
         categoryId: statusChatListCategory.categoryId
+        filterFn: function (model) {
+            return !!model.parentItemId && model.parentItemId === statusChatList.categoryId
+        }
 
         popupMenu: statusChatListCategory.chatListPopupMenu
     }

src/StatusQ/Components/StatusCommunityTags.qml

@@ -13,23 +13,21 @@ Item {
     property alias model: repeater.model
     property alias contentWidth: flow.width
 
-    readonly property int itemsWidth: {
-        let result = 0;
-        for (let i = 0; i < repeater.count; ++i) {
-            result +=  flow.spacing + repeater.itemAt(i).width;
-        }
-        return result;
-    }
-
     signal clicked(var item)
 
-    implicitWidth: itemsWidth
-    implicitHeight: flow.height
+    implicitWidth: flow.implicitWidth
+    implicitHeight: flow.implicitHeight
 
     Flow {
         id: flow
         anchors.centerIn: parent
-        width: Math.min(parent.width, root.itemsWidth);
+        width: {
+            let itemsWidth = 0;
+            for (let i = 0; i < repeater.count; ++i) {
+                itemsWidth += spacing + repeater.itemAt(i).width;
+            }
+            return Math.min(parent.width, itemsWidth);
+        }
         spacing: 10
 
         Repeater {
@@ -40,7 +38,7 @@ Item {
                 name: model.name
                 visible: (root.showOnlySelected ? model.selected : !model.selected) &&
                          (filterString == 0 || name.toUpperCase().indexOf(filterString.toUpperCase()) !== -1)
-                width: visible ? implicitWidth : -flow.spacing
+                width: visible ? implicitWidth : -10
                 height: visible ? implicitHeight : 0
                 removable: root.showOnlySelected && root.active
                 onClicked: root.clicked(model)

src/StatusQ/Components/StatusDatePicker.qml

@@ -1,184 +0,0 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Layouts 1.14
-
-import Qt.labs.calendar 1.0
-
-import StatusQ.Core 0.1
-import StatusQ.Controls 0.1
-import StatusQ.Core.Theme 0.1
-
-/*!
-   \qmltype StatusDatePicker
-   \inherits StatusQ.Controls.StatusComboBox
-   \inqmlmodule StatusQ.Components
-   \since StatusQ.Components 0.1
-   \brief Displays a date picker based on a combobox with a calendar popup
-
-   The \c StatusDatePicker displays a date picker based on a combobox with a calendar popup.
-   The property \p selectedDate reflects the currently chosen date (defaults to today).
-
-   For a list of components available see StatusQ.
-*/
-StatusComboBox {
-    id: root
-
-    /*!
-       \qmlproperty string StatusDatePicker::dateFormat
-
-       This property specifies how the selected date will be displayed to the user.
-       By default it is current locale's short date format. For a list of available types
-       and formatting characters, see https://doc.qt.io/qt-5/qdate.html#toString-2
-    */
-    property string dateFormat: Qt.locale().dateFormat(Locale.ShortFormat)
-
-    /*!
-       \qmlproperty date StatusDatePicker::selectedDate
-
-       This property holds the currently selected date.
-       \sa QtQml.Date
-    */
-    property alias selectedDate: d.selectedDate
-
-    QtObject {
-        id: d
-        property date selectedDate: new Date()
-    }
-
-    control.delegate: null
-    control.displayText: root.selectedDate.toLocaleDateString(Qt.locale(), root.dateFormat)
-    control.popup.horizontalPadding: 8
-
-    control.popup.onAboutToShow: {
-        // always open the popup showing the last (currently) selected date
-        grid.year = d.selectedDate.getFullYear()
-        grid.month = d.selectedDate.getMonth()
-    }
-
-    control.popup.contentItem: Item {
-        property alias grid: grid
-        GridLayout {
-            anchors.fill: parent
-            columns: 2
-
-            RowLayout {
-                Layout.fillWidth: true
-                Layout.columnSpan: 2
-                spacing: 0
-                StatusFlatButton {
-                    leftPadding: 8
-                    rightPadding: 8
-                    text: "<<"
-                    onClicked: grid.year = grid.year - 1
-                    StatusToolTip {
-                        text: qsTr("Previous year")
-                        visible: parent.hovered
-                    }
-                }
-                StatusFlatButton {
-                    leftPadding: 8
-                    rightPadding: 8
-                    text: "<"
-                    onClicked: {
-                        // switch to previous month (and optionally prev year in January)
-                        const date = new Date(grid.year, grid.month)
-                        date.setMonth(date.getMonth() - 1)
-                        grid.month = date.getMonth()
-                        grid.year = date.getFullYear()
-                    }
-                    StatusToolTip {
-                        text: qsTr("Previous month")
-                        visible: parent.hovered
-                    }
-                }
-                StatusFlatButton {
-                    Layout.fillWidth: true
-                    text: grid.title
-                    font.pixelSize: 18
-                    font.weight: Font.Medium
-                    onClicked: {
-                        const date = new Date()
-                        grid.month = date.getMonth()
-                        grid.year = date.getFullYear()
-                    }
-                    StatusToolTip {
-                        text: qsTr("Show current month")
-                        visible: parent.hovered
-                    }
-                }
-                StatusFlatButton {
-                    leftPadding: 8
-                    rightPadding: 8
-                    text: ">"
-                    onClicked: {
-                        // switch to next month (and optionally next year in December)
-                        const date = new Date(grid.year, grid.month)
-                        date.setMonth(date.getMonth() + 1)
-                        grid.month = date.getMonth()
-                        grid.year = date.getFullYear()
-                    }
-                    StatusToolTip {
-                        text: qsTr("Next month")
-                        visible: parent.hovered
-                    }
-                }
-                StatusFlatButton {
-                    leftPadding: 8
-                    rightPadding: 8
-                    text: ">>"
-                    onClicked: grid.year = grid.year + 1
-                    StatusToolTip {
-                        text: qsTr("Next year")
-                        visible: parent.hovered
-                    }
-                }
-            }
-
-            DayOfWeekRow {
-                Layout.row: 1
-                Layout.column: 1
-                Layout.fillWidth: true
-                delegate: StatusBaseText {
-                    text: model.shortName
-                    color: Theme.palette.directColor3
-                    horizontalAlignment: Text.AlignHCenter
-                    verticalAlignment: Text.AlignVCenter
-                }
-            }
-
-            WeekNumberColumn {
-                id: weekColumn
-                month: grid.month
-                year: grid.year
-                Layout.fillHeight: true
-                delegate: StatusBaseText {
-                    text: model.weekNumber
-                    color: Theme.palette.directColor3
-                    horizontalAlignment: Text.AlignHCenter
-                    verticalAlignment: Text.AlignVCenter
-                }
-            }
-
-            MonthGrid {
-                id: grid
-                month: d.selectedDate.getMonth()
-                year: d.selectedDate.getFullYear()
-                Layout.fillWidth: true
-                Layout.fillHeight: true
-                delegate: StatusFlatButton {
-                    readonly property bool selected: d.selectedDate.getFullYear() === model.year &&
-                                                     d.selectedDate.getMonth() === model.month &&
-                                                     d.selectedDate.getDate() === model.day
-                    opacity: model.month === grid.month ? 1 : 0.5
-                    text: model.day
-                    textColor: selected ? Theme.palette.primaryColor1 : Theme.palette.directColor1
-                    font.bold: selected || model.today
-                    onClicked: {
-                        d.selectedDate = model.date
-                        root.control.popup.close()
-                    }
-                }
-            }
-        }
-    }
-}

src/StatusQ/Components/StatusImageCropPanel.qml

@@ -3,7 +3,6 @@ import QtQuick.Layouts 1.14
 
 import StatusQ.Core 0.1
 import StatusQ.Controls 0.1
-import StatusQ.Core.Theme 0.1
 
 /*!
     \qmltype StatusImageCropPanel
@@ -128,15 +127,12 @@ Item {
         id: mainLayout
 
         anchors.fill: parent
-        spacing: 1
 
         Item {
             id: cropSpaceItem
 
             Layout.fillWidth: true
             Layout.fillHeight: true
-            Layout.leftMargin: 10
-            Layout.rightMargin: 10
 
             clip: true
 
@@ -146,7 +142,6 @@ Item {
                 anchors.top: parent.top
                 anchors.right: cropEditor.left
                 anchors.bottom: parent.bottom
-                anchors.bottomMargin: -1
                 color: wallColor
                 opacity: wallTransparency
                 z: cropEditor.z + 1
@@ -165,9 +160,8 @@ Item {
             StatusImageCrop {
                 id: cropEditor
                 anchors.centerIn: parent
-                readonly property bool cropARSmall: aspectRatio < cropSpaceItem.width/cropSpaceItem.height
-                width: cropARSmall ? cropSpaceItem.height * aspectRatio : cropSpaceItem.width - root.margins * 2
-                height: cropARSmall ? cropSpaceItem.height - root.margins * 2 : cropSpaceItem.width / aspectRatio
+                width: aspectRatio < cropSpaceItem.width/cropSpaceItem.height ? cropSpaceItem.height * aspectRatio : cropSpaceItem.width - root.margins * 2
+                height: aspectRatio < cropSpaceItem.width/cropSpaceItem.height ? cropSpaceItem.height - root.margins * 2 : cropSpaceItem.width / aspectRatio
             }
 
             Rectangle {
@@ -176,7 +170,6 @@ Item {
                 anchors.top: parent.top
                 anchors.right: parent.right
                 anchors.bottom: parent.bottom
-                anchors.bottomMargin: -1
                 color: wallColor
                 opacity: wallTransparency
                 z: cropEditor.z + 1
@@ -188,7 +181,6 @@ Item {
                 anchors.top: cropEditor.bottom
                 anchors.right: rightOverlay.left
                 anchors.bottom: parent.bottom
-                anchors.bottomMargin: -1
                 color: wallColor
                 opacity: wallTransparency
                 z: cropEditor.z + 1
@@ -198,7 +190,6 @@ Item {
             Canvas {
                 visible: root.enableCheckers
                 anchors.fill: parent
-                anchors.bottomMargin: -1
                 onPaint: {
                     var ctx = getContext("2d")
                     for(let xI = 0; xI < Math.ceil(width/10); xI++) {
@@ -247,20 +238,17 @@ Item {
 
         RowLayout {
             visible: root.interactive
-            spacing: 10
 
             StatusIcon {
                 icon: "remove-circle"
-                color: Theme.palette.baseColor1
 
-                Layout.alignment: Qt.AlignVCenter
-                Layout.preferredWidth: 24
-                Layout.preferredHeight: 24
+                Layout.preferredWidth: 20
+                Layout.preferredHeight: 20
             }
             StatusSlider {
                 Layout.fillWidth: true
-                Layout.topMargin: 10
-                Layout.bottomMargin: 10
+                Layout.topMargin: 20
+                Layout.bottomMargin: 25
                 Layout.alignment: Qt.AlignVCenter
 
                 enabled: root.interactive
@@ -273,11 +261,9 @@ Item {
             }
             StatusIcon {
                 icon: "add-circle"
-                color: Theme.palette.baseColor1
 
-                Layout.alignment: Qt.AlignVCenter
-                Layout.preferredWidth: 24
-                Layout.preferredHeight: 24
+                Layout.preferredWidth: 20
+                Layout.preferredHeight: 20
             }
         }
     }

src/StatusQ/Components/StatusListItem.qml

@@ -284,7 +284,6 @@ Rectangle {
 
             StatusBaseText {
                 id: statusListItemSubTitle
-                objectName: "statusListItemSubTitle"
                 anchors.top: statusListItemTitle.bottom
                 width: parent.width
                 text: statusListItem.subTitle

src/StatusQ/Components/StatusListPicker.qml

@@ -6,8 +6,6 @@ import StatusQ.Core 0.1
 import StatusQ.Core.Theme 0.1
 import StatusQ.Controls 0.1
 
-import SortFilterProxyModel 0.2
-
 /*!
    \qmltype StatusListPicker
    \inherits Item
@@ -17,7 +15,7 @@ import SortFilterProxyModel 0.2
 
    The \c StatusListPicker is populated with a data model. The data model is commonly a JavaScript array or a ListModel object.
 
-   StatusListPicker can be made as a single or multiple options picker by setting its StatusListPicker::multiSelection property properly.
+   StatusListPicker can be made as a single or multiple options picker by setting its StatusListPicker::multiSelection property properly or will be auto-set if the model contains / provides more than one selected items.
    The StatusPickerButton text holds the text of the current item selected in the list picker. If there is more than one item selected, a string composed will be displayed.
    The drop-down list incorporates a searcher by the following model roles: `name` or / and `shortName`.
 
@@ -46,7 +44,6 @@ Item {
        This property holds the data that will be populated in the list picker.
 
        NOTE: This model property should not change so it is an in / out property where the selected role will be dynamically changed according to user actions.
-       NOTE: Be sure provided model is compatible with StatusListPicker::multiSelection property.
 
        Here an example of the model roles expected:
        \qml
@@ -72,9 +69,7 @@ Item {
         }
        \endqml
     */
-    property var inputList: ListModel { }
-
-    readonly property StatusListPickerProxies proxy: StatusListPickerProxies {}
+    property ListModel inputList: ListModel { }
 
     /*!
        \qmlproperty string StatusListPicker::searchText
@@ -156,65 +151,93 @@ Item {
 
     QtObject {
         id: d
+        property var filteredModel: ListModel { }
 
-        readonly property SortFilterProxyModel selectedItems: SortFilterProxyModel {
-            sourceModel: root.inputList
-            // NOTE: ValueFilter would crash if source model does not contain given role
-            // FIXME: use ValueFilter when its fixed
-            filters: ExpressionFilter {
-                expression: root.proxy.selected(model)
+        // Used to set up component and the needed private properties
+        function initialize() {
+            if(filteredModel.count === 0) {
+                // It is necessary to load the model, not loaded yet!
+                var selected = 0
+                var selectionText = ""
+                for(var i = 0; i < root.inputList.count; i++) {
+                    var item = root.inputList.get(i)
+                    d.filteredModel.append(item)
+                    if(item.selected) selected++;
+                }
+
+                // If the given model has more than one selected elements, the behaviour of the list picker will be as a multiple selector with checkboxes although it is
+                // set in the radiobutton mode. Radiobutton mode is only for mutial-exclusion.
+                if(selected > 1)
+                    multiSelection = true
+
+                // Update selected items text:
+                d.getSelectedItemsText()
             }
         }
 
-        readonly property string selectedItemsText: {
-            function formatSymbolShortNameText(symbol, shortName) {
-                var formattedText = ""
-                if(root.printSymbol && symbol)
-                    formattedText = symbol + shortName
-                else
-                    formattedText = shortName
-                return formattedText
+        // Used to update model elements given a specific text by filtering them for its `name` and / or `shortName`.
+        function applyFilter(text) {
+            const input = text.toLowerCase()
+            filteredModel.clear()
+            for(var i = 0; i < root.inputList.count; i++) {
+                let item = root.inputList.get(i)
+                if(item.name.toLowerCase().includes(input) || item.shortName.toLowerCase().includes(input))
+                    filteredModel.append(item)
             }
+        }        
 
+        function formatSymbolShortNameText(symbol, shortName) {
+            var formattedText = ""
+            if(root.printSymbol && symbol)
+                formattedText = symbol + shortName
+            else
+                formattedText = shortName
+            return formattedText
+        }
+
+        function getSelectedItemsText() {
             var res = ""
-            for(var i = 0; i < selectedItems.count; i++) {
-                var item = selectedItems.get(i)
-                if(res != "")
-                    res += ", "
-                res += formatSymbolShortNameText(root.proxy.symbol(item), root.proxy.shortName(item))
+            for(var i = 0; i < root.inputList.count; i++) {
+                var item = root.inputList.get(i)
+                if(item.selected) {
+                    if(res != "")
+                        res += ", "
+                    res += d.formatSymbolShortNameText(item.symbol, item.shortName)
+                }
             }
             return res
         }
+
+        // Used to update the base input list model with the new selected property
+        function updateInputListModel(key, selected, isSingleSelection) {
+            // If it is a single selection we must ensure that when a new key is selected  others are cleared.
+            // It must be done manually because as there is the option of filterning, the model visualized changes
+            // and it could be possible to have a filtered list without an element selected (but in the base model
+            // it is) so, the binding to not selected will not be executed, as in the current filtered model
+            // there are no changes to update, just only the selected one.
+            for(var i = 0; i < root.inputList.count; i++) {
+                if(root.inputList.get(i).key === key) {
+                    root.inputList.get(i).selected = selected
+                }
+                else if(isSingleSelection && selected) {
+                     // Clear all the list
+                    root.inputList.get(i).selected = false
+                }
+            }
+        }
     }
 
     width: 110
     height: 38
 
-    Repeater {
-        // Used to update the base input list model with the new selected property
-        // If it is a single selection we must ensure that when a new key is selected others are cleared.
-        id: itemsSelectorHelper
-
-        signal selectItem(var key, bool checked)
-
-        model: root.inputList
-        delegate: Item {
-            Connections {
-                target: itemsSelectorHelper
-                function onSelectItem(key, checked) {
-                    if (root.proxy.key(model) === key) root.proxy.setSelected(model, checked)
-                    else if (!root.multiSelection && checked) root.proxy.setSelected(model, false)
-                }
-            }
-        }
-    }
+    Component.onCompleted: d.initialize()
 
     StatusPickerButton {
         id: btn
         anchors.fill: parent
         bgColor: Theme.palette.primaryColor3
         contentColor: Theme.palette.primaryColor1
-        text: d.selectedItemsText
+        text: picker.selectedItemsText
         font.pixelSize: 13
         type: StatusPickerButton.Type.Down
 
@@ -230,6 +253,8 @@ Item {
     Rectangle {
         id: picker
 
+        property string selectedItemsText: ""
+
         width: content.itemWidth
         height: Math.min(content.contentHeight + content.anchors.topMargin + content.anchors.bottomMargin, root.maxPickerHeight)
         anchors.left: root.menuAlignment === StatusListPicker.MenuAlignment.Left ? btn.left : undefined
@@ -252,23 +277,12 @@ Item {
         }
 
         ListView {
-            id: content
+            id: content            
 
             property int itemHeight: 40
             property int itemWidth: 360
 
-            model: SortFilterProxyModel {
-                sourceModel: root.inputList
-                delayed: true
-                filters: ExpressionFilter {
-                    expression: {
-                        root.searchText // ensure expression is reevaluated when searchText changes
-                        return root.proxy.name(model).toLowerCase().includes(root.searchText.toLowerCase()) ||
-                               root.proxy.shortName(model).toLowerCase().includes(root.searchText.toLowerCase())
-                    }
-                }
-            }
-
+            model: d.filteredModel
             width: itemWidth
             anchors.top: parent.top
             anchors.topMargin: 8
@@ -296,7 +310,10 @@ Item {
                     text: root.searchText
                     input.icon.name: "search"
 
-                    onTextChanged: root.searchText = text
+                    onTextChanged: {
+                        d.applyFilter(text)
+                        root.searchText = text
+                    }
                 }
             }// End of search input item
             delegate: StatusItemPicker {
@@ -304,24 +321,30 @@ Item {
                 height: content.itemHeight
                 color: mouseArea.containsMouse ? Theme.palette.baseColor4 : "transparent"
                 image: StatusImageSettings {
-                    source: root.proxy.imageSource(model) ? root.proxy.imageSource(model) : ""
+                    source: model.imageSource ? model.imageSource : ""
                     width: 15
                     height: 15
                     isIdenticon: false
                 }
-                name: root.proxy.name(model)
-                shortName: root.proxy.shortName(model)
+                name: model.name
+                shortName: model.shortName
                 selectorType: root.multiSelection ? StatusItemPicker.SelectorType.CheckBox : StatusItemPicker.SelectorType.RadioButton
-                selected: root.proxy.selected(model)
+                selected: model.selected
                 radioGroup: radioBtnGroup
 
                 onCheckedChanged: {
-                    if (checked !== root.proxy.selected(model)) {
-                        itemsSelectorHelper.selectItem(root.proxy.key(model), checked)
+                    d.updateInputListModel(model.key, checked, selectorType === StatusItemPicker.SelectorType.RadioButton)
+                    if(selectorType === StatusItemPicker.SelectorType.RadioButton && checked) {
+                        // Update selected item text
+                        picker.selectedItemsText = d.formatSymbolShortNameText(model.symbol, model.shortName)
+                    }
+                    else {
+                        // Update selected items text (multiple selection, text chain).
+                        picker.selectedItemsText = d.getSelectedItemsText()
                     }
 
                     // Used to notify selected property changes in the specific item picker.
-                    itemPickerChanged(root.proxy.key(model), checked)
+                    itemPickerChanged(model.key, checked)
                 }
 
                 MouseArea {
@@ -363,7 +386,7 @@ Item {
             // Not visual element to control mutual-exclusion of radiobuttons that are not sharing the same parent (inside list view)
             ButtonGroup {
                 id: radioBtnGroup
-            }
-        }// End of Content
+            }           
+        }// End of Content        
     }// End of Rectangle picker
 }

src/StatusQ/Components/StatusListPickerProxies.qml

@@ -1,30 +0,0 @@
-import QtQuick 2.14
-
-/*!
-  Enables StatusListPicker to work with incompatible models.
-   \qml
-        StatusListPicker {
-            id: currencyPicker
-            inputList: ListModel {
-                ListElement { incompatibleA: 0 ... incomatibleZ: false }
-                ListElement { incompatibleA: 1 ... incomatibleZ: false }
-                ListElement { incompatibleA: 2 ... incomatibleZ: false }
-            }
-            proxy { // StatusListPickerProxies
-                key: (model) => model.incompatibleA
-                ...
-                selected: (model) => model.incompatibleZ
-            }
-        }
-   \endqml
-*/
-QtObject {
-    property var key: (model) => model.key
-    property var name: (model) => model.name
-    property var shortName: (model) => model.shortName
-    property var symbol: (model) => model.symbol
-    property var imageSource: (model) => model.imageSource
-    property var category: (model) => model.category
-    property var selected: (model) => model.selected
-    property var setSelected: (model, val) => model.selected = val
-}

src/StatusQ/Components/StatusSmartIdenticon.qml

@@ -79,7 +79,6 @@ Loader {
     Component {
         id: letterIdenticon
         StatusLetterIdenticon {
-            objectName: "statusSmartIdenticonLetter"
             width: statusSmartIdenticon.icon.width
             height: statusSmartIdenticon.icon.height
             color: statusSmartIdenticon.icon.color

src/StatusQ/Components/StatusTagSelector.qml

@@ -378,7 +378,6 @@ Item {
         }
         contentItem: ListView {
             id: userListView
-            objectName: "tagSelectorUserList"
             anchors {
                 fill: parent
                 topMargin: 16

src/StatusQ/Components/private/statusMessage/StatusEditMessage.qml

@@ -28,7 +28,7 @@ Item {
                 width: editText.width
                 placeholderText: ""
                 input.text: msgText
-                maximumHeight: 40
+                input.implicitHeight: 40
             }
         }
         RowLayout {

src/StatusQ/Components/qmldir

@@ -1,7 +1,6 @@
 module StatusQ.Components
 
 StatusAddress 0.1 StatusAddress.qml
-StatusAddressPanel 0.1 StatusAddressPanel.qml
 StatusBadge 0.1 StatusBadge.qml
 StatusChatInfoToolBar 0.1 StatusChatInfoToolBar.qml
 StatusChatList 0.1 StatusChatList.qml
@@ -40,4 +39,3 @@ StatusCommunityCard 0.1 StatusCommunityCard.qml
 StatusCommunityTags 0.1 StatusCommunityTags.qml
 StatusItemSelector 0.1 StatusItemSelector.qml
 StatusCard 0.1 StatusCard.qml
-StatusDatePicker 0.1 StatusDatePicker.qml

src/StatusQ/Controls/StatusAccountSelector.qml

@@ -8,17 +8,17 @@ import StatusQ.Core.Theme 0.1
 import StatusQ.Core.Utils 0.1
 import StatusQ.Controls 0.1
 
-import SortFilterProxyModel 0.2
-
 Item {
     id: root
-
     property string label: "Choose account"
     property bool showAccountDetails: !!selectedAccount
     property var accounts
     property var selectedAccount
     property string currency: "usd"
-
+    property alias selectField: select
+    implicitWidth: 448
+    height: select.height +
+            (selectedAccountDetails.visible ? selectedAccountDetails.height + selectedAccountDetails.anchors.topMargin : 0)
     // set to asset symbol to display asset's balance top right
     // NOTE: if this asset is not selected as a wallet token in the UI, then
     // nothing will be displayed
@@ -27,10 +27,10 @@ Item {
     property double minRequiredAssetBalance: 0
     property int dropdownWidth: width
     property int chainId: 0
+    property alias dropdownAlignment: select.menuAlignment
     property bool isValid: true
     property bool readOnly: false
 
-
     property var assetBalanceTextFn: function (foundValue) {
         return "Balance: " + (parseFloat(foundValue) === 0.0 ? "0" : Utils.stripTrailingZeros(foundValue))
     }
@@ -51,23 +51,18 @@ Item {
         return root.isValid
     }
 
-    implicitWidth: 448
-    implicitHeight: comboBox.height +
-                    (selectedAccountDetails.visible ? selectedAccountDetails.height + selectedAccountDetails.anchors.topMargin
-                                                    : 0)
-
     onSelectedAccountChanged: {
         if (!selectedAccount) {
             return
         }
         if (selectedAccount.color) {
-            d.selectedIconColor = Utils.getThemeAccountColor(selectedAccount.color, Theme.palette.userCustomizationColors) || Theme.palette.userCustomizationColors[0]
+            selectedIconImg.color = Utils.getThemeAccountColor(selectedAccount.color, Theme.palette.userCustomizationColors) || Theme.palette.userCustomizationColors[0]
         }
         if (selectedAccount.name) {
-            d.selectedText = selectedAccount.name
+            selectedTextField.text = selectedAccount.name
         }
         if (selectedAccount.address) {
-            textSelectedAddress.text = selectedAccount.address
+            textSelectedAddress.text = selectedAccount.address  + " •"
         }
         if (selectedAccount.currencyBalance) {
             textSelectedAddressFiatBalance.text = selectedAccount.currencyBalance + " " + currency.toUpperCase()
@@ -92,20 +87,14 @@ Item {
         txtAssetSymbol.text = " " + assetFound.symbol
     }
 
-    QtObject {
-        id: d
-        property color selectedIconColor: "transparent"
-        property string selectedText: ""
-    }
-
     StatusBaseText {
         id: txtAssetBalance
         visible: root.assetFound !== undefined
-        anchors.bottom: comboBox.top
+        anchors.bottom: select.top
         anchors.bottomMargin: -18
         anchors.right: txtAssetSymbol.left
-        anchors.left: comboBox.left
-        anchors.leftMargin: comboBox.width / 2.5
+        anchors.left: select.left
+        anchors.leftMargin: select.width / 2.5
 
         color: !root.isValid ? Theme.palette.dangerColor1 : Theme.palette.baseColor1
         elide: Text.ElideRight
@@ -127,7 +116,6 @@ Item {
             onExited: assetTooltip.visible = false
         }
     }
-
     StatusBaseText {
         id: txtAssetSymbol
         visible: txtAssetBalance.visible
@@ -138,150 +126,153 @@ Item {
         font.pixelSize: 13
         height: txtAssetBalance.height
     }
-
-    StatusComboBox {
-        id: comboBox
-
+    StatusSelect {
+        id: select
         label: root.label
+        model: root.accounts
         width: parent.width
-
-        model: SortFilterProxyModel {
-            sourceModel: root.accounts
-            filters: [
-                ValueFilter {
-                    roleName: "walletType"
-                    value: root.watchWalletType
-                    inverted: true
-                }
-            ]
-        }
-        contentItem: RowLayout {
-            spacing: 8
+        menuAlignment: StatusSelect.MenuAlignment.Left
+        selectMenu.delegate: menuItem
+        selectMenu.width: dropdownWidth
+        selectedItemComponent: Item {
+            anchors.fill: parent
 
             StatusIcon {
-                Layout.alignment: Qt.AlignVCenter
-                Layout.preferredWidth: 20
-                Layout.preferredHeight: 20
+                id: selectedIconImg
+                anchors.left: parent.left
+                anchors.leftMargin: 16
+                anchors.verticalCenter: parent.verticalCenter
+                width: 20
+                height: 20
                 icon: "filled-account"
-                color: d.selectedIconColor
             }
 
             StatusBaseText {
+                id: selectedTextField
                 elide: Text.ElideRight
-                Layout.fillWidth: true
-                Layout.fillHeight: true
+                anchors.left: selectedIconImg.right
+                anchors.leftMargin: 8
+                anchors.right: parent.right
+                anchors.rightMargin: select.selectedItemRightMargin
+                anchors.verticalCenter: parent.verticalCenter
                 font.pixelSize: 15
                 verticalAlignment: Text.AlignVCenter
+                height: 22
                 color: Theme.palette.directColor1
-                text: d.selectedText
             }
         }
+    }
 
-        delegate: StatusItemDelegate {
-            highlighted: index === comboBox.control.highlightedIndex
-            width: comboBox.width
-            padding: 16
+    Row {
+        id: selectedAccountDetails
+        visible: root.showAccountDetails
+        anchors.top: select.bottom
+        anchors.topMargin: 8
+        anchors.left: parent.left
+        anchors.leftMargin: 2
 
-            onClicked: {
-                // WARNING: Settings comboBox value from delegate is wrong.
-                //          ComboBox must have a single role as "value"
-                //          This should be refactored later. Probably roleValue should be 'address'.
-                //          All other needed values should be retrived from model by the user of component.
-                root.selectedAccount = { address, name, color: model.color, assets, currencyBalance };
-            }
+        StatusBaseText {
+            id: textSelectedAddress
+            font.pixelSize: 12
+            elide: Text.ElideMiddle
+            width: 90
+            color: Theme.palette.baseColor1
+        }
+        StatusBaseText {
+            id: textSelectedAddressFiatBalance
+            font.pixelSize: 12
+            color: Theme.palette.baseColor1
+        }
+    }
+
+    Component {
+        id: menuItem
+        MenuItem {
+            id: itemContainer
+            visible: walletType !== root.watchWalletType
+            property bool isFirstItem: index === 0
+            property bool isLastItem: index === accounts.rowCount() - 1
 
             Component.onCompleted: {
-                // WARNING: Same here, this is wrong, check comment above.
-                if (!root.selectedAccount && index === 0) {
+                if (!root.selectedAccount && isFirstItem) {
                     root.selectedAccount = { address, name, color: model.color, assets, currencyBalance }
                 }
             }
 
-            contentItem: RowLayout {
-                spacing: 0
+            height: walletType === root.watchWalletType ? 0 : (accountName.height + 14 + accountAddress.height + 14)
 
-                StatusIcon {
-                    id: iconImg
-                    Layout.preferredWidth: 20
-                    Layout.preferredHeight: 20
-                    icon: "filled-account"
-                    color: Utils.getThemeAccountColor(model.color, Theme.palette.userCustomizationColors) ||
-                           Theme.palette.userCustomizationColors[0]
-                }
+            StatusIcon {
+                id: iconImg
+                anchors.left: parent.left
+                anchors.leftMargin: 16
+                anchors.verticalCenter: parent.verticalCenter
+                width: 20
+                height: 20
+                icon: "filled-account"
+                color: Utils.getThemeAccountColor(model.color, Theme.palette.userCustomizationColors) || Theme.palette.userCustomizationColors[0]
+            }
 
-                ColumnLayout {
-                    id: column
-                    Layout.fillWidth: true
-                    Layout.leftMargin: 14
-                    Layout.rightMargin: 8
-                    spacing: 0
+            Column {
+                id: column
+                anchors.left: iconImg.right
+                anchors.leftMargin: 14
+                anchors.right: txtFiatBalance.left
+                anchors.rightMargin: 8
+                anchors.verticalCenter: parent.verticalCenter
 
-                    StatusBaseText {
-                        id: accountName
-                        Layout.fillWidth: true
-                        text: model.name
-                        elide: Text.ElideRight
-                        font.pixelSize: 15
-                        color: Theme.palette.directColor1
-                    }
-
-                    StatusBaseText {
-                        id: accountAddress
-                        Layout.fillWidth: true
-                        Layout.maximumWidth: 80
-                        text: address
-                        elide: Text.ElideMiddle
-                        color: Theme.palette.baseColor1
-                        font.pixelSize: 12
-                    }
-                }
                 StatusBaseText {
-                    id: txtFiatBalance
-                    Layout.rightMargin: 4
+                    id: accountName
+                    text: model.name
+                    elide: Text.ElideRight
                     font.pixelSize: 15
-                    text: currencyBalance
+                    anchors.left: parent.left
+                    anchors.right: parent.right
+                    height: 22
                     color: Theme.palette.directColor1
                 }
+
                 StatusBaseText {
-                    id: fiatCurrencySymbol
-                    font.pixelSize: 15
+                    id: accountAddress
+                    text: address
+                    elide: Text.ElideMiddle
+                    width: 80
                     color: Theme.palette.baseColor1
-                    text: root.currency.toUpperCase()
+                    font.pixelSize: 12
+                    height: 16
+                }
+            }
+            StatusBaseText {
+                id: txtFiatBalance
+                anchors.right: fiatCurrencySymbol.left
+                anchors.rightMargin: 4
+                anchors.verticalCenter: parent.verticalCenter
+                font.pixelSize: 15
+                height: 22
+                text: currencyBalance
+                color: Theme.palette.directColor1
+            }
+            StatusBaseText {
+                id: fiatCurrencySymbol
+                anchors.right: parent.right
+                anchors.rightMargin: 16
+                anchors.verticalCenter: parent.verticalCenter
+                font.pixelSize: 15
+                height: 22
+                color: Theme.palette.baseColor1
+                text: root.currency.toUpperCase()
+            }
+            background: Rectangle {
+                color: itemContainer.highlighted ? Theme.palette.statusSelect.menuItemHoverBackgroundColor : Theme.palette.statusSelect.menuItemBackgroundColor
+            }
+            MouseArea {
+                cursorShape: Qt.PointingHandCursor
+                anchors.fill: itemContainer
+                onClicked: {
+                    root.selectedAccount = { address, name, color: model.color, assets, currencyBalance }
+                    select.selectMenu.close()
                 }
             }
         }
     }
-
-    RowLayout {
-        id: selectedAccountDetails
-        visible: root.showAccountDetails
-        anchors.top: comboBox.bottom
-        anchors.topMargin: 8
-        anchors.left: parent.left
-        anchors.leftMargin: 2
-        anchors.right: parent.right
-        anchors.rightMargin: 4
-
-        spacing: 2
-
-        StatusBaseText {
-            id: textSelectedAddress
-            Layout.maximumWidth: 80
-            font.pixelSize: 12
-            elide: Text.ElideMiddle
-            color: Theme.palette.baseColor1
-        }
-        StatusBaseText {
-            font.pixelSize: 12
-            color: Theme.palette.baseColor1
-            text: "•"
-        }
-        StatusBaseText {
-            id: textSelectedAddressFiatBalance
-            Layout.fillWidth: true
-            font.pixelSize: 12
-            color: Theme.palette.baseColor1
-        }
-    }
 }
 

src/StatusQ/Controls/StatusBackButton.qml

@@ -1,6 +0,0 @@
-import QtQuick 2.14
-import StatusQ.Controls 0.1
-
-StatusRoundButton {
-    icon.name: "arrow-left"
-}

src/StatusQ/Controls/StatusBaseButton.qml

@@ -15,8 +15,7 @@ Rectangle {
 
     enum Type {
         Normal,
-        Danger,
-        Primary
+        Danger
     }
 
     property StatusIconSettings icon: StatusIconSettings {
@@ -146,7 +145,7 @@ Rectangle {
 
                 color: d.textColor
             } // Text
-        } // Row
+        } // Ro
 
 
         onPressed: {
@@ -173,4 +172,5 @@ Rectangle {
             }
         }
     } // Sensor
+
 }

src/StatusQ/Controls/StatusBaseInput.qml

@@ -327,7 +327,6 @@ Item {
                     id: flick
                     Layout.fillWidth: true
                     Layout.fillHeight: true
-                    Layout.leftMargin: !!leftComponentLoader.item ? 8 : 0
                     Layout.topMargin: root.topPadding
                     Layout.bottomMargin: root.bottomPadding
                     contentWidth: edit.paintedWidth
@@ -417,7 +416,6 @@ Item {
                             anchors.fill: parent
                             verticalAlignment: parent.verticalAlignment
                             font.pixelSize: 15
-                            wrapMode: root.multiline ? Text.WordWrap : Text.NoWrap
                             elide: StatusBaseText.ElideRight
                             font.family: Theme.palette.baseFont.name
                             color: root.enabled ? Theme.palette.baseColor1 : Theme.palette.directColor6

src/StatusQ/Controls/StatusButton.qml

@@ -5,18 +5,13 @@ import StatusQ.Core.Theme 0.1
 StatusBaseButton {
     id: statusButton
 
-    normalColor: type === StatusBaseButton.Type.Primary ? Theme.palette.primaryColor1 :
-                                                          type === StatusBaseButton.Type.Normal ? Theme.palette.primaryColor3
-                                                                                                : Theme.palette.dangerColor3
-    hoverColor: type === StatusBaseButton.Type.Primary ? Theme.palette.hoverColor(normalColor) :
-                                                         type === StatusBaseButton.Type.Normal ? Theme.palette.primaryColor2
-                                                                                               : Theme.palette.dangerColor2
+    normalColor: type === StatusBaseButton.Type.Normal ? Theme.palette.primaryColor3
+                                                       : Theme.palette.dangerColor3
+    hoverColor:  type === StatusBaseButton.Type.Normal ? Theme.palette.primaryColor2
+                                                       : Theme.palette.dangerColor2
     disaledColor: Theme.palette.baseColor2
 
-    textColor: type === StatusBaseButton.Type.Primary ? Theme.palette.white :
-                                                        type === StatusBaseButton.Type.Normal ? Theme.palette.primaryColor1
-                                                                                              : Theme.palette.dangerColor1
+    textColor: type === StatusBaseButton.Type.Normal ? Theme.palette.primaryColor1
+                                                     : Theme.palette.dangerColor1
     disabledTextColor: Theme.palette.baseColor1
-
-    font.weight: type === StatusBaseButton.Type.Primary ? Font.Medium : Font.Normal
 }

src/StatusQ/Controls/StatusChatInfoButton.qml

@@ -6,7 +6,6 @@ import StatusQ.Components 0.1
 
 Rectangle {
     id: statusChatInfoButton
-    objectName: "chatInfoButton"
 
     implicitWidth: identicon.width +
                    Math.max(

src/StatusQ/Controls/StatusColorRadioButton.qml

@@ -8,21 +8,19 @@ RadioButton {
 
     property string radioButtonColor: ""
     property string selectionColor: StatusColors.colors['white']
-    property int diameter: 48
-    property int selectorDiameter: 20
 
     implicitWidth: 48
     implicitHeight: 48
 
     indicator: Rectangle {
-        implicitWidth: control.diameter
-        implicitHeight: control.diameter
+        implicitWidth: 48
+        implicitHeight: 48
         radius: width/2
         color: radioButtonColor
 
         Rectangle {
-            width: control.selectorDiameter
-            height: control.selectorDiameter
+            width: 20
+            height: 20
             radius: width/2
             color: selectionColor
             border.color: StatusColors.colors['grey3']

src/StatusQ/Controls/StatusColorSelector.qml

@@ -2,28 +2,36 @@ import QtQuick 2.13
 import QtQuick.Controls 2.13
 import StatusQ.Controls 0.1
 
-StatusComboBox {
-    id: root
+Item {
+  id: root
+  property string selectedColor
+  property string label: "Color"
+  property var model
+  height: accountColorInput.height
+  implicitWidth: 448
 
-    label: qsTr("Color")
+  StatusSelect {
+      id: accountColorInput
+      bgColor: selectedColor
+      label: root.label
+      model: root.model
 
-    control.popup.horizontalPadding: 0
-
-    contentItem: null
-
-    control.background: Rectangle {
-        implicitWidth: 448
-        radius: 8
-        color: root.control.currentValue
-    }
-
-    delegate: StatusItemDelegate {
-        width: parent.width
-        background: Rectangle {
-            width: parent.width
-            implicitHeight: 52
-            color: modelData
-        }
-    }
+      selectMenu.delegate: Component {
+          MenuItem {
+              property bool isFirstItem: index === 0
+              property bool isLastItem: index === root.model.length - 1
+              height: 52
+              width: parent.width
+              padding: 10
+              onTriggered: function () {
+                  const selectedColor = root.model[index]
+                  root.selectedColor = selectedColor
+              }
+              background: Rectangle {
+                  color: root.model[index] || "transparent"
+              }
+          }
+      }
+  }
 }
 

src/StatusQ/Controls/StatusColorSelectorGrid.qml

@@ -12,9 +12,6 @@ Column {
     property alias title: title
     property alias columns: grid.columns
 
-    property int diameter: 48
-    property int selectorDiameter: 20
-
     property int selectedColorIndex: 0
     property string selectedColor: ""
     property var model:[ StatusColors.colors['black'],
@@ -49,10 +46,6 @@ Column {
         Repeater {
             model: root.model
             delegate: StatusColorRadioButton {
-                implicitWidth: root.diameter
-                implicitHeight: root.diameter
-                diameter: root.diameter
-                selectorDiameter: root.selectorDiameter
                 checked: index === selectedColorIndex
                 radioButtonColor: root.model[index] || "transparent"
                 onCheckedChanged: {

src/StatusQ/Controls/StatusComboBox.qml

@@ -1,158 +0,0 @@
-import QtQuick 2.14
-import QtQuick.Window 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Layouts 1.14
-import QtGraphicalEffects 1.13
-
-import StatusQ.Core 0.1
-import StatusQ.Core.Theme 0.1
-import StatusQ.Popups 0.1
-
-import QtQuick.Templates 2.14 as T
-
-Item {
-    id: root
-
-    property alias control: comboBox
-    property alias model: comboBox.model
-    property alias delegate: comboBox.delegate
-    property alias contentItem: comboBox.contentItem
-
-    property alias currentIndex: comboBox.currentIndex
-    property alias currentValue: comboBox.currentValue
-
-    property alias label: labelItem.text
-    property alias validationError: validationErrorItem.text
-
-    implicitWidth: layout.implicitWidth
-    implicitHeight: layout.implicitHeight
-
-    LayoutMirroring.childrenInherit: true
-
-    ColumnLayout {
-        id: layout
-
-        anchors.fill: parent
-        spacing: 0
-
-        StatusBaseText {
-            id: labelItem
-            Layout.fillWidth: true
-            visible: !!text
-            font.pixelSize: 15
-            color: root.enabled ? Theme.palette.directColor1 : Theme.palette.baseColor1
-        }
-
-        ComboBox {
-            id: comboBox
-
-            property color bgColor: Theme.palette.baseColor2
-            property color bgColorHover: bgColor
-
-            Layout.fillWidth: true
-            Layout.fillHeight: true
-            Layout.topMargin: labelItem.visible ? 7 : 0
-
-            enabled: root.enabled
-
-            font.family: Theme.palette.baseFont.name
-            font.pixelSize: 14
-
-            padding: 16
-            spacing: 16
-
-            background: Rectangle {
-                implicitHeight: 56
-                implicitWidth: 448
-                color: Theme.palette.baseColor2
-                radius: 8
-                border.width: !!root.validationError || comboBox.hovered || comboBox.down || comboBox.activeFocus ? 1 : 0
-                border.color: !!root.validationError
-                              ? Theme.palette.dangerColor1
-                              : comboBox.activeFocus
-                                ? Theme.palette.primaryColor1
-                                : comboBox.hovered
-                                  ? Theme.palette.primaryColor2
-                                  : "transparent"
-            }
-
-            contentItem: StatusBaseText {
-                font: comboBox.font
-                verticalAlignment: Text.AlignVCenter
-                elide: Text.ElideRight
-                text: comboBox.displayText
-                color: root.enabled ? Theme.palette.directColor1 : Theme.palette.baseColor1
-            }
-
-            indicator: StatusIcon {
-                x: comboBox.mirrored ? comboBox.padding : comboBox.width - width - comboBox.padding
-                y: comboBox.topPadding + (comboBox.availableHeight - height) / 2
-                width: 24
-                height: 24
-                icon: "chevron-down"
-                color: Theme.palette.baseColor1
-            }
-
-            popup: Popup {
-                closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutsideParent
-                y: comboBox.height + 8
-
-                width: comboBox.width
-                height: Math.min(implicitContentHeight + topPadding + bottomPadding,
-                                 comboBox.Window.height - topMargin - bottomMargin)
-                margins: 8
-
-                padding: 1
-                verticalPadding: 8
-
-                background: Rectangle {
-                    id: backgroundItem
-                    color: Theme.palette.statusSelect.menuItemBackgroundColor
-                    radius: 8
-                    border.color: Theme.palette.baseColor2
-                    layer.enabled: true
-                    layer.effect: DropShadow {
-                        horizontalOffset: 0
-                        verticalOffset: 4
-                        radius: 12
-                        samples: 25
-                        spread: 0.2
-                        color: Theme.palette.dropShadow
-                    }
-                }
-
-                contentItem: StatusListView {
-                    id: listView
-
-                    implicitWidth: contentWidth
-                    implicitHeight: contentHeight
-
-                    model: comboBox.popup.visible ? comboBox.delegateModel : null
-                    currentIndex: comboBox.highlightedIndex
-                }
-            }
-
-            delegate: StatusItemDelegate {
-                width: comboBox.width
-                highlighted: comboBox.highlightedIndex === index
-                font: comboBox.font
-                text: control.textRole ? (Array.isArray(control.model)
-                                          ? modelData[control.textRole]
-                                          : model[control.textRole])
-                                       : modelData
-            }
-        }
-
-
-        StatusBaseText {
-            id: validationErrorItem
-            Layout.fillWidth: true
-            Layout.topMargin: 11
-            visible: !!text
-            font.pixelSize: 12
-            color: Theme.palette.dangerColor1
-            horizontalAlignment: TextEdit.AlignRight
-            wrapMode: Text.WordWrap
-        }
-    }
-}

src/StatusQ/Controls/StatusCommunityTag.qml

@@ -33,8 +33,6 @@ Rectangle {
         anchors.centerIn: parent
 
         StatusEmoji {
-            width: 18
-            height: 18
             emojiId: root.emoji != "" ? Emoji.iconHex(root.emoji) : ""
             anchors.verticalCenter: parent.verticalCenter
         }
@@ -46,9 +44,7 @@ Rectangle {
 
         StatusBaseText {
             anchors.verticalCenter: parent.verticalCenter
-            font.pixelSize: 15
-            font.weight: Font.DemiBold
-            font.capitalization: Font.AllLowercase
+            font.pixelSize: 13
             color: root.enabled ? Theme.palette.primaryColor1 : Theme.palette.baseColor1
             text: root.name
         }

src/StatusQ/Controls/StatusFloatingButtonsSelector.qml

@@ -42,14 +42,6 @@ import StatusQ.Popups 0.1
 Row {
     id: floatingButtons
 
-    /*!
-       \qmlproperty repeater
-        This property represents the repeater of selectable items shown to the user.
-        Can be used to assign objectName to the repeater
-        \endqml
-    */
-    readonly property alias repeater: itemSelectionRepeater
-
     /*!
        \qmlproperty delegate
         This property represents the delegate of selectable items shown to the user.
@@ -115,8 +107,7 @@ Row {
             bottomPadding: 0
             defaultLeftPadding: 4
             defaultRightPadding: 4
-            hoverColor: Theme.palette.statusFloatingButtonHighlight
-            normalColor: Theme.palette.baseColor3
+            normalColor: "transparent"
             icon.name: "more"
             icon.background.color: "transparent"
             onClicked: popupMenu.popup(parent.x, y + height + 8)

src/StatusQ/Controls/StatusImageCrop.qml

@@ -303,6 +303,8 @@ Item {
 
         anchors.fill: parent
 
+        layer.enabled: true
+
         property bool widthFit: (root.width / root.aspectRatio) <= root.height
         // Window width
         property real wW: widthFit ? root.width : root.height * root.aspectRatio
@@ -310,31 +312,22 @@ Item {
         property real wH: widthFit ? root.width / root.aspectRatio : root.height
 
         onPaint: {
-            const wSize = Qt.size(wW, wH)
-            const contentSize = canvasSize
-            const clearSize = Qt.size(Math.ceil(canvasSize.width), Math.ceil(canvasSize.height))
-            const r = root.radius
-
             var ctx = getContext("2d")
-
             ctx.save()
-
-            ctx.clearRect(0, 0, clearSize.width, clearSize.height)
-
+            // TODO: observed drawing artefacts at the edge. Draw one pixel more for now until root cause is found
+            ctx.clearRect(0, 0, width + 1, height + 1)
             // Fill all with wallColor in order to clip the window from it
             ctx.fillStyle = Qt.rgba(root.wallColor.r, root.wallColor.g, root.wallColor.b, root.wallTransparency)
-            ctx.fillRect(0, 0, clearSize.width, clearSize.height)
-
+            ctx.fillRect(0, 0, width + 1, height + 1)
             // Cut opaque new pixels from background
             ctx.globalCompositeOperation = "source-out"
-
             // Draw the window
             ctx.beginPath()
-            const cW = Qt.rect((contentSize.width - wSize.width)/2, (contentSize.height - wSize.height)/2, wSize.width, wSize.height)
+            const cW = Qt.rect((width - wW)/2, (height - wH)/2, wW, wH)
             if(root.windowStyle === StatusImageCrop.WindowStyle.Rounded)
                 ctx.ellipse(cW.x, cW.y, cW.width, cW.height)
             else if(root.windowStyle === StatusImageCrop.WindowStyle.Rectangular)
-                ctx.roundedRect(cW.x, cW.y, cW.width, cW.height, r, r)
+                ctx.roundedRect(cW.x, cW.y, cW.width, cW.height, root.radius, root.radius)
             ctx.fill()
             ctx.restore()
         }

src/StatusQ/Controls/StatusInput.qml

@@ -94,11 +94,6 @@ Item {
         \qmlproperty string StatusInput::label
         This property sets the label text.
     */
-    property int labelPadding: 8
-    /*!
-        \qmlproperty string StatusInput::label
-        This property sets the label text.
-    */
     property string label: ""
     /*!
         \qmlproperty string StatusInput::secondaryLabel
@@ -137,14 +132,14 @@ Item {
     property alias bottomPadding: statusBaseInput.bottomPadding
     /*!
         \qmlproperty real StatusInput::minimumHeight
-        This property sets the minimum height. Default value is 44px.
+        This property sets the minimum height.
     */
-    property real minimumHeight: 44
+    property real minimumHeight: 0
     /*!
         \qmlproperty alias StatusInput::maximumHeight
-        This property sets the maximum height. Default value is 44px.
+        This property sets the maximum height.
     */
-    property real maximumHeight: 44
+    property real maximumHeight: 0
     /*!
         \qmlproperty list StatusBaseInput::validators
         This property sets the list of validators to be considered.
@@ -254,8 +249,9 @@ Item {
         \qmlmethod
         This function validates the text input's text.
     */
-    function validate(force) {
-        if (!force && !statusBaseInput.dirty && validationMode === StatusInput.ValidationMode.OnlyWhenDirty) {
+    function validate() {
+
+        if (!statusBaseInput.dirty && validationMode === StatusInput.ValidationMode.OnlyWhenDirty) {
             return
         }
         statusBaseInput.valid = true
@@ -352,7 +348,7 @@ Item {
     }
 
     implicitWidth: 448
-    implicitHeight: inputLayout.implicitHeight
+    implicitHeight: (internal.inputHeight + topRow.height + errorMessage.height + (2*inputLayout.spacing))
 
     Component.onCompleted: {
         validate()
@@ -361,13 +357,11 @@ Item {
     ColumnLayout {
         id: inputLayout
         anchors.fill: parent
-        spacing: 0
-
+        spacing: ((topRow.height > 0) || (errorMessage.height > 0)) ? 8 : 0
         RowLayout {
             id: topRow
             Layout.fillWidth: true
-            Layout.preferredHeight: (!!root.label || !!root.secondaryLabel || root.charLimit > 0) ? 22 : 0
-
+            Layout.preferredHeight: (!!root.label || !!root.secondaryLabel || root.charLimit > 0) ? 22 :0
             StatusBaseText {
                 id: label
                 visible: !!text
@@ -407,8 +401,6 @@ Item {
             id: statusBaseInput
             implicitWidth: parent.width
             implicitHeight: internal.inputHeight
-            Layout.alignment: Qt.AlignTop
-            Layout.topMargin: (topRow.height > 0) ? labelPadding : 0
             maximumLength: root.charLimit
             onTextChanged: root.validate()
             Keys.forwardTo: [root]
@@ -423,22 +415,12 @@ Item {
 
         StatusBaseText {
             id: errorMessage
-            visible: {
-                if (!text)
-                    return false;
-
-                if ((root.validationMode == StatusInput.ValidationMode.OnlyWhenDirty && statusBaseInput.dirty) ||
-                    root.validationMode == StatusInput.ValidationMode.Always)
-                    return !statusBaseInput.valid;
-
-                return false;
-            }
+            visible: !!text && !statusBaseInput.valid
+            height: visible ? contentHeight : 0
             font.pixelSize: 12
             color: Theme.palette.dangerColor1
+            Layout.alignment: Qt.AlignVCenter
             wrapMode: Text.WordWrap
-            horizontalAlignment: Text.AlignRight
-            Layout.topMargin: 8
-            Layout.fillWidth: true
         }
     }
 }

src/StatusQ/Controls/StatusItemDelegate.qml

@@ -1,49 +0,0 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-import QtQuick.Layouts 1.14
-
-import StatusQ.Core 0.1
-import StatusQ.Core.Theme 0.1
-import StatusQ.Controls 0.1
-
-ItemDelegate {
-    id: root
-
-    padding: 8
-    spacing: 8
-
-    icon.width: 16
-    icon.height: 16
-
-    contentItem: RowLayout {
-        spacing: root.spacing
-
-        StatusIcon {
-            id: iconItem
-            Layout.alignment: Qt.AlignVCenter
-            visible: !!icon
-            icon: root.icon.name
-            color: root.enabled ? root.icon.color : Theme.palette.baseColor1
-            width: root.icon.width
-            height: root.icon.height
-        }
-
-        StatusBaseText {
-            id: textItem
-            Layout.fillWidth: true
-            Layout.fillHeight: true
-            font: root.font
-            text: root.text
-            horizontalAlignment: Text.AlignLeft
-            verticalAlignment: Text.AlignVCenter
-            elide: Text.ElideRight
-            color: root.enabled ? Theme.palette.directColor1 : Theme.palette.baseColor1
-        }
-    }
-
-    background: Rectangle {
-        color: root.highlighted
-                 ? Theme.palette.statusPopupMenu.hoverBackgroundColor
-                 : "transparent"
-    }
-}

src/StatusQ/Controls/StatusSeedPhraseInput.qml

@@ -99,6 +99,7 @@ Item {
     signal editClicked()
 
     function setWord(word) {
+        seedWordInput.ignoreTextChange = true
         seedWordInput.input.edit.text = word
     }
 
@@ -109,11 +110,11 @@ Item {
     }
 
     StatusInput {
-        id: seedWordInput
+        property bool ignoreTextChange: false
 
+        id: seedWordInput
         implicitWidth: parent.width
         input.leftComponent: StatusBaseText {
-            rightPadding: 6
             text: root.leftComponentText
             color: seedWordInput.input.edit.activeFocus ?
                    Theme.palette.primaryColor1 : Theme.palette.baseColor1
@@ -121,6 +122,10 @@ Item {
         }
         input.acceptReturn: true
         onTextChanged: {
+            if (ignoreTextChange) {
+                ignoreTextChange = false
+                return
+            }
             filteredList.clear();
             let textToCheck = text.trim()
             if (textToCheck !== "") {

src/StatusQ/Controls/StatusSelect.qml

@@ -8,14 +8,11 @@ import StatusQ.Core.Theme 0.1
 import StatusQ.Popups 0.1
 
 Item {
-    id: root
-
     enum MenuAlignment {
         Left,
         Right,
         Center
     }
-
     property string label: ""
     readonly property bool hasLabel: label !== ""
     property color bgColor: Theme.palette.baseColor2
@@ -32,12 +29,10 @@ Item {
     property string validationError: ""
     property alias validationErrorAlignment: validationErrorText.horizontalAlignment
     property int validationErrorTopMargin: 11
-
     implicitWidth: 448
 
-    implicitHeight: inputRectangle.height +
-                    (hasLabel ? inputLabel.height + labelMargin : 0) +
-                    (!!validationError ? (validationErrorText.height + validationErrorTopMargin) : 0)
+    id: root
+    height: inputRectangle.height + (hasLabel ? inputLabel.height + labelMargin : 0) + (!!validationError ? (validationErrorText.height + validationErrorTopMargin) : 0)
 
     StatusBaseText {
         id: inputLabel
@@ -106,6 +101,7 @@ Item {
         id: selectMenu
         closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutsideParent
         width: parent.width
+        clip: true
 
         Repeater {
             id: menuItems

src/StatusQ/Controls/StatusSlider.qml

@@ -25,14 +25,13 @@ Slider {
     implicitHeight: Math.max(handle.implicitHeight,
                              background.implicitHeight + decorationContainer.height)
 
-    horizontalPadding: 0
+    leftPadding: 0
 
     background: Rectangle {
         id: bgRect
 
         x: root.leftPadding
-        anchors.verticalCenter: root.verticalCenter
-
+        y: root.topPadding
         implicitWidth: 100
         implicitHeight: bgHeight
         width: root.availableWidth
@@ -55,7 +54,7 @@ Slider {
     } // background
 
     handle: Rectangle {
-        x: root.leftPadding + root.visualPosition * (root.availableWidth - width)
+        x: root.leftPadding + root.visualPosition * (root.availableWidth - width / 2)
         anchors.verticalCenter: bgRect.verticalCenter
         color: root.handleColor
         implicitWidth: root.handleSize

src/StatusQ/Controls/StatusTabButton.qml

@@ -34,7 +34,7 @@ TabButton {
 
     contentItem: Item {
         implicitWidth: contentItemGrid.implicitWidth
-        implicitHeight: contentItemGrid.implicitHeight + 15
+        implicitHeight: contentItemGrid.implicitHeight + 11
 
         RowLayout {
             id: contentItemGrid

src/StatusQ/Controls/StatusTextArea.qml

@@ -1,111 +0,0 @@
-import QtQuick 2.14
-import QtQuick.Controls 2.14
-
-import StatusQ.Core.Theme 0.1
-
-/*!
-      \qmltype StatusTextArea
-      \inherits Item
-      \inqmlmodule StatusQ.Controls
-      \since StatusQ.Controls 0.1
-      \brief Displays a multi line text input component.
-      Inherits \l{https://doc.qt.io/qt-5/qml-qtquick-controls2-textarea.html}{QQC.TextArea}.
-
-      The \c StatusTextArea displays a styled TextArea for users to type multiple lines of text.
-      For example:
-
-      \qml
-      StatusTextArea {
-        width: parent.width
-        placeholderText: qsTr("Search")
-      }
-      \endqml
-
-      Note: if you want to alter the TAB key behavior, just override it like this:
-      \qml
-      StatusTextArea {
-        width: parent.width
-        KeyNavigation.tab: otherItemThatAcceptsFocus
-      }
-      \endqml
-
-      Note 2: if scrolling is required, just wrap the StatusTextArea inside a StatusScrollView, e.g.:
-      \qml
-      StatusScrollView {
-        padding: 0 // use our own (StatusTextArea) padding
-        width: parent.width
-        height: 120
-        TextArea.flickable: longTextArea
-        StatusTextArea {
-          id: longTextArea
-          text: "Very\nlong\ntext\nwith\nmany\nlinebreaks"
-        }
-      }
-      \endqml
-
-      For a list of components available see StatusQ.
-*/
-
-TextArea {
-    id: root
-
-    /*!
-        \qmlproperty bool StatusTextArea::valid
-        This property sets the valid state. Default value is true.
-    */
-    property bool valid: true
-
-    implicitWidth: 448 // by design
-    implicitHeight: 108
-
-    leftPadding: 16
-    rightPadding: 16
-    topPadding: 10
-    bottomPadding: 10
-
-    color: Theme.palette.directColor1
-    selectedTextColor: color
-    selectionColor: Theme.palette.primaryColor2
-    placeholderTextColor: root.enabled ? Theme.palette.baseColor1 : Theme.palette.directColor9
-
-    font {
-        family: Theme.palette.baseFont.name
-        pixelSize: 15
-    }
-
-    selectByMouse: true
-    wrapMode: TextEdit.WordWrap
-
-    activeFocusOnTab: enabled
-    KeyNavigation.priority: KeyNavigation.BeforeItem
-
-    background: Rectangle {
-        radius: 8
-        color: root.enabled ? Theme.palette.baseColor2 : Theme.palette.baseColor4
-        border.width: 1
-        border.color: {
-            if (!root.valid)
-                return Theme.palette.dangerColor1
-            if (root.activeFocus)
-                return Theme.palette.primaryColor1
-            if (root.hovered)
-                return Theme.palette.primaryColor2
-            return "transparent"
-        }
-    }
-
-    cursorDelegate: Rectangle {
-        color: Theme.palette.primaryColor1
-        implicitWidth: 2
-        implicitHeight: 22
-        radius: 1
-        visible: root.cursorVisible
-
-        SequentialAnimation on visible {
-            loops: Animation.Infinite
-            running: root.cursorVisible
-            PropertyAnimation { to: false; duration: 600 }
-            PropertyAnimation { to: true; duration: 600 }
-        }
-    }
-}

src/StatusQ/Controls/qmldir

@@ -47,7 +47,3 @@ StatusActivityCenterButton 0.1 StatusActivityCenterButton.qml
 StatusDropdown 0.1 StatusDropdown.qml
 StatusIconTextButton 0.1 StatusIconTextButton.qml
 StatusScrollBar 0.1 StatusScrollBar.qml
-StatusComboBox 0.1 StatusComboBox.qml
-StatusItemDelegate 0.1 StatusItemDelegate.qml
-StatusTextArea 0.1 StatusTextArea.qml
-StatusBackButton 0.1 StatusBackButton.qml

src/StatusQ/Core/StatusListView.qml

@@ -31,9 +31,6 @@ import StatusQ.Controls 0.1
 ListView {
     id: root
 
-    readonly property int availableWidth: width - leftMargin - rightMargin
-    readonly property int availableHeight: height - topMargin - bottomMargin
-
     clip: true
     boundsBehavior: Flickable.StopAtBounds
     maximumFlickVelocity: 2000

src/StatusQ/Core/StatusScrollView.qml

@@ -37,9 +37,17 @@ Flickable {
     property int leftPadding: padding
     property int rightPadding: padding
 
+    property Item background: null
+
     readonly property int availableWidth: width - leftPadding - rightPadding
     readonly property int availableHeight: height - topPadding - bottomPadding
 
+    onBackgroundChanged: {
+        if (background) {
+            background.anchors.fill = root;
+        }
+    }
+
     // NOTE: in Qt6 clip true will be default
     clip: true
     topMargin: topPadding

src/StatusQ/Core/Theme/StatusColors.qml

@@ -62,9 +62,7 @@ QtObject {
         'violet': '#D37EF4',
 
         'yellow': '#FFCA0F',
-        'yellow2': '#EAD27B',
-
-        'blueHijab': '#CDF2FB'
+        'yellow2': '#EAD27B'
     }
 }
 

src/StatusQ/Core/Theme/StatusDarkTheme.qml

@@ -4,7 +4,95 @@ ThemePalette {
 
     name: "dark"
 
-    dropShadow: getColor('black', 0.08)
+    property QtObject baseFont: FontLoader {
+        source: "../../../assets/fonts/Inter/Inter-Regular.otf"
+    }
+
+    property QtObject baseFontThin: FontLoader {
+        source: "../../../assets/fonts/Inter/Inter-Thin.otf"
+    }
+
+    property QtObject baseFontExtraLight: FontLoader {
+        source: "../../../assets/fonts/Inter/Inter-ExtraLight.otf"
+    }
+
+    property QtObject baseFontLight: FontLoader {
+        source: "../../../assets/fonts/Inter/Inter-Light.otf"
+    }
+
+    property QtObject baseFontMedium: FontLoader {
+        source: "../../../assets/fonts/Inter/Inter-Medium.otf"
+    }
+
+    property QtObject baseFontBold: FontLoader {
+        source: "../../../assets/fonts/Inter/Inter-Bold.otf"
+    }
+
+    property QtObject baseFontExtraBold: FontLoader {
+        source: "../../../assets/fonts/Inter/Inter-ExtraBold.otf"
+    }
+
+    property QtObject baseFontBlack: FontLoader {
+        source: "../../../assets/fonts/Inter/Inter-Black.otf"
+    }
+
+    property QtObject monoFont: FontLoader {
+        source: "../../../assets/fonts/InterStatus/InterStatus-Regular.otf"
+    }
+
+    property QtObject monoFontThin: FontLoader {
+        source: "../../../assets/fonts/InterStatus/InterStatus-Thin.otf"
+    }
+
+    property QtObject monoFontExtraLight: FontLoader {
+        source: "../../../assets/fonts/InterStatus/InterStatus-ExtraLight.otf"
+    }
+
+    property QtObject monoFontLight: FontLoader {
+        source: "../../../assets/fonts/InterStatus/InterStatus-Light.otf"
+    }
+
+    property QtObject monoFontMedium: FontLoader {
+        source: "../../../assets/fonts/InterStatus/InterStatus-Medium.otf"
+    }
+
+    property QtObject monoFontBold: FontLoader {
+        source: "../../../assets/fonts/InterStatus/InterStatus-Bold.otf"
+    }
+
+    property QtObject monoFontExtraBold: FontLoader {
+        source: "../../../assets/fonts/InterStatus/InterStatus-ExtraBold.otf"
+    }
+
+    property QtObject monoFontBlack: FontLoader {
+        source: "../../../assets/fonts/InterStatus/InterStatus-Black.otf"
+    }
+
+    property QtObject codeFont: FontLoader {
+        source: "../../../assets/fonts/RobotoMono/RobotoMono-Regular.ttf"
+    }
+
+    property QtObject codeFontThin: FontLoader {
+        source: "../../../assets/fonts/RobotoMono/RobotoMono-Thin.ttf"
+    }
+
+    property QtObject codeFontExtraLight: FontLoader {
+        source: "../../../assets/fonts/RobotoMono/RobotoMono-ExtraLight.ttf"
+    }
+
+    property QtObject codeFontLight: FontLoader {
+        source: "../../../assets/fonts/RobotoMono/RobotoMono-Light.ttf"
+    }
+
+    property QtObject codeFontMedium: FontLoader {
+        source: "../../../assets/fonts/RobotoMono/RobotoMono-Medium.ttf"
+    }
+
+    property QtObject codeFontBold: FontLoader {
+        source: "../../../assets/fonts/RobotoMono/RobotoMono-Bold.ttf"
+    }
+
+    property color dropShadow: getColor('black', 0.08)
 
     baseColor1: getColor('graphite5')
     baseColor2: getColor('graphite4')
@@ -59,8 +147,6 @@ ThemePalette {
     miscColor11: getColor('yellow2')
     miscColor12: getColor('green6')
 
-    statusFloatingButtonHighlight: getColor('blue4', 0.3)
-
     userCustomizationColors: [
         "#AAC6FF",
         "#887AF9",

src/StatusQ/Core/Theme/StatusLightTheme.qml

@@ -4,6 +4,94 @@ ThemePalette {
 
     name: "light"
 
+    property QtObject baseFont: FontLoader {
+        source: "../../../assets/fonts/Inter/Inter-Regular.otf"
+    }
+
+    property QtObject baseFontThin: FontLoader {
+        source: "../../../assets/fonts/Inter/Inter-Thin.otf"
+    }
+
+    property QtObject baseFontExtraLight: FontLoader {
+        source: "../../../assets/fonts/Inter/Inter-ExtraLight.otf"
+    }
+
+    property QtObject baseFontLight: FontLoader {
+        source: "../../../assets/fonts/Inter/Inter-Light.otf"
+    }
+
+    property QtObject baseFontMedium: FontLoader {
+        source: "../../../assets/fonts/Inter/Inter-Medium.otf"
+    }
+
+    property QtObject baseFontBold: FontLoader {
+        source: "../../../assets/fonts/Inter/Inter-Bold.otf"
+    }
+
+    property QtObject baseFontExtraBold: FontLoader {
+        source: "../../../assets/fonts/Inter/Inter-ExtraBold.otf"
+    }
+
+    property QtObject baseFontBlack: FontLoader {
+        source: "../../../assets/fonts/Inter/Inter-Black.otf"
+    }
+
+    property QtObject monoFont: FontLoader {
+        source: "../../../assets/fonts/InterStatus/InterStatus-Regular.otf"
+    }
+
+    property QtObject monoFontThin: FontLoader {
+        source: "../../../assets/fonts/InterStatus/InterStatus-Thin.otf"
+    }
+
+    property QtObject monoFontExtraLight: FontLoader {
+        source: "../../../assets/fonts/InterStatus/InterStatus-ExtraLight.otf"
+    }
+
+    property QtObject monoFontLight: FontLoader {
+        source: "../../../assets/fonts/InterStatus/InterStatus-Light.otf"
+    }
+
+    property QtObject monoFontMedium: FontLoader {
+        source: "../../../assets/fonts/InterStatus/InterStatus-Medium.otf"
+    }
+
+    property QtObject monoFontBold: FontLoader {
+        source: "../../../assets/fonts/InterStatus/InterStatus-Bold.otf"
+    }
+
+    property QtObject monoFontExtraBold: FontLoader {
+        source: "../../../assets/fonts/InterStatus/InterStatus-ExtraBold.otf"
+    }
+
+    property QtObject monoFontBlack: FontLoader {
+        source: "../../../assets/fonts/InterStatus/InterStatus-Black.otf"
+    }
+
+    property QtObject codeFont: FontLoader {
+        source: "../../../assets/fonts/RobotoMono/RobotoMono-Regular.ttf"
+    }
+
+    property QtObject codeFontThin: FontLoader {
+        source: "../../../assets/fonts/RobotoMono/RobotoMono-Thin.ttf"
+    }
+
+    property QtObject codeFontExtraLight: FontLoader {
+        source: "../../../assets/fonts/RobotoMono/RobotoMono-ExtraLight.ttf"
+    }
+
+    property QtObject codeFontLight: FontLoader {
+        source: "../../../assets/fonts/RobotoMono/RobotoMono-Light.ttf"
+    }
+
+    property QtObject codeFontMedium: FontLoader {
+        source: "../../../assets/fonts/RobotoMono/RobotoMono-Medium.ttf"
+    }
+
+    property QtObject codeFontBold: FontLoader {
+        source: "../../../assets/fonts/RobotoMono/RobotoMono-Bold.ttf"
+    }
+
     baseColor1: getColor('grey5')
     baseColor2: getColor('grey4')
     baseColor3: getColor('grey3')
@@ -57,8 +145,6 @@ ThemePalette {
     miscColor11: getColor('brown2')
     miscColor12: getColor('green5')
 
-    statusFloatingButtonHighlight: getColor('blueHijab')
-
     userCustomizationColors: [
         "#2946C4",
         "#887AF9",

src/StatusQ/Core/Theme/Theme.qml

@@ -10,3 +10,5 @@ QtObject {
         palette = theme
     }
 }
+
+

src/StatusQ/Core/Theme/ThemePalette.qml

@@ -6,93 +6,30 @@ QtObject {
 
     property string name
 
-    property var baseFont: FontLoader {
-        source: "../../../assets/fonts/Inter/Inter-Regular.otf"
-    }
+    property FontLoader baseFont
+    property FontLoader baseFontThin
+    property FontLoader baseFontExtraLight
+    property FontLoader baseFontLight
+    property FontLoader baseFontMedium
+    property FontLoader baseFontBold
+    property FontLoader baseFontExtraBold
+    property FontLoader baseFontBlack
 
-    property var baseFontThin: FontLoader {
-        source: "../../../assets/fonts/Inter/Inter-Thin.otf"
-    }
+    property FontLoader monoFont
+    property FontLoader monoFontThin
+    property FontLoader monoFontExtraLight
+    property FontLoader monoFontLight
+    property FontLoader monoFontMedium
+    property FontLoader monoFontBold
+    property FontLoader monoFontExtraBold
+    property FontLoader monoFontBlack
 
-    property var baseFontExtraLight: FontLoader {
-        source: "../../../assets/fonts/Inter/Inter-ExtraLight.otf"
-    }
-
-    property var baseFontLight: FontLoader {
-        source: "../../../assets/fonts/Inter/Inter-Light.otf"
-    }
-
-    property var baseFontMedium: FontLoader {
-        source: "../../../assets/fonts/Inter/Inter-Medium.otf"
-    }
-
-    property var baseFontBold: FontLoader {
-        source: "../../../assets/fonts/Inter/Inter-Bold.otf"
-    }
-
-    property var baseFontExtraBold: FontLoader {
-        source: "../../../assets/fonts/Inter/Inter-ExtraBold.otf"
-    }
-
-    property var baseFontBlack: FontLoader {
-        source: "../../../assets/fonts/Inter/Inter-Black.otf"
-    }
-
-    property var monoFont: FontLoader {
-        source: "../../../assets/fonts/InterStatus/InterStatus-Regular.otf"
-    }
-
-    property var monoFontThin: FontLoader {
-        source: "../../../assets/fonts/InterStatus/InterStatus-Thin.otf"
-    }
-
-    property var monoFontExtraLight: FontLoader {
-        source: "../../../assets/fonts/InterStatus/InterStatus-ExtraLight.otf"
-    }
-
-    property var monoFontLight: FontLoader {
-        source: "../../../assets/fonts/InterStatus/InterStatus-Light.otf"
-    }
-
-    property var monoFontMedium: FontLoader {
-        source: "../../../assets/fonts/InterStatus/InterStatus-Medium.otf"
-    }
-
-    property var monoFontBold: FontLoader {
-        source: "../../../assets/fonts/InterStatus/InterStatus-Bold.otf"
-    }
-
-    property var monoFontExtraBold: FontLoader {
-        source: "../../../assets/fonts/InterStatus/InterStatus-ExtraBold.otf"
-    }
-
-    property var monoFontBlack: FontLoader {
-        source: "../../../assets/fonts/InterStatus/InterStatus-Black.otf"
-    }
-
-    property var codeFont: FontLoader {
-        source: "../../../assets/fonts/RobotoMono/RobotoMono-Regular.ttf"
-    }
-
-    property var codeFontThin: FontLoader {
-        source: "../../../assets/fonts/RobotoMono/RobotoMono-Thin.ttf"
-    }
-
-    property var codeFontExtraLight: FontLoader {
-        source: "../../../assets/fonts/RobotoMono/RobotoMono-ExtraLight.ttf"
-    }
-
-    property var codeFontLight: FontLoader {
-        source: "../../../assets/fonts/RobotoMono/RobotoMono-Light.ttf"
-    }
-
-    property var codeFontMedium: FontLoader {
-        source: "../../../assets/fonts/RobotoMono/RobotoMono-Medium.ttf"
-    }
-
-    property var codeFontBold: FontLoader {
-        source: "../../../assets/fonts/RobotoMono/RobotoMono-Bold.ttf"
-    }
+    property FontLoader codeFont
+    property FontLoader codeFontThin
+    property FontLoader codeFontExtraLight
+    property FontLoader codeFontLight
+    property FontLoader codeFontMedium
+    property FontLoader codeFontBold
 
     property color black: getColor('black')
     property color white: getColor('white')
@@ -100,10 +37,6 @@ QtObject {
     property color dropShadow: getColor('black', 0.12)
     property color backdropColor: getColor('black', 0.4)
 
-    function hoverColor(normalColor) {
-        return theme.name === "light" ? Qt.darker(normalColor, 1.1) : Qt.lighter(normalColor, 1.1)
-    }
-
     property color baseColor1
     property color baseColor2
     property color baseColor3
@@ -157,8 +90,6 @@ QtObject {
     property color miscColor11
     property color miscColor12
 
-    property color statusFloatingButtonHighlight
-
     property var userCustomizationColors: []
 
     property var identiconRingColors: []

src/StatusQ/Core/Utils/Emoji.qml

@@ -19,7 +19,7 @@ QtObject {
         "svg": "svg"
     }
     property string base: Qt.resolvedUrl("../../../assets/twemoji/")
-    property var emojiJSON: EmojiJSON
+
     function parse(text, renderSize = size.small, renderFormat = format.svg) {
         const renderSizes = renderSize.split("x");
         if (!renderSize.includes("x") || renderSizes.length !== 2) {
@@ -43,11 +43,6 @@ QtObject {
             }
         })
     }
-    function iconSource(text) {
-        const parsed = parse(text);
-        const match = parsed.match('src="(.*\.svg).*"');
-        return (match && match.length >= 2) ? match[1] : undefined;
-    }
     function iconId(text) {
         const parsed = parse(text);
         const match = parsed.match('src=".*\/(.+?).svg');

src/StatusQ/Core/Utils/Utils.qml

@@ -150,29 +150,6 @@ QtObject {
             context.stroke();
         }
     }
-
-    function delegateModelSort(srcGroup, dstGroup, lessThan) {
-        const insertPosition = (lessThan, item) => {
-            let lower = 0
-            let upper = dstGroup.count
-            while (lower < upper) {
-                const middle = Math.floor(lower + (upper - lower) / 2)
-                const result = lessThan(item.model, dstGroup.get(middle).model);
-                if (result)
-                    upper = middle
-                else
-                    lower = middle + 1
-            }
-            return lower
-        }
-
-        while (srcGroup.count > 0) {
-            const item = srcGroup.get(0)
-            const index = insertPosition(lessThan, item)
-            item.groups = dstGroup.name
-            dstGroup.move(item.itemsIndex, index)
-        }
-    }
 }
 
 

src/StatusQ/Core/Utils/qmldir

@@ -1,4 +1,5 @@
 module StatusQ.Core.Utils
 
+EmojiJSON 1.0 emojiList.js
 singleton Utils 0.1 Utils.qml
 singleton Emoji 0.1 Emoji.qml

src/StatusQ/Layout/StatusAppNavBar.qml

@@ -21,7 +21,6 @@ Rectangle {
     property int communityTypeValue: -1
     property int navBarButtonSpacing: 12
 
-    property StatusNavBarTabButton navBarCameraButton 
     property StatusNavBarTabButton navBarProfileButton
     property Component regularNavBarButton
     property Component communityNavBarButton
@@ -38,12 +37,6 @@ Rectangle {
         }
     }
 
-    onNavBarCameraButtonChanged: {
-        if (!!navBarCameraButton) {
-            navBarCameraButton.parent = navBarCameraButtonSlot
-        }
-    }
-
     function triggerUpdate(){
         navBarModel.update()
     }
@@ -169,17 +162,6 @@ Rectangle {
         model: navBarModel
     }
 
-    Item {
-        id: navBarCameraButtonSlot
-        anchors.horizontalCenter: parent.horizontalCenter
-        height: visible? statusAppNavBar.navBarProfileButton.height : 0
-        width: visible? statusAppNavBar.navBarProfileButton.width : 0
-        visible: !!statusAppNavBar.navBarCameraButton
-        anchors.bottom: navBarProfileButtonSlot.visible ? navBarProfileButtonSlot.top : parent.bottom
-        anchors.bottomMargin: visible ? 12 : 0
-    }
-
-
     Item {
         id: navBarProfileButtonSlot
         anchors.horizontalCenter: parent.horizontalCenter
@@ -187,6 +169,6 @@ Rectangle {
         width: visible? statusAppNavBar.navBarProfileButton.width : 0
         visible: !!statusAppNavBar.navBarProfileButton
         anchors.bottom: parent.bottom
-        anchors.bottomMargin: visible ? 24 : 0
+        anchors.bottomMargin: visible ? 32 : 0
     }
 }

src/StatusQ/Layout/StatusAppTwoPanelLayout.qml

@@ -5,7 +5,7 @@ import QtQuick.Controls 2.13
 import StatusQ.Core 0.1
 import StatusQ.Core.Theme 0.1
 
-FocusScope {
+Item {
     id: statusAppTwoPanelLayout
 
     implicitWidth: 822

src/StatusQ/Popups/Dialog/StatusDialog.qml

@@ -22,7 +22,10 @@ Dialog {
         color: Theme.palette.backdropColor
     }
 
-    background: StatusDialogBackground {}
+    background: Rectangle {
+        color: Theme.palette.statusModal.backgroundColor
+        radius: 8
+    }
 
     header: StatusDialogHeader {
         visible: root.title

src/StatusQ/Popups/Dialog/StatusDialogBackground.qml

@@ -1,7 +0,0 @@
-import QtQuick 2.14
-import StatusQ.Core.Theme 0.1
-
-Rectangle {
-    color: Theme.palette.statusModal.backgroundColor
-    radius: 8
-}

src/StatusQ/Popups/Dialog/qmldir

@@ -6,4 +6,3 @@ StatusDialogFooter 0.1 StatusDialogFooter.qml
 StatusDialogHeader 0.1 StatusDialogHeader.qml
 StatusHeaderActions 0.1 StatusHeaderActions.qml
 StatusTitleSubtitle 0.1 StatusTitleSubtitle.qml
-StatusDialogBackground 0.1 StatusDialogBackground.qml

src/StatusQ/Popups/StatusMenuItem.qml

@@ -9,27 +9,19 @@ Action {
         Normal,
         Danger
     }
-
+    icon.color: "transparent"
     property int type: StatusMenuItem.Type.Normal
     property real iconRotation: 0
-
-    // TODO: Rename to "imageSettings"
     property StatusImageSettings image: StatusImageSettings {
         height: 16
         width: 16
         isIdenticon: false
     }
-
     property StatusIconSettings iconSettings: StatusIconSettings {
-        width: 18
-        height: 18
-        rotation: 0
         isLetterIdenticon: false
         background: StatusIconBackgroundSettings {}
         color: "transparent"
     }
 
     property StatusFontSettings fontSettings: StatusFontSettings {}
-
-    icon.color: "transparent"
 }

src/StatusQ/Popups/StatusMenuItemDelegate.qml

@@ -7,139 +7,140 @@ import StatusQ.Components 0.1
 import StatusQ.Popups 0.1
 
 MenuItem {
-    id: root
+    id: statusPopupMenuItem
     implicitWidth: parent ? parent.width : 0
-    implicitHeight: menu.hideDisabledItems && !enabled ? 0 : 38
-    objectName: action ? action.objectName : "StatusMenuItemDelegate"
+    implicitHeight: action.enabled ? 38 : 0
+    objectName: action.objectName
 
-//    property int subMenuIndex
-//    property var statusPopupMenu: null
+    property int subMenuIndex
+    property var statusPopupMenu: null
 
-    readonly property string logObjectName: "StatusMenuItemDelegate [%1, %2]".arg(this).arg(text)
-
-//    Component.onCompleted: {
-//        console.log("<---", logObjectName, " completed:", statusPopupMenu, menu, subMenu, action)
-//    }
-
-//    onMenuChanged: console.log("<--- ", logObjectName, " menu changed: ", menu)
-//    onActionChanged: console.log("<--- ", logObjectName, " action changed: ", action, action.text, text)
-
-    action: StatusMenuItem {
-//        onTriggered: { statusPopupMenu.menuItemClicked(root.subMenuIndex); }
+    Component.onCompleted: {
+        if (!!subMenu) {
+            subMenuIndex = statusPopupMenu.menuItemCount
+            statusPopupMenu.menuItemCount += 1
+        }
     }
 
-    QtObject {
-        id: d
-
-        readonly property bool isSubMenu: !!root.subMenu
-        readonly property bool isStatusSubMenu: isSubMenu && (root.subMenu instanceof StatusPopupMenu)
-        readonly property bool hasAction: !!root.action
-        readonly property bool isStatusAction: d.hasAction && (root.action instanceof StatusMenuItem)
-        readonly property bool isDangerIcon: d.isStatusAction && root.action.type === StatusMenuItem.Type.Danger
-
-        readonly property StatusImageSettings imageSettings: d.isStatusSubMenu
-                                                     ? root.subMenu.imageSettings
-                                                     : d.isStatusAction ? root.action.image : d.defaultImage
-
-        readonly property StatusIconSettings iconSettings: {
-            console.log("<<<--- Calling iconSettings", root.logObjectName)
-            return d.isStatusSubMenu
-                    ? root.subMenu.iconSettings
-                    : d.isStatusAction ? root.action.iconSettings : d.defaultIcon
-        }
-
-        readonly property StatusFontSettings fontSettings: d.isStatusSubMenu
-                                                           ? root.subMenu.fontSettings
-                                                           : d.isStatusAction ? root.action.fontSettings : d.defaultFontSettings
-
-        readonly property StatusImageSettings defaultImage: StatusImageSettings {
-            width: 16
-            height: 16
-        }
-        readonly property StatusIconSettings defaultIcon: StatusIconSettings {
-            width: 18
-            height: 18
-            rotation: 0
-        }
-        readonly property StatusFontSettings defaultFontSettings: StatusFontSettings {
-            pixelSize: 13
-            bold: false
-            italic: false
-        }
+    action: StatusMenuItem {
+        onTriggered: { statusPopupMenu.menuItemClicked(statusPopupMenuItem.subMenuIndex); }
     }
 
     Component {
-        id: indicatorIcon
+        id: indicatorComponent
+        Item {
+            implicitWidth: 24
+            implicitHeight: 24
+            StatusIcon {
+                anchors.centerIn: parent
+                width: {
+                    let width = statusPopupMenuItem.action && statusPopupMenuItem.action.icon.width ||
+                        statusPopupMenuItem.action.iconSettings && statusPopupMenuItem.action.iconSettings.width
+                    return !!width ? width : 18
+                }
+                rotation: !!statusPopupMenuItem.action.iconRotation ? statusPopupMenuItem.action.iconRotation : 0
+                icon: {
+                    if (statusPopupMenuItem.subMenu && !!statusPopupMenu.subMenuItemIcons[statusPopupMenuItem.subMenuIndex] &&
+                        statusPopupMenu.subMenuItemIcons[statusPopupMenuItem.subMenuIndex].icon.toString() !== "") {
+                        return statusPopupMenu.subMenuItemIcons[statusPopupMenuItem.subMenuIndex].icon;
+                    } else if (!!statusPopupMenuItem.action && statusPopupMenuItem.action.icon.name !== "") {
+                        return statusPopupMenuItem.action.icon.name;
+                    } else if (!!statusPopupMenuItem.action.iconSettings && statusPopupMenuItem.action.iconSettings.name !== "") {
+                        return statusPopupMenuItem.action.iconSettings.name;
+                    } else {
+                        return "";
+                    }
+                }
+                color: {
+                    let c = !!statusPopupMenuItem.action.iconSettings && statusPopupMenuItem.action.iconSettings.color ||
+                            !!statusPopupMenuItem.action && statusPopupMenuItem.action.icon.color
 
-        StatusIcon {
-            width: d.iconSettings.width // TODO: Also process action.icon.width?
-            height: d.iconSettings.height // TODO: Also process action.icon.height?
-            rotation: d.iconSettings.rotation // TODO: Also process action.icon.rotation? // !!root.action.iconRotation ? root.action.iconRotation : 0
-            icon: d.iconSettings.name // TODO: Also process action.icon?
-            color: {
-                const c = d.iconSettings.color;
-                if (!Qt.colorEqual(c, "transparent"))
-                    return c;
-                if (d.isDangerIcon)
-                    return Theme.palette.dangerColor1;
-                return Theme.palette.primaryColor1;
+                    if (!Qt.colorEqual(c, "transparent")) {
+                        return c
+                    }
+                    switch (statusPopupMenuItem.action.type) {
+                        case StatusMenuItem.Type.Danger:
+                          return Theme.palette.dangerColor1
+                        default:
+                          return Theme.palette.primaryColor1
+                    }
+                }
             }
         }
     }
 
     Component {
-        id: indicatorLetterIdenticon
+        id: statusLetterIdenticonCmp
+        Item {
+            implicitWidth: 24
+            implicitHeight: 24
 
-        StatusLetterIdenticon {
-            width: d.imageSettings.width
-            height: d.imageSettings.height
-            color: d.iconSettings.color
-            name: root.text
-            letterSize: 11
+            StatusLetterIdenticon {
+                anchors.centerIn: parent
+                width: 16
+                height: 16
+                color: {
+                    let subMenuItemIcon = statusPopupMenu.subMenuItemIcons[statusPopupMenuItem.subMenuIndex]
+                    return subMenuItemIcon && subMenuItemIcon.color ? subMenuItemIcon.color : statusPopupMenuItem.action.iconSettings.background.color
+                }
+                name: statusPopupMenuItem.text
+                letterSize: 11
+            }
         }
     }
 
     Component {
-        id: indicatorImage
+        id: statusRoundImageCmp
 
-        StatusRoundedImage {
-            width: d.imageSettings.width
-            height: d.imageSettings.height
-            image.source: d.imageSettings.source
-            border.width: d.isSubMenu && d.imageSettings.isIdenticon ? 1 : 0
-            border.color: Theme.palette.directColor7
+        Item {
+            implicitWidth: 24
+            implicitHeight: 24
+            StatusRoundedImage {
+                anchors.centerIn: parent
+                width: statusPopupMenuItem.action.image.width
+                height: statusPopupMenuItem.action.image.height
+                image.source: statusPopupMenuItem.subMenu ?
+                    statusPopupMenu.subMenuItemIcons[statusPopupMenuItem.subMenuIndex].source :
+                    statusPopupMenuItem.action.image.source
+                border.width: (statusPopupMenuItem.subMenu && statusPopupMenu.subMenuItemIcons[statusPopupMenuItem.subMenuIndex].isIdenticon) || 
+                    statusPopupMenuItem.action.image.isIdenticon ? 1 : 0
+                border.color: Theme.palette.directColor7
+            }
         }
     }
 
-    indicator: Item {
-        implicitWidth: 24
-        implicitHeight: 24
-        Loader {
-            anchors.centerIn: parent
-    //        sourceComponent: {
-    //            if (!!d.imageSettings.source.toString())
-    //                return indicatorImage;
-    //            if (d.iconSettings.isLetterIdenticon)
-    //                return indicatorLetterIdenticon;
-    //            return indicatorIcon;
-    //        }
+    indicator: Loader {
+        sourceComponent: {
+            let subMenuItemIcon = statusPopupMenu.subMenuItemIcons && statusPopupMenu.subMenuItemIcons[parent.subMenuIndex]
+            
+            if ((parent.subMenu && subMenuItemIcon && subMenuItemIcon.source) || 
+                statusPopupMenuItem.action.image && !!statusPopupMenuItem.action.image.source.toString()) {
+                return statusRoundImageCmp
+            }
 
-    //        sourceComponent: indicatorIcon
-    //        sourceComponent: indicatorLetterIdenticon
-    //        sourceComponent: indicatorImage
-
-            anchors.verticalCenter: parent.verticalCenter
-            anchors.left: parent.left
-            anchors.leftMargin: 8
-    //        active: enabled // TODO: Also process action.icon.name ?
-    //                && (d.iconSettings.isLetterIdenticon
-    //                    || !!d.iconSettings.name
-    //                    || !!d.imageSettings.source.toString())
+            return (parent.subMenu && subMenuItemIcon && subMenuItemIcon.isLetterIdenticon) || 
+                (statusPopupMenuItem.action.iconsSettings && statusPopupMenuItem.action.iconSettings.isLetterIdenticon) ? 
+                statusLetterIdenticonCmp : indicatorComponent
         }
+        anchors.verticalCenter: parent.verticalCenter
+        anchors.left: parent.left
+        anchors.leftMargin: 8
+        active: {
+            if (enabled) {
+                let hasIconSettings = !!statusPopupMenuItem.action.icon.name ||
+                  (statusPopupMenuItem.action.iconSettings && 
+                    (!!statusPopupMenuItem.action.iconSettings.name || !!statusPopupMenuItem.action.iconSettings.isLetterIdenticon))
+
+                let hasImageSettings = statusPopupMenuItem.action.image && !!statusPopupMenuItem.action.image.source.toString()
+
+                return enabled && (parent.subMenu && !!statusPopupMenu.subMenuItemIcons[parent.subMenuIndex]) || hasIconSettings || hasImageSettings
+            }
+            return false
+        }      
     }
 
     contentItem: StatusBaseText {
-        anchors.left: root.indicator.right
+        anchors.left: statusPopupMenuItem.indicator.right
         anchors.right: arrowIcon.visible ? arrowIcon.left : arrowIcon.right
         anchors.rightMargin: 8
         anchors.leftMargin: 4
@@ -147,13 +148,20 @@ MenuItem {
         horizontalAlignment: Text.AlignLeft
         verticalAlignment: Text.AlignVCenter
 
-        text: root.text
-        color: d.isDangerIcon ? Theme.palette.dangerColor1 : Theme.palette.directColor1
-        font.pixelSize: d.fontSettings.pixelSize // !!root.action.fontSettings ? root.action.fontSettings.pixelSize : 13
-        font.bold: d.fontSettings.bold // !!root.action.fontSettings ? root.action.fontSettings.bold : false
-        font.italic: d.fontSettings.italic // !!root.action.fontSettings ? root.action.fontSettings.italic : false
+        text: statusPopupMenuItem.text
+        color: {
+            switch (statusPopupMenuItem.action.type) {
+                case StatusMenuItem.Type.Danger:
+                  return Theme.palette.dangerColor1
+                default:
+                  return Theme.palette.directColor1
+            }
+        }
+        font.pixelSize: !!statusPopupMenuItem.action.fontSettings ? statusPopupMenuItem.action.fontSettings.pixelSize : 13
+        font.bold: !!statusPopupMenuItem.action.fontSettings ? statusPopupMenuItem.action.fontSettings.bold : false
+        font.italic: !!statusPopupMenuItem.action.fontSettings ? statusPopupMenuItem.action.fontSettings.italic : false
         elide: Text.ElideRight
-        visible: true // hideDisabledItems ? root.enabled : true
+        visible: statusPopupMenuItem.action.enabled
     }
 
     arrow: StatusIcon {
@@ -162,25 +170,25 @@ MenuItem {
         anchors.right: parent.right
         anchors.rightMargin: 8
         height: 16
-        visible: d.isSubMenu
+        visible: statusPopupMenuItem.subMenu
         icon: "next"
         color: Theme.palette.directColor1
     }
 
     background: Rectangle {
         color: {
-            if (!root.hovered)
-                return "transparent"
-            if (root.action.type === StatusMenuItem.Type.Danger)
-                return Theme.palette.dangerColor3;
-            return Theme.palette.statusPopupMenu.hoverBackgroundColor;
+            if (statusPopupMenuItem.hovered) {
+                return statusPopupMenuItem.action.type === StatusMenuItem.Type.Danger ? Theme.palette.dangerColor3 : Theme.palette.statusPopupMenu.hoverBackgroundColor
+            }
+            return "transparent"
         }
     }
 
     MouseArea {
+        id: sensor
         anchors.fill: parent
         cursorShape: Qt.PointingHandCursor
-        hoverEnabled: root.enabled // WARNING: use root.enabled ?
+        hoverEnabled: statusPopupMenuItem.action.enabled
         onPressed: mouse.accepted = false
     }
 }

src/StatusQ/Popups/StatusModal.qml

@@ -33,7 +33,8 @@ import "statusModal" as Spares
 
             leftButtons: [
                 StatusRoundButton {
-                    icon.name: "arrow-left"
+                    icon.name: "arrow-right"
+                    rotation: 180
                 }
             ]
             rightButtons: [
@@ -53,18 +54,20 @@ import "statusModal" as Spares
 // Deprecation annotations come with Qt6.2
 // @Deprecated { reason: "Use StatusDialog instead, see reasoning: https://github.com/status-im/StatusQ/issues/720" }
 QC.Popup {
-    id: root
+    id: statusModal
 
     /*!
        \qmlproperty advancedHeader
         This property represents the item loaded in header loader.
         Can be used to read values from the component assigned to the loader.
+        \endqml
     */
     property alias advancedHeader: advancedHeader.item
     /*!
        \qmlproperty advancedHeader
         This property represents the item loaded in footer loader.
         Can be used to read values from the component assigned to the loader.
+        \endqml
     */
     property alias advancedFooter: advancedFooter.item
     /*!
@@ -127,6 +130,7 @@ QC.Popup {
        \qmlproperty headerActionButton
         This property lets the user add a button to the header of the Modal.
         This does not apply to the advanced header!
+        \endqml
     */
     property alias headerActionButton: headerImpl.actionButton
 
@@ -134,59 +138,63 @@ QC.Popup {
        \qmlproperty header
         type: StatusModalHeaderSettings
         This property exposes the different properties of the standard header.
+        \endqml
     */
     property StatusModalHeaderSettings header: StatusModalHeaderSettings {}
     /*!
        \qmlproperty rightButtons
         This property helps user assign the right buttons on the footer.
         This doesn't not apply to the advanced footer!
+        \endqml
     */
     property alias rightButtons: footerImpl.rightButtons
     /*!
        \qmlproperty rightButtons
         This property helps user assign the left buttons on the footer.
         This doesn't not apply to the advanced footer!
+        \endqml
     */
     property alias leftButtons: footerImpl.leftButtons
     /*!
        \qmlproperty showHeader
         This property to decides whether the standard header is shown.
         default value is true
+        \endqml
     */
     property bool showHeader: true
     /*!
        \qmlproperty showHeader
         This property to decides whether the standard footer is shown.
         default value is true
+        \endqml
     */
     property bool showFooter: true
     /*!
        \qmlproperty showAdvancedHeader
         This property to decides whether the advanced header is shown.
         default value is false.
+        \endqml
     */
     property bool showAdvancedHeader: false
     /*!
        \qmlproperty showAdvancedFooter
         This property decides whether the advanced footer is shown.
         default value is false.
+        \endqml
     */
     property bool showAdvancedFooter: false
     /*!
        \qmlproperty hasCloseButton
         This property decides whether the standard header has a close button.s
+        \endqml
     */
     property alias hasCloseButton: headerImpl.hasCloseButton
     /*!
        \qmlproperty hasFloatingButtons
         This property decides whether the advanced header has floating buttons on top of the Modal
+        \endqml
     */
     property bool hasFloatingButtons: false
-    /*!
-       \qmlproperty color backgroundColor
-        This property decides the modal background color
-    */
-    property string backgroundColor: Theme.palette.statusModal.backgroundColor
 
     signal editButtonClicked()
     signal headerImageClicked()
@@ -211,7 +219,7 @@ QC.Popup {
     }
 
     background: Rectangle {
-        color: root.backgroundColor
+        color: Theme.palette.statusModal.backgroundColor
         radius: 8
 
         Spares.StatusModalHeader {
@@ -219,7 +227,7 @@ QC.Popup {
             anchors.top: parent.top
             width: visible ? parent.width : 0
 
-            visible: root.showHeader
+            visible: statusModal.showHeader
             title: header.title
             titleElide: header.titleElide
             subTitle: header.subTitle
@@ -230,9 +238,9 @@ QC.Popup {
             headerImageEditable: header.headerImageEditable
             editable: header.editable
 
-            onEditButtonClicked: root.editButtonClicked()
-            onHeaderImageClicked: root.headerImageClicked()
-            onClose: root.close()
+            onEditButtonClicked: statusModal.editButtonClicked()
+            onHeaderImageClicked: statusModal.headerImageClicked()
+            onClose: statusModal.close()
         }
 
         Loader {
@@ -240,22 +248,21 @@ QC.Popup {
             anchors.top: parent.top
             anchors.topMargin: hasFloatingButtons ? -18 - height : 0
             width: visible ? parent.width : 0
-            active: root.showAdvancedHeader
+            active: statusModal.showAdvancedHeader
         }
 
         Spares.StatusModalFooter {
             id: footerImpl
             anchors.bottom: parent.bottom
             width: visible ? parent.width : 0
-            showFooter: root.showFooter
-            visible: root.showFooter
+            showFooter: statusModal.showFooter
         }
 
         Loader {
             id: advancedFooter
             anchors.bottom: parent.bottom
             width: visible ? parent.width : 0
-            active: root.showAdvancedFooter
+            active: statusModal.showAdvancedFooter
         }
     }
 }

src/StatusQ/Popups/StatusPopupMenu.qml

@@ -10,56 +10,20 @@ import StatusQ.Popups 0.1
 
 Menu {
     id: root
-
-//    Component.onCompleted:  {
-//        let parents = "";
-//        let p = parent;
-//        while (p) {
-//            parents += " <- " + p;
-//            p = p.parent;
-//        }
-////        console.log("<-- StatusPopupMenu created", this, parents);
-//    }
-
     closePolicy: Popup.CloseOnPressOutside | Popup.CloseOnEscape
     topPadding: 8
     bottomPadding: 8
 
-//    property int menuItemCount: 0
-//    property var subMenuItemIcons: []
-
-    //    source: model.imageSource,                                // -> StatusRoundedImage.image.source
-    //    icon: model.iconName,                                     // -> StatusIcon.icon
-    //    isIdenticon: model.isIdenticon,                           // -> StatusRoundImage.border.width
-    //    color: model.iconColor,                                   // -> StatusLetterIdenticon.color,
-    //    isLetterIdenticon: !model.imageSource && !model.iconName  // -> decide indicator component
-
-    property StatusImageSettings imageSettings: StatusImageSettings {
-        height: 16
-        width: 16
-        isIdenticon: false
-    }
-
-    property StatusIconSettings iconSettings: StatusIconSettings {
-        width: 18
-        height: 18
-        rotation: 0
-        isLetterIdenticon: false
-        background: StatusIconBackgroundSettings {}
-        color: "transparent"
-    }
-
-    property StatusFontSettings fontSettings: StatusFontSettings {}
-
-    property bool hideDisabledItems: false
+    property int menuItemCount: 0
+    property var subMenuItemIcons: []
 
     property var openHandler
     property var closeHandler
 
-    signal menuItemClicked(int menuIndex)
-
     dim: false
 
+    signal menuItemClicked(int menuIndex)
+
     onOpened: {
         if (typeof openHandler === "function") {
             openHandler()
@@ -73,7 +37,7 @@ Menu {
     }
 
     delegate: StatusMenuItemDelegate {
-//        statusPopupMenu: root
+        statusPopupMenu: root
     }
 
     background: Item {

src/StatusQ/Popups/StatusSearchLocationMenu.qml

@@ -28,8 +28,6 @@ StatusPopupMenu {
     MenuItem { implicitHeight: 0.00001 }
     Instantiator {
         model: root.locationModel
-
-        // NOTE: Use DelegateChooser here
         delegate: Loader {
             sourceComponent: (!!model.subItems && model.subItems.count > 0) ? subMenus : subMenuItemComponent
             onLoaded: {
@@ -40,20 +38,13 @@ StatusPopupMenu {
                     item.parentIconName = model.iconName;
                     item.parentImageSource = model.imageSource;
                     item.parentIdenticonColor = !!model.iconColor ? model.iconColor : Theme.palette.primaryColor1;
-
-                    item.imageSettings.source = model.imageSource;
-                    item.imageSettings.isIdenticon = model.isIdenticon;
-                    item.iconSettings.name = model.iconName;
-                    item.iconSettings.color = model.iconColor;
-                    item.iconSettings.isLetterIdenticon = !model.imageSource && !model.iconName;
-
-//                    root.subMenuItemIcons.push({
-//                                    source: model.imageSource,      // -> StatusRoundedImage.image.source
-//                                    icon: model.iconName,           // -> StatusIcon.icon
-//                                    isIdenticon: model.isIdenticon, // -> StatusRoundImage.border.width
-//                                    color: model.iconColor,         // -> StatusLetterIdenticon.color,
-//                                    isLetterIdenticon: !model.imageSource && !model.iconName // -> decide indicator component
-//                                   });
+                    root.subMenuItemIcons.push({
+                                    source: model.imageSource,
+                                    icon: model.iconName,
+                                    isIdenticon: model.isIdenticon,
+                                    color: model.iconColor,
+                                    isLetterIdenticon: !model.imageSource && !model.iconName
+                                   });
                     root.insertMenu(index + numDefaultItems, item);
                 } else {
                     item.value = model.value

src/StatusQ/Popups/StatusSearchPopup.qml

@@ -30,7 +30,6 @@ StatusModal {
 
     signal resultItemClicked(string itemId)
     signal resultItemTitleClicked(string titleId)
-    signal resetSearchLocationClicked()
 
     property var formatTimestampFn: function (ts) {
         return ts
@@ -61,7 +60,7 @@ StatusModal {
     }
 
     function forceActiveFocus() {
-        contentItem.searchInput.input.edit.forceActiveFocus()
+        contentItem.searchInput.edit.forceActiveFocus()
     }
 
     onOpened: {
@@ -249,7 +248,7 @@ StatusModal {
                     type: StatusFlatRoundButton.Type.Secondary
                     icon.name: "close"
                     icon.color: Theme.palette.directColor1
-                    onClicked: { root.resetSearchLocationClicked(); }
+                    onClicked: { root.resetSearchSelection(); }
                 }
             }
             StatusMenuSeparator {

src/StatusQ/Popups/StatusStackModal.qml

@@ -52,8 +52,12 @@ StatusModal {
                                                 ? replaceLoader.item.title : stackTitle
     padding: 16
 
-    leftButtons: StatusBackButton {
+    leftButtons: StatusRoundButton {
         id: backButton
+        icon.name: "arrow-right"
+        icon.width: 20
+        icon.height: 16
+        rotation: 180
         visible: replaceItem || stackLayout.currentIndex > 0
         onClicked: {
             if (replaceItem) {
@@ -90,7 +94,7 @@ StatusModal {
             anchors.top: subHeaderLoader.bottom
             anchors.topMargin: subHeaderLoader.item && subHeaderLoader.item.visible ? root.subHeaderPadding : 0
             anchors.bottom: parent.bottom
-            width: root.availableWidth
+            width: parent.width
             visible: !replaceItem
             clip: true
         }

src/assets/img/icons/qr-scan.svg

@@ -1,7 +0,0 @@
-<svg width="24" height="20" viewBox="0 0 24 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M0.754547 10C0.754547 9.58579 1.09033 9.25 1.50455 9.25H22.4954C22.9096 9.25 23.2454 9.58579 23.2454 10C23.2454 10.4142 22.9096 10.75 22.4954 10.75H1.50455C1.09033 10.75 0.754547 10.4142 0.754547 10Z" fill="#939BA1"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M2 4.75317C2 2.12982 4.12665 0.00317383 6.75 0.00317383H8.75C9.16421 0.00317383 9.5 0.33896 9.5 0.753174C9.5 1.16739 9.16421 1.50317 8.75 1.50317H6.75C4.95507 1.50317 3.5 2.95825 3.5 4.75317V6.54037C3.5 6.95458 3.16421 7.29037 2.75 7.29037C2.33579 7.29037 2 6.95458 2 6.54037V4.75317Z" fill="#939BA1"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M2 15.25C2 17.8734 4.12665 20 6.75 20H8.75C9.16421 20 9.5 19.6642 9.5 19.25C9.5 18.8358 9.16421 18.5 8.75 18.5H6.75C4.95507 18.5 3.5 17.0449 3.5 15.25V13.4628C3.5 13.0486 3.16421 12.7128 2.75 12.7128C2.33579 12.7128 2 13.0486 2 13.4628V15.25Z" fill="#939BA1"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M22 4.75317C22 2.12982 19.8734 0.00317383 17.25 0.00317383H15.25C14.8358 0.00317383 14.5 0.33896 14.5 0.753174C14.5 1.16739 14.8358 1.50317 15.25 1.50317H17.25C19.0449 1.50317 20.5 2.95825 20.5 4.75317V6.54037C20.5 6.95458 20.8358 7.29037 21.25 7.29037C21.6642 7.29037 22 6.95458 22 6.54037V4.75317Z" fill="#939BA1"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M22 15.25C22 17.8734 19.8734 20 17.25 20H15.25C14.8358 20 14.5 19.6642 14.5 19.25C14.5 18.8358 14.8358 18.5 15.25 18.5H17.25C19.0449 18.5 20.5 17.0449 20.5 15.25V13.4628C20.5 13.0486 20.8358 12.7128 21.25 12.7128C21.6642 12.7128 22 13.0486 22 13.4628V15.25Z" fill="#939BA1"/>
-</svg>

src/statusq.qrc

@@ -15,7 +15,6 @@
         <file>StatusQ/Components/private/statusMessage/StatusTimeStampLabel.qml</file>
         <file>StatusQ/Components/qmldir</file>
         <file>StatusQ/Components/StatusAddress.qml</file>
-        <file>StatusQ/Components/StatusAddressPanel.qml</file>
         <file>StatusQ/Components/StatusBadge.qml</file>
         <file>StatusQ/Components/StatusCard.qml</file>
         <file>StatusQ/Components/StatusChatInfoToolBar.qml</file>
@@ -30,7 +29,6 @@
         <file>StatusQ/Components/StatusCommunityTags.qml</file>
         <file>StatusQ/Components/StatusContactRequestsIndicatorListItem.qml</file>
         <file>StatusQ/Components/StatusContactVerificationIcons.qml</file>
-        <file>StatusQ/Components/StatusDatePicker.qml</file>
         <file>StatusQ/Components/StatusDescriptionListItem.qml</file>
         <file>StatusQ/Components/StatusEmoji.qml</file>
         <file>StatusQ/Components/StatusExpandableItem.qml</file>
@@ -68,6 +66,7 @@
         <file>StatusQ/Controls/qmldir</file>
         <file>StatusQ/Controls/StatusAccountSelector.qml</file>
         <file>StatusQ/Controls/StatusActivityCenterButton.qml</file>
+        <file>StatusQ/Controls/StatusAssetSelector.qml</file>
         <file>StatusQ/Controls/StatusBanner.qml</file>
         <file>StatusQ/Controls/StatusBaseButton.qml</file>
         <file>StatusQ/Controls/StatusBaseInput.qml</file>
@@ -114,7 +113,6 @@
         <file>StatusQ/Controls/StatusToolTip.qml</file>
         <file>StatusQ/Controls/StatusWalletColorButton.qml</file>
         <file>StatusQ/Controls/StatusWalletColorSelect.qml</file>
-        <file>StatusQ/Controls/StatusTextArea.qml</file>
         <file>StatusQ/Core/Backpressure/Backpressure.qml</file>
         <file>StatusQ/Core/Backpressure/LICENSE</file>
         <file>StatusQ/Core/Backpressure/qmldir</file>
@@ -176,6 +174,5 @@
         <file>StatusQ/Popups/StatusSpellcheckingMenuItems.qml</file>
         <file>StatusQ/Popups/StatusStackModal.qml</file>
         <file>StatusQ/qmldir</file>
-        <file>StatusQ/Components/StatusListPickerProxies.qml</file>
     </qresource>
 </RCC>

tests/CMakeLists.txt

@@ -2,14 +2,8 @@ cmake_minimum_required(VERSION 3.5)
 
 project(TestStatusQ LANGUAGES CXX)
 
-# The current StatusQ builds with Qt 5.14 which doesn't support the apple silicon.
-#  Therefore force the intel architecture for MacOS platforms.
-set(CMAKE_OSX_ARCHITECTURES "x86_64")
-
 enable_testing()
 
-set(CMAKE_AUTOMOC ON)
-
 # TODO: Workaround until we make StatusQ a CMake library
 list(APPEND QML_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/../src/")
 set(QML_IMPORT_PATH "${QML_DIRS}" CACHE STRING "Qt Creator extra qml import paths")