Theme: C++ implementation based on propagated attached property

monitoring/MonitorEntryPoint.qml

@@ -303,7 +303,7 @@ Component {
                                     readonly property bool last: headerRepeater.count - 1 === index
 
                                     text: model.name + (last ? "" : "  ->  ")
-                                    font.pixelSize: Theme.fontSize20
+                                    font.pixelSize: Theme.fontSize(20)
                                     font.bold: true
 
                                     selectByMouse: true

storybook/main.qml

@@ -11,6 +11,8 @@ import QtQuick.Dialogs
 import QtMultimedia
 
 ApplicationWindow {
+    id: root
+
     width: 1450
     height: 840
     visible: true
@@ -26,7 +28,7 @@ ApplicationWindow {
 
         anchors.fill: parent
 
-        onDarkModeChanged: Theme.changeTheme(darkMode ? Theme.Style.Dark
-                                                      : Theme.Style.Light)
+        onDarkModeChanged: ThemeUtils.changeTheme(root, darkMode ? ThemeUtils.Style.Dark
+                                                                 : ThemeUtils.Style.Light)
     }
 }

storybook/pages/AirdropTokensSelectorPage.qml

@@ -13,22 +13,22 @@ ColumnLayout {
         {
             tokenText: "2 MCT",
             networkText: "Ethereum",
-            tokenImage: Theme.png("tokens/SNT"),
-            networkImage: Theme.svg("network/Network=Ethereum"),
+            tokenImage: Assets.png("tokens/SNT"),
+            networkImage: Assets.svg("network/Network=Ethereum"),
             valid: true
         },
         {
             tokenText: "64 DAI",
             networkText: "Optimism",
-            tokenImage: Theme.png("tokens/DAI"),
-            networkImage: Theme.svg("network/Network=Optimism"),
+            tokenImage: Assets.png("tokens/DAI"),
+            networkImage: Assets.svg("network/Network=Optimism"),
             valid: false
         },
         {
             tokenText: "0.125 ETH",
             networkText: "Arbitrum",
-            tokenImage: Theme.png("tokens/ETH"),
-            networkImage: Theme.svg("network/Network=Arbitrum"),
+            tokenImage: Assets.png("tokens/ETH"),
+            networkImage: Assets.svg("network/Network=Arbitrum"),
             valid: true
         }
     ]

storybook/pages/BannerCardPage.qml

@@ -16,7 +16,7 @@ SplitView {
             anchors.centerIn: parent
             title: titleField.text
             subTitle: subTitleField.text
-            image: Theme.png("wallet/wallet-green")
+            image: Assets.png("wallet/wallet-green")
             closeEnabled: closeEnabled.checked
             onClicked: {
                 print("BannerCard clicked")

storybook/pages/BiometricsPopup.qml

@@ -40,7 +40,7 @@ Dialog {
             Layout.fillWidth: true
             horizontalAlignment: Qt.AlignHCenter
             text: "Status Desktop"
-            font.pixelSize: Theme.fontSize20
+            font.pixelSize: Theme.fontSize(20)
         }
         Label {
             Layout.fillWidth: true

storybook/pages/CollectibleDetailViewPage.qml

@@ -108,7 +108,7 @@ SplitView {
                             }
                             return {
                                 name : "Mock Community",
-                                image : Theme.png("tokens/UNI"),
+                                image : Assets.png("tokens/UNI"),
                                 color : "orchid"
                             }                        
                         }

storybook/pages/ColumnHeaderPanelPage.qml

@@ -18,7 +18,7 @@ SplitView {
         property int membersCount: 184
         property bool amISectionAdmin: false
         property color color: "orchid"
-        property url image: Theme.png("tokens/UNI")
+        property url image: Assets.png("tokens/UNI")
         property bool openCreateChat: false
     }
 

storybook/pages/CommunityInfoEditor.qml

@@ -16,9 +16,9 @@ ColumnLayout {
     property bool amISectionAdmin: true
     property bool isCommunityEditable: true
     property color color: "orchid"
-    property url image: Theme.png("tokens/UNI")
+    property url image: Assets.png("tokens/UNI")
     property bool colorVisible: false
-    property url banner: ctrlCommunityBanner.checked ? Theme.png("settings/communities@2x") : ""
+    property url banner: ctrlCommunityBanner.checked ? Assets.png("settings/communities@2x") : ""
     property bool adminControlsEnabled: true
 
     ColumnLayout {
@@ -94,15 +94,15 @@ ColumnLayout {
         RadioButton {
             checked: true
             text: qsTr("UNI")
-            onCheckedChanged: if(checked) root.image = Theme.png("tokens/UNI")
+            onCheckedChanged: if(checked) root.image = Assets.png("tokens/UNI")
         }
         RadioButton {
             text: qsTr("SOCKS")
-            onCheckedChanged: if(checked) root.image = Theme.png("tokens/SOCKS")
+            onCheckedChanged: if(checked) root.image = Assets.png("tokens/SOCKS")
         }
         RadioButton {
             text: qsTr("Status")
-            onCheckedChanged: if(checked) root.image = Theme.png("tokens/SNT")
+            onCheckedChanged: if(checked) root.image = Assets.png("tokens/SNT")
         }
     }
 

storybook/pages/ConcatModelPage.qml

@@ -205,7 +205,7 @@ Item {
                     Label {
                         height: implicitHeight * 2
                         text: section + " inset"
-                        font.pixelSize: Theme.fontSize20
+                        font.pixelSize: Theme.fontSize(20)
                         font.bold: true
                         font.underline: true
 

storybook/pages/CurrencyAmountToLocaleStringPage.qml

@@ -55,7 +55,7 @@ SplitView {
             text: {
                 return LocaleUtils.currencyAmountToLocaleString(d.currencyAmount, d.options)
             }
-            font.pixelSize: Theme.fontSize24
+            font.pixelSize: Theme.fontSize(24)
         }
     }
 

storybook/pages/DerivationPathInputPage.qml

@@ -138,7 +138,7 @@ SplitView {
 
                 Layout.fillWidth: true
 
-                font.pixelSize: Theme.fontSize22
+                font.pixelSize: Theme.fontSize(22)
                 font.italic: true
                 color: "red"
             }
@@ -148,7 +148,7 @@ SplitView {
 
                 Layout.fillWidth: true
 
-                font.pixelSize: Theme.fontSize22
+                font.pixelSize: Theme.fontSize(22)
                 font.italic: true
                 color: "orange"
             }

storybook/pages/ExportControlNodePopupPage.qml

@@ -91,7 +91,7 @@ SplitView {
                 property string id: "1"
                 property string name: "Socks"
                 property var members: { "count": 5 }
-                property string image: Theme.png("tokens/UNI")
+                property string image: Assets.png("tokens/UNI")
                 property string color: "orchid"
             }
             devicesStore: ProfileStores.DevicesStore {

storybook/pages/FunctionAggregatorPage.qml

@@ -15,7 +15,7 @@ import Storybook
 Control {
     id: root
 
-    font.pixelSize: Theme.fontSize16
+    font.pixelSize: Theme.fontSize(16)
     padding: 10
 
     ListModel {
@@ -131,7 +131,7 @@ Control {
 
             insetComponent: Button {
                 height: 20
-                font.pixelSize: Theme.fontSize11
+                font.pixelSize: Theme.fontSize(11)
                 text: "remove"
 
                 onClicked: {

storybook/pages/ImagesGridViewPage.qml

@@ -28,7 +28,7 @@ Pane {
             Label {
                 anchors.centerIn: parent
                 text: "image " + index
-                font.pixelSize: Theme.fontSize20
+                font.pixelSize: Theme.fontSize(20)
             }
 
             Image {

storybook/pages/ImportControlNodePopupPage.qml

@@ -51,7 +51,7 @@ SplitView {
                 property string id: "1"
                 property string name: "Socks"
                 property var members: { "count": 5 }
-                property string image: Theme.png("tokens/UNI")
+                property string image: Assets.png("tokens/UNI")
                 property string color: "orchid"
             }
         }

storybook/pages/InlineNetworksComboBoxPage.qml

@@ -15,28 +15,28 @@ Item {
     readonly property var modelData: [
         {
             name: "Optimism",
-            icon: Theme.svg(ModelsData.networks.optimism),
+            icon: Assets.svg(ModelsData.networks.optimism),
             amount: "300",
             multiplierIndex: 0,
             infiniteAmount: false
         },
         {
             name: "Arbitrum",
-            icon: Theme.svg(ModelsData.networks.arbitrum),
+            icon: Assets.svg(ModelsData.networks.arbitrum),
             amount: "400000",
             multiplierIndex: 3,
             infiniteAmount: false
         },
         {
             name: "Hermez",
-            icon: Theme.svg(ModelsData.networks.hermez),
+            icon: Assets.svg(ModelsData.networks.hermez),
             amount: "0",
             multiplierIndex: 0,
             infiniteAmount: true
         },
         {
             name: "Ethereum",
-            icon: Theme.svg(ModelsData.networks.ethereum),
+            icon: Assets.svg(ModelsData.networks.ethereum),
             amount: "12" + "0".repeat(18),
             multiplierIndex: 18,
             infiniteAmount: false

storybook/pages/IntroPanelPage.qml

@@ -34,7 +34,7 @@ SplitView {
             anchors.margins: 50
             anchors.fill: parent
 
-            image: Theme.png("community/airdrops8_1")
+            image: Assets.png("community/airdrops8_1")
 
             title: radioButtonsGroup.text
             subtitle: radioButtonsGroup.text

storybook/pages/JoinCommunityViewPage.qml

@@ -54,7 +54,7 @@ Nemo enim 😋 ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit,
         // Blur background:
         property int membersCount: 184
         property bool amISectionAdmin: false
-        property url image: Theme.png("tokens/UNI")
+        property url image: Assets.png("tokens/UNI")
         property var communityItemsModel: model1
         property string chatDateTimeText: "Dec 31, 2020"
         property string  listUsersText: "simon, Mark Cuban "
@@ -176,7 +176,7 @@ Nemo enim 😋 ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit,
                     Layout.fillWidth: true
                     text: "BLUR INFO EDITOR"
                     font.bold: true
-                    font.pixelSize: Theme.fontSize18
+                    font.pixelSize: Theme.fontSize(18)
                 }
 
                 CommunityInfoEditor {
@@ -216,7 +216,7 @@ Nemo enim 😋 ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit,
                     Layout.fillWidth: true
                     text: "JOIN TYPES"
                     font.bold: true
-                    font.pixelSize: Theme.fontSize18
+                    font.pixelSize: Theme.fontSize(18)
                 }
 
                 ColumnLayout {
@@ -257,7 +257,7 @@ Nemo enim 😋 ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit,
                     Layout.fillWidth: true
                     text: "JOIN HOLDINGS EDITOR"
                     font.bold: true
-                    font.pixelSize: Theme.fontSize18
+                    font.pixelSize: Theme.fontSize(18)
                 }
 
                 JoinCommunityPermissionsEditor {

storybook/pages/LinkPreviewCardPage.qml

@@ -15,7 +15,7 @@ SplitView {
     id: root
 
     property string ytBannerQuality: "hqdefault"
-    property string image: Theme.png("tokens/SOCKS")
+    property string image: Assets.png("tokens/SOCKS")
     property string banner: rawImageCheck.checked ? rawImageCheck.rawImageData : "https://img.youtube.com/vi/yHN1M7vcPKU/%1.jpg".arg(root.ytBannerQuality)
     property bool globalUtilsReady: false
 
@@ -275,8 +275,8 @@ SplitView {
 
             RadioButton {
                 text: qsTr("QRC asset: SOCKS")
-                checked: root.image === Theme.png("tokens/SOCKS")
-                onToggled: root.image = Theme.png("tokens/SOCKS")
+                checked: root.image === Assets.png("tokens/SOCKS")
+                onToggled: root.image = Assets.png("tokens/SOCKS")
             }
 
             ColumnLayout {

storybook/pages/ModelEntryPage.qml

@@ -105,7 +105,7 @@ Control {
             insetComponent: RowLayout {
                 Button {
                     height: 20
-                    font.pixelSize: Theme.fontSize11
+                    font.pixelSize: Theme.fontSize(11)
                     text: "remove"
                     highlighted: model.index === itemData.row
 
@@ -115,7 +115,7 @@ Control {
                 }
                 Button {
                     height: 20
-                    font.pixelSize: Theme.fontSize11
+                    font.pixelSize: Theme.fontSize(11)
                     text: "edit"
                     highlighted: model.index === itemData.row
 
@@ -135,7 +135,7 @@ Control {
                 width: parent.width
                 text: "Item Signals"
                 font.bold: true
-                font.pixelSize: Theme.fontSize16
+                font.pixelSize: Theme.fontSize(16)
                 bottomPadding: 20
                 Button {
                     anchors.right: parent.right

storybook/pages/MovableModelWithSfpmPage.qml

@@ -412,7 +412,7 @@ Item {
             Layout.alignment: Qt.AlignHCenter
 
             text: "SAVE ORDER"
-            font.pixelSize: Theme.fontSize30
+            font.pixelSize: Theme.fontSize(30)
 
             onClicked: {
                 const count = simpleSourceModel.count

storybook/pages/NetworkSelectItemDelegatePage.qml

@@ -26,7 +26,7 @@ SplitView {
         NetworkSelectItemDelegate {
             id: delegate
             title: "Ethereum"
-            iconUrl: Theme.svg("network/Network=Ethereum")
+            iconUrl: Assets.svg("network/Network=Ethereum")
             showIndicator: true
             multiSelection: true
             checkState: checkStateSelector.checkState

storybook/pages/NotificationAvatarPage.qml

@@ -30,7 +30,7 @@ SplitView {
                 Tracer {
                     visible: avatarEditor.showImplicitSizeArea
                 }
-                avatarSource: avatarEditor.changeAvatarImage ? "https://i.pravatar.cc/128?img=5" : Theme.png("status-logo-icon")
+                avatarSource: avatarEditor.changeAvatarImage ? "https://i.pravatar.cc/128?img=5" : Assets.png("status-logo-icon")
                 badgeIconName: root.badgeIconName
                 density: avatarEditor.density
                 circular: avatarEditor.isRoundedAvatar