Constants: dependency on Theme removed, TitleLabel component added

micieslak · micieslak · commit 9bcb158e2384 · 2025-12-11T10:45:02.000+01:00
This commit finally removes dependency on Theme from Constants along with workaround in main.qml which is no longer needed. Closes: #19485
diff --git a/ui/app/AppLayouts/Profile/views/keycard/MainView.qml b/ui/app/AppLayouts/Profile/views/keycard/MainView.qml
@@ -236,7 +236,6 @@ ColumnLayout {
 
             StatusBaseText {
                 anchors.fill: parent
-                font.pixelSize: Constants.keycard.general.fontSize2
                 color: Theme.palette.directColor1
                 text: dialog.accountsWarning? Constants.walletConstants.maxNumberOfAccountsContent : Constants.walletConstants.maxNumberOfKeypairsContent
             }
diff --git a/ui/imports/shared/popups/keycard/states/EnterName.qml b/ui/imports/shared/popups/keycard/states/EnterName.qml
@@ -60,13 +60,9 @@ Item {
         anchors.rightMargin: Theme.xlPadding
         spacing: Theme.padding
 
-        StatusBaseText {
+        TitleText {
             id: title
             Layout.alignment: Qt.AlignCenter
-            font.weight: Font.Bold
-
-            font.pixelSize: Constants.keycard.general.fontSize1
-            color: Theme.palette.directColor1
         }
 
         StatusInput {
diff --git a/ui/imports/shared/popups/keycard/states/EnterPairingCode.qml b/ui/imports/shared/popups/keycard/states/EnterPairingCode.qml
@@ -61,14 +61,11 @@ Item {
         spacing: Theme.padding
         clip: true
 
-        StatusBaseText {
+        TitleText {
             id: title
             Layout.preferredHeight: Constants.keycard.general.titleHeight
             Layout.alignment: Qt.AlignHCenter
             text: qsTr("Enter a new pairing code")
-            font.pixelSize: Constants.keycard.general.fontSize1
-            font.weight: Font.Bold
-            color: Theme.palette.directColor1
         }
 
         StatusBaseText {
diff --git a/ui/imports/shared/popups/keycard/states/EnterPassword.qml b/ui/imports/shared/popups/keycard/states/EnterPassword.qml
@@ -65,14 +65,10 @@ Item {
             Layout.preferredWidth: Constants.keycard.shared.imageWidth
         }
 
-        StatusBaseText {
+        TitleText {
             id: title
             Layout.alignment: Qt.AlignCenter
             Layout.maximumWidth: parent.width
-
-            font.weight: Font.Bold
-            font.pixelSize: Constants.keycard.general.fontSize1
-            color: Theme.palette.directColor1
         }
 
         StatusBaseText {
diff --git a/ui/imports/shared/popups/keycard/states/EnterSeedPhrase.qml b/ui/imports/shared/popups/keycard/states/EnterSeedPhrase.qml
@@ -41,14 +41,12 @@ Item {
             spacing: Theme.xlPadding
             width: scrollView.availableWidth
 
-            StatusBaseText {
+            TitleText {
                 id: title
 
                 Layout.fillWidth: true
 
                 visible: text !== ""
-                font.pixelSize: Constants.keycard.general.fontSize1
-                font.weight: Font.Bold
                 horizontalAlignment: Text.AlignHCenter
                 wrapMode: Text.WordWrap
             }
diff --git a/ui/imports/shared/popups/keycard/states/EnterSeedPhraseWords.qml b/ui/imports/shared/popups/keycard/states/EnterSeedPhraseWords.qml
@@ -58,14 +58,11 @@ Item {
         spacing: Theme.padding
         clip: true
 
-        StatusBaseText {
+        TitleText {
             id: title
             Layout.preferredHeight: Constants.keycard.general.titleHeight
             Layout.alignment: Qt.AlignHCenter
             text: qsTr("Confirm recovery phrase words")
-            font.pixelSize: Constants.keycard.general.fontSize1
-            font.weight: Font.Bold
-            color: Theme.palette.directColor1
         }
 
         StatusInput {
diff --git a/ui/imports/shared/popups/keycard/states/KeycardInit.qml b/ui/imports/shared/popups/keycard/states/KeycardInit.qml
@@ -159,12 +159,10 @@ Item {
                          root.sharedKeycardModule.currentState.stateType === Constants.keycardSharedState.changingKeycardPairingCode ||
                          root.sharedKeycardModule.currentState.stateType === Constants.keycardSharedState.copyingKeycard
             }
-            StatusBaseText {
+            TitleText {
                 id: title
 
                 wrapMode: Text.WordWrap
-                font.pixelSize: Constants.keycard.general.fontSize1
-                font.weight: Font.Bold
             }
         }
 
diff --git a/ui/imports/shared/popups/keycard/states/KeycardPin.qml b/ui/imports/shared/popups/keycard/states/KeycardPin.qml
@@ -96,13 +96,9 @@ Item {
             Layout.preferredWidth: Constants.keycard.shared.imageWidth
         }
 
-        StatusBaseText {
+        TitleText {
             id: title
             Layout.alignment: Qt.AlignCenter
-            font.weight: Font.Bold
-
-            font.pixelSize: Constants.keycard.general.fontSize1
-            color: Theme.palette.directColor1
         }
 
         StatusBaseText {
diff --git a/ui/imports/shared/popups/keycard/states/KeycardPuk.qml b/ui/imports/shared/popups/keycard/states/KeycardPuk.qml
@@ -48,13 +48,9 @@ Item {
             Layout.preferredWidth: Constants.keycard.shared.imageWidth
         }
 
-        StatusBaseText {
+        TitleText {
             id: title
             Layout.alignment: Qt.AlignCenter
-
-            font.weight: Font.Bold
-            font.pixelSize: Constants.keycard.general.fontSize1
-            color: Theme.palette.directColor1
         }
 
         StatusPinInput {
diff --git a/ui/imports/shared/popups/keycard/states/ManageAccounts.qml b/ui/imports/shared/popups/keycard/states/ManageAccounts.qml
@@ -115,13 +115,9 @@ Item {
             Layout.alignment: Qt.AlignCenter
         }
 
-        StatusBaseText {
+        TitleText {
             id: title
             Layout.alignment: Qt.AlignCenter
-
-            font.weight: Font.Bold
-            font.pixelSize: Constants.keycard.general.fontSize1
-            color: Theme.palette.directColor1
         }
 
         Rectangle {
diff --git a/ui/imports/shared/popups/keycard/states/SeedPhrase.qml b/ui/imports/shared/popups/keycard/states/SeedPhrase.qml
@@ -24,15 +24,12 @@ Item {
         anchors.rightMargin: Theme.xlPadding
         spacing: Theme.padding
 
-        StatusBaseText {
+        TitleText {
             id: title
             Layout.preferredHeight: Constants.keycard.general.titleHeight
             Layout.alignment: Qt.AlignCenter
 
             wrapMode: Text.WordWrap
-            font.pixelSize: Constants.keycard.general.fontSize1
-            font.weight: Font.Bold
-            color: Theme.palette.directColor1
         }
 
         StatusBaseText {
diff --git a/ui/imports/shared/popups/keycard/states/SelectKeyPair.qml b/ui/imports/shared/popups/keycard/states/SelectKeyPair.qml
@@ -40,13 +40,10 @@ Item {
             id: keyPairsButtonGroup
         }
 
-        StatusBaseText {
+        TitleText {
             id: title
             Layout.alignment: Qt.AlignHCenter
             text: qsTr("Select a key pair")
-            font.pixelSize: Constants.keycard.general.fontSize1
-            font.weight: Font.Bold
-            color: Theme.palette.directColor1
             wrapMode: Text.WordWrap
         }
 
diff --git a/ui/imports/shared/popups/keycard/states/TitleText.qml b/ui/imports/shared/popups/keycard/states/TitleText.qml
@@ -0,0 +1,9 @@
+import QtQuick
+
+import StatusQ.Core
+import StatusQ.Core.Theme
+
+StatusBaseText {
+    font.weight: Font.Bold
+    font.pixelSize: Theme.fontSize(22)
+}
diff --git a/ui/imports/utils/Constants.qml b/ui/imports/utils/Constants.qml
@@ -2,7 +2,6 @@ pragma Singleton
 
 import QtQml
 
-import StatusQ.Core.Theme
 import StatusQ.Controls.Validators
 
 QtObject {
@@ -514,7 +513,6 @@ QtObject {
             readonly property int keycardPairingCodeInputWidth: 512
             readonly property int keycardPukAdditionalSpacingOnEvery4Items: 4
             readonly property int keycardPukAdditionalSpacing: 32
-            readonly property int fontSize1: root.Theme.fontSize(22)
             readonly property int seedPhraseCellWidth: 193
             readonly property int seedPhraseCellHeight: 60
             readonly property int seedPhraseCellNumberWidth: 24
@@ -574,8 +572,8 @@ QtObject {
         readonly property string alphanumericalWithSpaceRegExp: qsTr("Special characters are not allowed")
         readonly property string asciiRegExp: qsTr("Only letters, numbers and ASCII characters allowed")
         readonly property string emojRegExp: qsTr("Name is too cool (use A-Z and 0-9, single whitespace, hyphens and underscores only)")
-        readonly property var wholeNumbers: qsTr("Whole numbers only")
-        readonly property var positiveRealNumbers: qsTr("Positive real numbers only")
+        readonly property string wholeNumbers: qsTr("Whole numbers only")
+        readonly property string positiveRealNumbers: qsTr("Positive real numbers only")
     }
 
     readonly property QtObject socialLinkType: QtObject {
diff --git a/ui/main.qml b/ui/main.qml
@@ -700,27 +700,4 @@ Window {
     MobileUI {
         id: mobileUI
     }
-
-    // Right now Constants holds not only true constant values but also expressions
-    // depending on dynamic theme system. In order to keep those expressions working
-    // as expected, explicit propagation of style must be established. This is workaround
-    // that should be fixed in the future by removing dependency on Theme attached
-    // property from Constants.
-    Binding {
-        target: Constants
-        property: "Theme.style"
-        value: applicationWindow.Theme.style
-    }
-
-    Binding {
-        target: Constants
-        property: "Theme.padding"
-        value: applicationWindow.Theme.padding
-    }
-
-    Binding {
-        target: Constants
-        property: "Theme.fontSizeOffset"
-        value: applicationWindow.Theme.fontSizeOffset
-    }
 }

Original file line number	Diff line number	Diff line change
`@@ -236,7 +236,6 @@ ColumnLayout {`
`236`	`236`
`237`	`237`	`StatusBaseText {`
`238`	`238`	`anchors.fill: parent`
`239`		`- font.pixelSize: Constants.keycard.general.fontSize2`
`240`	`239`	`color: Theme.palette.directColor1`
`241`	`240`	`text: dialog.accountsWarning? Constants.walletConstants.maxNumberOfAccountsContent : Constants.walletConstants.maxNumberOfKeypairsContent`
`242`	`241`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,14 +65,10 @@ Item {`
`65`	`65`	`Layout.preferredWidth: Constants.keycard.shared.imageWidth`
`66`	`66`	`}`
`67`	`67`
`68`		`- StatusBaseText {`
	`68`	`+ TitleText {`
`69`	`69`	`id: title`
`70`	`70`	`Layout.alignment: Qt.AlignCenter`
`71`	`71`	`Layout.maximumWidth: parent.width`
`72`		`-`
`73`		`- font.weight: Font.Bold`
`74`		`- font.pixelSize: Constants.keycard.general.fontSize1`
`75`		`- color: Theme.palette.directColor1`
`76`	`72`	`}`
`77`	`73`
`78`	`74`	`StatusBaseText {`
Original file line number	Diff line number	Diff line change
`@@ -159,12 +159,10 @@ Item {`
`159`	`159`	`root.sharedKeycardModule.currentState.stateType === Constants.keycardSharedState.changingKeycardPairingCode \|\|`
`160`	`160`	`root.sharedKeycardModule.currentState.stateType === Constants.keycardSharedState.copyingKeycard`
`161`	`161`	`}`
`162`		`- StatusBaseText {`
	`162`	`+ TitleText {`
`163`	`163`	`id: title`
`164`	`164`
`165`	`165`	`wrapMode: Text.WordWrap`
`166`		`- font.pixelSize: Constants.keycard.general.fontSize1`
`167`		`- font.weight: Font.Bold`
`168`	`166`	`}`
`169`	`167`	`}`
`170`	`168`
Original file line number	Diff line number	Diff line change
`@@ -96,13 +96,9 @@ Item {`
`96`	`96`	`Layout.preferredWidth: Constants.keycard.shared.imageWidth`
`97`	`97`	`}`
`98`	`98`
`99`		`- StatusBaseText {`
	`99`	`+ TitleText {`
`100`	`100`	`id: title`
`101`	`101`	`Layout.alignment: Qt.AlignCenter`
`102`		`- font.weight: Font.Bold`
`103`		`-`
`104`		`- font.pixelSize: Constants.keycard.general.fontSize1`
`105`		`- color: Theme.palette.directColor1`
`106`	`102`	`}`
`107`	`103`
`108`	`104`	`StatusBaseText {`
Original file line number	Diff line number	Diff line change
`@@ -48,13 +48,9 @@ Item {`
`48`	`48`	`Layout.preferredWidth: Constants.keycard.shared.imageWidth`
`49`	`49`	`}`
`50`	`50`
`51`		`- StatusBaseText {`
	`51`	`+ TitleText {`
`52`	`52`	`id: title`
`53`	`53`	`Layout.alignment: Qt.AlignCenter`
`54`		`-`
`55`		`- font.weight: Font.Bold`
`56`		`- font.pixelSize: Constants.keycard.general.fontSize1`
`57`		`- color: Theme.palette.directColor1`
`58`	`54`	`}`
`59`	`55`
`60`	`56`	`StatusPinInput {`
Original file line number	Diff line number	Diff line change
`@@ -115,13 +115,9 @@ Item {`
`115`	`115`	`Layout.alignment: Qt.AlignCenter`
`116`	`116`	`}`
`117`	`117`
`118`		`- StatusBaseText {`
	`118`	`+ TitleText {`
`119`	`119`	`id: title`
`120`	`120`	`Layout.alignment: Qt.AlignCenter`
`121`		`-`
`122`		`- font.weight: Font.Bold`
`123`		`- font.pixelSize: Constants.keycard.general.fontSize1`
`124`		`- color: Theme.palette.directColor1`
`125`	`121`	`}`
`126`	`122`
`127`	`123`	`Rectangle {`