status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(general): buttons font fixed, font loading refactored 

Fixes: #7389
This commit is contained in:
Michał Cieślak 2022-09-15 17:23:51 +02:00 committed by Michał
parent 648c943c53
commit f900e7c00e
18 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/StatusQ

@ -1 +1 @@
Subproject commit a94d9338bf0f51a36c82169b432a5184143d09e1
Subproject commit d892a842277dd78199b608c40da297a73de24c91

2
ui/app/AppLayouts/Onboarding/controls/AccountViewDelegate.qml
View File

@ -69,7 +69,7 @@ Rectangle {
id: addressText
width: 108
text: address
font.family: Style.current.fontHexRegular.name
font.family: Style.current.monoFont.name
elide: Text.ElideMiddle
anchors.bottom: accountImage.bottom
anchors.bottomMargin: 0

4
ui/app/AppLayouts/Profile/views/EnsTermsAndConditionsView.qml
View File

@ -165,7 +165,7 @@ Item {
wrapMode: Text.WordWrap
anchors.left: parent.left
anchors.right: parent.right
font.family: Style.current.fontHexRegular.name
font.family: Style.current.monoFont.name
color: Theme.palette.directColor1
}
@ -189,7 +189,7 @@ Item {
wrapMode: Text.WordWrap
anchors.left: parent.left
anchors.right: parent.right
font.family: Style.current.fontHexRegular.name
font.family: Style.current.monoFont.name
color: Theme.palette.directColor1
}

2
ui/app/AppLayouts/Wallet/controls/HeaderButton.qml
View File

@ -47,7 +47,7 @@ Rectangle {
anchors.leftMargin: headerButton.margin
anchors.verticalCenter: parent.verticalCenter
font.pixelSize: 13
font.family: Style.current.fontMedium.name
font.family: Style.current.baseFont.name
font.weight: Font.Medium
color: Style.current.blue
}

2
ui/app/AppLayouts/Wallet/panels/SeedPhraseBackupWarning.qml
View File

@ -35,7 +35,7 @@ Rectangle {
text: qsTr("Back up")
font.pixelSize: 13
font.weight: Font.Medium
font.family: Style.current.fontRegular.name
font.family: Style.current.baseFont.name
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
anchors.top: parent.top

20
ui/imports/Themes/Theme.qml
View File

@ -2,17 +2,19 @@ import QtQuick 2.13
import utils 1.0
QtObject {
property QtObject fontMedium: FontLoader { id: _fontMedium; source: "../../fonts/Inter/Inter-Medium.otf"; }
property QtObject fontBold: FontLoader { id: _fontBold; source: "../../fonts/Inter/Inter-Bold.otf"; }
property QtObject fontLight: FontLoader { id: _fontLight; source: "../../fonts/Inter/Inter-Light.otf"; }
property QtObject fontRegular: FontLoader { id: _fontRegular; source: "../../fonts/Inter/Inter-Regular.otf"; }
readonly property FontLoader baseFont: FontLoader { source: "../../fonts/Inter/Inter-Regular.otf" }
readonly property FontLoader monoFont: FontLoader { source: "../../fonts/InterStatus/InterStatus-Regular.otf" }
readonly property FontLoader codeFont: FontLoader { source: "../../fonts/RobotoMono/RobotoMono-Regular.ttf" }
property QtObject fontHexMedium: FontLoader { id: _fontHexMedium; source: "../../fonts/InterStatus/InterStatus-Medium.otf"; }
property QtObject fontHexBold: FontLoader { id: _fontHexBold; source: "../../fonts/InterStatus/InterStatus-Bold.otf"; }
property QtObject fontHexLight: FontLoader { id: _fontHexLight; source: "../../fonts/InterStatus/InterStatus-Light.otf"; }
property QtObject fontHexRegular: FontLoader { id: _fontHexRegular; source: "../../fonts/InterStatus/InterStatus-Regular.otf"; }
readonly property QtObject _d: QtObject {
readonly property FontLoader baseFontMedium: FontLoader { source: "../../fonts/Inter/Inter-Medium.otf" }
readonly property FontLoader baseFontBold: FontLoader { source: "../../fonts/Inter/Inter-Bold.otf" }
readonly property FontLoader baseFontLight: FontLoader { source: "../../fonts/Inter/Inter-Light.otf" }
property QtObject fontCodeRegular: FontLoader { id: _fontCodeRegular; source: "../../fonts/RobotoMono/RobotoMono-Regular.ttf"; }
readonly property FontLoader monoFontMedium: FontLoader { source: "../../fonts/InterStatus/InterStatus-Medium.otf" }
readonly property FontLoader monoFontBold: FontLoader { source: "../../fonts/InterStatus/InterStatus-Bold.otf" }
readonly property FontLoader monoFontLight: FontLoader { source: "../../fonts/InterStatus/InterStatus-Light.otf" }
}
property string name

4
ui/imports/shared/controls/RecipientSelector.qml
View File

@ -120,7 +120,7 @@ Item {
visible: label !== ""
text: qsTr("Recipient")
font.pixelSize: 13
font.family: Style.current.fontRegular.name
font.family: Style.current.baseFont.name
font.weight: Font.Medium
color: Style.current.textColor
height: 18
@ -131,7 +131,7 @@ Item {
visible: text !== ""
text: ""
font.pixelSize: 13
font.family: Style.current.fontRegular.name
font.family: Style.current.baseFont.name
font.weight: Font.Medium
color: Style.current.danger
height: 18

2
ui/imports/shared/controls/StyledTextArea.qml
View File

@ -60,7 +60,7 @@ Item {
anchors.bottomMargin: Style.current.smallPadding
anchors.topMargin: Style.current.smallPadding
anchors.fill: parent
font.family: Style.current.fontRegular.name
font.family: Style.current.baseFont.name
color: Style.current.textColor
placeholderTextColor: Style.current.secondaryText
selectionColor: Style.current.primarySelectionColor

2
ui/imports/shared/controls/StyledTextEdit.qml
View File

@ -3,7 +3,7 @@ import QtQuick 2.13
import utils 1.0
TextEdit {
font.family: Style.current.fontRegular.name
font.family: Style.current.baseFont.name
color: Style.current.textColor
selectedTextColor: Style.current.textColor
selectionColor: Style.current.primarySelectionColor

2
ui/imports/shared/controls/StyledTextField.qml
View File

@ -4,7 +4,7 @@ import QtQuick.Controls 2.13
import utils 1.0
TextField {
font.family: Style.current.fontRegular.name
font.family: Style.current.baseFont.name
color: readOnly ? Style.current.secondaryText : Style.current.textColor
selectByMouse: !readOnly
selectedTextColor: Style.current.textColor

2
ui/imports/shared/panels/Address.qml
View File

@ -10,7 +10,7 @@ StyledText {
id: addressComponent
text: "0x9ce0056c5fc6bb9459a4dcfa35eaad8c1fee5ce9"
font.pixelSize: 13
font.family: Style.current.fontHexRegular.name
font.family: Style.current.monoFont.name
elide: Text.ElideMiddle
color: Style.current.secondaryText

2
ui/imports/shared/panels/ModuleWarning.qml
View File

@ -145,7 +145,7 @@ Item {
text: button.text
font.pixelSize: 12
font.weight: Font.Medium
font.family: Style.current.fontRegular.name
font.family: Style.current.baseFont.name
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
color: Theme.palette.indirectColor1

2
ui/imports/shared/panels/StyledText.qml
View File

@ -3,6 +3,6 @@ import QtQuick 2.13
import utils 1.0
Text {
font.family: Style.current.fontRegular.name
font.family: Style.current.baseFont.name
color: Style.current.textColor
}

2
ui/imports/shared/panels/TextWithLabel.qml
View File

@ -11,7 +11,7 @@ import "./"
Item {
property string text: "My Text"
property string label: "My Label"
property string fontFamily: Style.current.fontRegular.name
property string fontFamily: Style.current.baseFont.name
property string textToCopy: ""
property alias value: textItem
property bool wrap: false

2
ui/imports/shared/status/StatusChatInput.qml
View File

@ -1072,7 +1072,7 @@ Rectangle {
textFormat: Text.RichText
font.pixelSize: 15
font.family: Style.current.fontRegular.name
font.family: Style.current.baseFont.name
wrapMode: TextArea.Wrap
placeholderText: control.chatInputPlaceholder
placeholderTextColor: Style.current.secondaryText

2
ui/imports/shared/status/StatusExpandableAddress.qml
View File

@ -27,7 +27,7 @@ Item {
id: addressText
text: root.address
font.pixelSize: 13
font.family: Style.current.fontHexRegular.name
font.family: Style.current.monoFont.name
color: Style.current.secondaryText
elide: Text.ElideMiddle
horizontalAlignment: Text.AlignHCenter

4
ui/imports/shared/status/StatusStickerButton.qml
View File

@ -127,7 +127,7 @@ Item {
TextMetrics {
id: textMetrics
font.weight: Font.Medium
font.family: Style.current.fontBold.name
font.family: Style.current.baseFont.name
font.pixelSize: 15
text: root.text
}
@ -215,7 +215,7 @@ Item {
anchors.verticalCenter: parent.verticalCenter
text: root.text
font.weight: Font.Medium
font.family: Style.current.fontBold.name
font.family: Style.current.baseFont.name
font.pixelSize: 15
states: [
State {

4
ui/imports/shared/status/StatusStickerPackDetails.qml
View File

@ -31,14 +31,14 @@ Item {
StyledText {
id: txtPackName
text: packName
font.family: Style.current.fontBold.name
font.family: Style.current.baseFont.name
font.weight: Font.Bold
font.pixelSize: packNameFontSize
}
StyledText {
color: Style.current.secondaryText
text: packAuthor
font.family: Style.current.fontRegular.name
font.family: Style.current.baseFont.name
font.pixelSize: 15
}
}