From 8755c901de5dc55f26cf409b5250cb6be8d8f974 Mon Sep 17 00:00:00 2001 From: Jonathan Rainville Date: Fri, 19 Jun 2020 14:06:58 -0400 Subject: [PATCH] fix: fix font loading issue and create a text component to use that font --- .../AppLayouts/Chat/ChatColumn/EmptyChat.qml | 2 +- ui/app/AppLayouts/Chat/ChatColumn/Message.qml | 12 +++--- ui/app/AppLayouts/Chat/ChatColumn/TopBar.qml | 4 +- ui/app/AppLayouts/Chat/ContactsColumn.qml | 2 +- .../Chat/ContactsColumn/Channel.qml | 8 ++-- .../Chat/ContactsColumn/EmptyView.qml | 3 +- .../Chat/components/ChannelIcon.qml | 2 +- ui/app/AppLayouts/Chat/components/Contact.qml | 4 +- .../Chat/components/GroupChatPopup.qml | 5 +-- .../Chat/components/GroupInfoPopup.qml | 13 +++--- .../Chat/components/ProfilePopup.qml | 15 ++++--- .../Chat/components/PublicChatPopup.qml | 2 +- .../Chat/components/RenameGroupPopup.qml | 2 +- .../Chat/components/SuggestedChannel.qml | 3 +- ui/app/AppLayouts/Node/NodeLayout.qml | 5 ++- ui/app/AppLayouts/Profile/LeftTab/Menu.qml | 21 +++++----- ui/app/AppLayouts/Profile/LeftTab/Profile.qml | 5 ++- .../Profile/Sections/AboutContainer.qml | 13 +++--- .../Profile/Sections/AdvancedContainer.qml | 11 +++--- .../Profile/Sections/Contacts/Contact.qml | 4 +- .../Profile/Sections/ContactsContainer.qml | 3 +- .../Profile/Sections/EnsContainer.qml | 3 +- .../Profile/Sections/HelpContainer.qml | 5 ++- .../Profile/Sections/LanguageContainer.qml | 3 +- .../Sections/NotificationsContainer.qml | 3 +- .../Profile/Sections/PrivacyContainer.qml | 3 +- .../Profile/Sections/SignoutContainer.qml | 2 +- .../Profile/Sections/SyncContainer.qml | 3 +- ui/app/AppLayouts/Wallet/AssetsTab.qml | 9 +++-- ui/app/AppLayouts/Wallet/CollectiblesTab.qml | 7 ++-- .../Wallet/Components/AddAccountWithSeed.qml | 2 +- .../Wallet/Components/SendModalContent.qml | 2 +- .../Components/SetCurrencyModalContent.qml | 4 +- .../Components/TokenSettingsModalContent.qml | 4 +- .../Wallet/Components/TransactionModal.qml | 36 ++++++++--------- ui/app/AppLayouts/Wallet/HistoryTab.qml | 15 +++---- ui/app/AppLayouts/Wallet/LeftTab.qml | 10 ++--- ui/app/AppLayouts/Wallet/WalletHeader.qml | 10 ++--- .../fonts}/InterStatus/InterStatus-Black.otf | Bin .../InterStatus/InterStatus-BlackItalic.otf | Bin .../fonts}/InterStatus/InterStatus-Bold.otf | Bin .../InterStatus/InterStatus-BoldItalic.otf | Bin .../InterStatus/InterStatus-ExtraBold.otf | Bin .../InterStatus-ExtraBoldItalic.otf | Bin .../InterStatus/InterStatus-ExtraLight.otf | Bin .../InterStatus-ExtraLightItalic.otf | Bin .../fonts}/InterStatus/InterStatus-Italic.otf | Bin .../fonts}/InterStatus/InterStatus-Light.otf | Bin .../InterStatus/InterStatus-LightItalic.otf | Bin .../fonts}/InterStatus/InterStatus-Medium.otf | Bin .../InterStatus/InterStatus-MediumItalic.otf | Bin .../InterStatus/InterStatus-Regular.otf | Bin .../InterStatus/InterStatus-SemiBold.otf | Bin .../InterStatus-SemiBoldItalic.otf | Bin .../fonts}/InterStatus/InterStatus-Thin.otf | Bin .../InterStatus/InterStatus-ThinItalic.otf | Bin ui/imports/Theme.qml | 5 +++ ui/main.qml | 2 +- ui/nim-status-client.pro | 37 +++++++++--------- ui/onboarding/CreatePasswordModal.qml | 2 +- ui/onboarding/EnterSeedPhraseModal.qml | 2 +- ui/onboarding/GenKeyModal.qml | 1 + ui/onboarding/Intro.qml | 2 +- ui/onboarding/KeysMain.qml | 4 +- ui/onboarding/Login.qml | 6 +-- ui/onboarding/Login/AddressView.qml | 4 +- .../Login/ConfirmAddExistingKeyModal.qml | 2 +- ui/onboarding/Slide.qml | 5 ++- ui/shared/Input.qml | 2 +- ui/shared/ModalPopup.qml | 2 +- ui/shared/PopupMenu.qml | 2 +- ui/shared/Select.qml | 2 +- ui/shared/StatusTabButton.qml | 2 +- ui/shared/StyledButton.qml | 2 +- ui/shared/StyledText.qml | 6 +++ ui/shared/StyledTextArea.qml | 4 +- ui/shared/TextWithLabel.qml | 2 +- ui/shared/qmldir | 1 + 78 files changed, 192 insertions(+), 165 deletions(-) rename {fonts => ui/fonts}/InterStatus/InterStatus-Black.otf (100%) rename {fonts => ui/fonts}/InterStatus/InterStatus-BlackItalic.otf (100%) rename {fonts => ui/fonts}/InterStatus/InterStatus-Bold.otf (100%) rename {fonts => ui/fonts}/InterStatus/InterStatus-BoldItalic.otf (100%) rename {fonts => ui/fonts}/InterStatus/InterStatus-ExtraBold.otf (100%) rename {fonts => ui/fonts}/InterStatus/InterStatus-ExtraBoldItalic.otf (100%) rename {fonts => ui/fonts}/InterStatus/InterStatus-ExtraLight.otf (100%) rename {fonts => ui/fonts}/InterStatus/InterStatus-ExtraLightItalic.otf (100%) rename {fonts => ui/fonts}/InterStatus/InterStatus-Italic.otf (100%) rename {fonts => ui/fonts}/InterStatus/InterStatus-Light.otf (100%) rename {fonts => ui/fonts}/InterStatus/InterStatus-LightItalic.otf (100%) rename {fonts => ui/fonts}/InterStatus/InterStatus-Medium.otf (100%) rename {fonts => ui/fonts}/InterStatus/InterStatus-MediumItalic.otf (100%) rename {fonts => ui/fonts}/InterStatus/InterStatus-Regular.otf (100%) rename {fonts => ui/fonts}/InterStatus/InterStatus-SemiBold.otf (100%) rename {fonts => ui/fonts}/InterStatus/InterStatus-SemiBoldItalic.otf (100%) rename {fonts => ui/fonts}/InterStatus/InterStatus-Thin.otf (100%) rename {fonts => ui/fonts}/InterStatus/InterStatus-ThinItalic.otf (100%) create mode 100644 ui/shared/StyledText.qml diff --git a/ui/app/AppLayouts/Chat/ChatColumn/EmptyChat.qml b/ui/app/AppLayouts/Chat/ChatColumn/EmptyChat.qml index e40cf78a9e..4c20bb1476 100644 --- a/ui/app/AppLayouts/Chat/ChatColumn/EmptyChat.qml +++ b/ui/app/AppLayouts/Chat/ChatColumn/EmptyChat.qml @@ -21,7 +21,7 @@ Item { source: "../../../../onboarding/img/chat@2x.jpg" } - Text { + StyledText { text: "Select a chat to start messaging" anchors.horizontalCenter: parent.horizontalCenter font.weight: Font.DemiBold diff --git a/ui/app/AppLayouts/Chat/ChatColumn/Message.qml b/ui/app/AppLayouts/Chat/ChatColumn/Message.qml index b61310a023..0495080434 100644 --- a/ui/app/AppLayouts/Chat/ChatColumn/Message.qml +++ b/ui/app/AppLayouts/Chat/ChatColumn/Message.qml @@ -67,7 +67,7 @@ Item { source: chatsModel.activeChannel.identicon } - Text { + StyledText { visible: chatsModel.activeChannel.chatType != Constants.chatTypeOneToOne text: (chatsModel.activeChannel.name.charAt(0) == "#" ? chatsModel.activeChannel.name.charAt(1) : chatsModel.activeChannel.name.charAt(0)).toUpperCase() opacity: 0.7 @@ -79,7 +79,7 @@ Item { } } - Text { + StyledText { id: channelName wrapMode: Text.Wrap text: { @@ -103,7 +103,7 @@ Item { anchors.topMargin: 16 id: joinOrDecline - Text { + StyledText { id: joinChat text: qsTr("Join chat") font.pixelSize: 20 @@ -119,7 +119,7 @@ Item { } } - Text { + StyledText { text: qsTr("Decline invitation") font.pixelSize: 20 color: Theme.blue @@ -139,7 +139,7 @@ Item { } // Private group Messages - Text { + StyledText { wrapMode: Text.Wrap text: message visible: isStatusMessage @@ -235,7 +235,6 @@ Item { anchors.right: message.length > 52 ? parent.right : undefined anchors.rightMargin: message.length > 52 ? parent.chatHorizontalPadding : 0 horizontalAlignment: !isCurrentUser ? Text.AlignLeft : Text.AlignRight - font.family: "Inter" wrapMode: Text.WrapAnywhere anchors.top: parent.top anchors.topMargin: chatBox.chatVerticalPadding @@ -262,7 +261,6 @@ Item { TextEdit { id: chatTime color: Theme.darkGrey - font.family: "Inter" text: timestamp anchors.top: contentType == Constants.stickerType ? stickerId.bottom : chatText.bottom anchors.bottomMargin: Theme.padding diff --git a/ui/app/AppLayouts/Chat/ChatColumn/TopBar.qml b/ui/app/AppLayouts/Chat/ChatColumn/TopBar.qml index 69a5d82175..261026b704 100644 --- a/ui/app/AppLayouts/Chat/ChatColumn/TopBar.qml +++ b/ui/app/AppLayouts/Chat/ChatColumn/TopBar.qml @@ -38,7 +38,7 @@ Rectangle { readOnly: true } - Text { + StyledText { id: channelIdentifier color: Theme.darkGrey text: { @@ -59,7 +59,7 @@ Rectangle { anchors.topMargin: 0 } - Text { + StyledText { id: moreActionsBtn text: "..." font.letterSpacing: 0.5 diff --git a/ui/app/AppLayouts/Chat/ContactsColumn.qml b/ui/app/AppLayouts/Chat/ContactsColumn.qml index 0553b24fa8..949560ac91 100644 --- a/ui/app/AppLayouts/Chat/ContactsColumn.qml +++ b/ui/app/AppLayouts/Chat/ContactsColumn.qml @@ -15,7 +15,7 @@ Item { Layout.minimumWidth: 200 Layout.fillHeight: true - Text { + StyledText { id: title x: 772 text: qsTr("Chat") diff --git a/ui/app/AppLayouts/Chat/ContactsColumn/Channel.qml b/ui/app/AppLayouts/Chat/ContactsColumn/Channel.qml index 4518420072..20d6a75b1a 100644 --- a/ui/app/AppLayouts/Chat/ContactsColumn/Channel.qml +++ b/ui/app/AppLayouts/Chat/ContactsColumn/Channel.qml @@ -59,7 +59,7 @@ Rectangle { visible: chatType !== Constants.chatTypeOneToOne } - Text { + StyledText { id: contactInfo text: wrapper.chatType !== Constants.chatTypePublic ? wrapper.name : "#" + wrapper.name anchors.right: contactTime.left @@ -74,7 +74,7 @@ Rectangle { color: "black" } - Text { + StyledText { id: lastChatMessage text: lastMessage ? lastMessage.replace(/\n|\r/g, ' ') : qsTr("No messages") anchors.right: contactNumberChatsCircle.left @@ -87,7 +87,7 @@ Rectangle { anchors.leftMargin: Theme.padding color: Theme.darkGrey } - Text { + StyledText { id: contactTime text: wrapper.timestamp anchors.right: parent.right @@ -108,7 +108,7 @@ Rectangle { anchors.rightMargin: Theme.padding color: Theme.blue visible: unviewedMessagesCount > 0 - Text { + StyledText { id: contactNumberChats text: wrapper.unviewedMessagesCount anchors.horizontalCenter: parent.horizontalCenter diff --git a/ui/app/AppLayouts/Chat/ContactsColumn/EmptyView.qml b/ui/app/AppLayouts/Chat/ContactsColumn/EmptyView.qml index ae21762c9a..f14696e2ba 100644 --- a/ui/app/AppLayouts/Chat/ContactsColumn/EmptyView.qml +++ b/ui/app/AppLayouts/Chat/ContactsColumn/EmptyView.qml @@ -2,6 +2,7 @@ import QtQuick 2.13 import QtQuick.Controls 2.13 import QtQuick.Layouts 1.13 import "../components" +import "../../../../shared" Item { id: suggestionsContainer @@ -15,7 +16,7 @@ Item { anchors.left: parent.left anchors.leftMargin: 20 - Text { + StyledText { width: parent.width text: qsTr("Follow your interests in one of the many Public Chats.") font.pointSize: 15 diff --git a/ui/app/AppLayouts/Chat/components/ChannelIcon.qml b/ui/app/AppLayouts/Chat/components/ChannelIcon.qml index e8ed1a9c98..502107dc45 100644 --- a/ui/app/AppLayouts/Chat/components/ChannelIcon.qml +++ b/ui/app/AppLayouts/Chat/components/ChannelIcon.qml @@ -40,7 +40,7 @@ Rectangle { return color } - Text { + StyledText { text: { if (channelType == Constants.chatTypeOneToOne) { return channelName; diff --git a/ui/app/AppLayouts/Chat/components/Contact.qml b/ui/app/AppLayouts/Chat/components/Contact.qml index 1598a3e66c..4019d18a89 100644 --- a/ui/app/AppLayouts/Chat/components/Contact.qml +++ b/ui/app/AppLayouts/Chat/components/Contact.qml @@ -33,7 +33,7 @@ Rectangle { source: identicon } - Text { + StyledText { id: usernameText text: name elide: Text.ElideRight @@ -60,7 +60,7 @@ Rectangle { } } - Text { + StyledText { visible: isUser text: qsTr("Admin") anchors.right: parent.right diff --git a/ui/app/AppLayouts/Chat/components/GroupChatPopup.qml b/ui/app/AppLayouts/Chat/components/GroupChatPopup.qml index 29d50cd3ff..7bdb24d010 100644 --- a/ui/app/AppLayouts/Chat/components/GroupChatPopup.qml +++ b/ui/app/AppLayouts/Chat/components/GroupChatPopup.qml @@ -56,7 +56,7 @@ ModalPopup { height: 30 width: parent.width - Text { + StyledText { id: lblNewGroup text: qsTr("New group chat") anchors.left: parent.left @@ -66,11 +66,10 @@ ModalPopup { anchors.topMargin: Theme.padding } - Text { + StyledText { anchors.top: lblNewGroup.bottom text: qsTr("%1 / 10 members").arg(memberCount) color: Theme.darkGrey - font.family: "Inter" font.pixelSize: 15 } } diff --git a/ui/app/AppLayouts/Chat/components/GroupInfoPopup.qml b/ui/app/AppLayouts/Chat/components/GroupInfoPopup.qml index 209008f4c0..2de30e7bc9 100644 --- a/ui/app/AppLayouts/Chat/components/GroupInfoPopup.qml +++ b/ui/app/AppLayouts/Chat/components/GroupInfoPopup.qml @@ -21,7 +21,7 @@ ModalPopup { anchors.topMargin: Theme.padding color: chatsModel.activeChannel.color - Text { + StyledText { text: chatsModel.activeChannel.name.charAt(0).toUpperCase(); opacity: 0.7 font.weight: Font.Bold @@ -45,7 +45,7 @@ ModalPopup { wrapMode: Text.WordWrap } - Text { + StyledText { text: { let cnt = chatsModel.activeChannel.members.rowCount(); if(cnt > 1) return qsTr("%1 members").arg(cnt); @@ -58,7 +58,6 @@ ModalPopup { anchors.topMargin: 2 font.pixelSize: 14 color: Theme.darkGrey - font.family: "Inter" } Rectangle { @@ -104,7 +103,7 @@ ModalPopup { id: container anchors.fill: parent - Text { + StyledText { id: memberLabel text: qsTr("Members") anchors.left: parent.left @@ -160,7 +159,7 @@ ModalPopup { } } Column { - Text { + StyledText { text: model.userName width: 300 elide: Text.ElideRight @@ -169,13 +168,13 @@ ModalPopup { } } Column { - Text { + StyledText { visible: model.isAdmin text: qsTr("Admin") width: 100 font.pixelSize: 13 } - Text { + StyledText { id: moreActionsBtn visible: !model.isAdmin && chatsModel.activeChannel.isAdmin(profileModel.profile.pubKey) text: "..." diff --git a/ui/app/AppLayouts/Chat/components/ProfilePopup.qml b/ui/app/AppLayouts/Chat/components/ProfilePopup.qml index 1079adda74..77acae53db 100644 --- a/ui/app/AppLayouts/Chat/components/ProfilePopup.qml +++ b/ui/app/AppLayouts/Chat/components/ProfilePopup.qml @@ -52,7 +52,7 @@ ModalPopup { wrapMode: Text.WordWrap } - Text { + StyledText { text: fromAuthor width: 160 elide: Text.ElideMiddle @@ -62,7 +62,6 @@ ModalPopup { anchors.topMargin: 2 font.pixelSize: 14 color: Theme.darkGrey - font.family: "Inter" } // TODO(pascal): implement qrcode view @@ -96,7 +95,7 @@ ModalPopup { // } } - Text { + StyledText { id: labelEnsUsername text: qsTr("ENS username") font.pixelSize: 13 @@ -108,7 +107,7 @@ ModalPopup { anchors.topMargin: Theme.smallPadding } - Text { + StyledText { id: valueEnsName text: "@emily.stateofus.eth" font.pixelSize: 14 @@ -118,7 +117,7 @@ ModalPopup { anchors.topMargin: Theme.smallPadding } - Text { + StyledText { id: labelChatKey text: qsTr("Chat key") font.pixelSize: 13 @@ -130,7 +129,7 @@ ModalPopup { anchors.topMargin: Theme.padding } - Text { + StyledText { id: valueChatKey text: fromAuthor width: 160 @@ -152,7 +151,7 @@ ModalPopup { anchors.rightMargin: -Theme.padding } - Text { + StyledText { id: labelShareURL text: qsTr("Share Profile URL") font.pixelSize: 13 @@ -164,7 +163,7 @@ ModalPopup { anchors.topMargin: Theme.padding } - Text { + StyledText { id: valueShareURL text: "https://join.status.im/u/" + fromAuthor.substr(0, 4) + "..." + fromAuthor.substr(fromAuthor.length - 5) font.pixelSize: 14 diff --git a/ui/app/AppLayouts/Chat/components/PublicChatPopup.qml b/ui/app/AppLayouts/Chat/components/PublicChatPopup.qml index db54a417f6..94bbeffeb1 100644 --- a/ui/app/AppLayouts/Chat/components/PublicChatPopup.qml +++ b/ui/app/AppLayouts/Chat/components/PublicChatPopup.qml @@ -27,7 +27,7 @@ ModalPopup { Layout.fillWidth: true width: parent.width - Text { + StyledText { width: parent.width font.pixelSize: 15 text: qsTr("A public chat is where you get to hang out with others, make friends and talk about subjects of your interest.") diff --git a/ui/app/AppLayouts/Chat/components/RenameGroupPopup.qml b/ui/app/AppLayouts/Chat/components/RenameGroupPopup.qml index 217e3aee29..74445ea896 100644 --- a/ui/app/AppLayouts/Chat/components/RenameGroupPopup.qml +++ b/ui/app/AppLayouts/Chat/components/RenameGroupPopup.qml @@ -36,7 +36,7 @@ Popup { padding: 0 contentItem: Item { - Text { + StyledText { id: groupTitleLabel text: qsTr("Group name") anchors.top: parent.top diff --git a/ui/app/AppLayouts/Chat/components/SuggestedChannel.qml b/ui/app/AppLayouts/Chat/components/SuggestedChannel.qml index 4a8d054334..20582d37dc 100644 --- a/ui/app/AppLayouts/Chat/components/SuggestedChannel.qml +++ b/ui/app/AppLayouts/Chat/components/SuggestedChannel.qml @@ -1,5 +1,6 @@ import QtQuick 2.13 import "../../../../imports" +import "../../../../shared" Rectangle { property string channel: "status" @@ -9,7 +10,7 @@ Rectangle { width: children[0].width + 10 height: 32 border.color: Theme.grey - Text { + StyledText { id: suggestedChannelText text: "#" + channel font.weight: Font.Medium diff --git a/ui/app/AppLayouts/Node/NodeLayout.qml b/ui/app/AppLayouts/Node/NodeLayout.qml index 3f8c193c46..bb7461c5cd 100644 --- a/ui/app/AppLayouts/Node/NodeLayout.qml +++ b/ui/app/AppLayouts/Node/NodeLayout.qml @@ -2,6 +2,7 @@ import QtQuick 2.13 import QtQuick.Controls 2.13 import QtQuick.Layouts 1.13 import "../../../imports" +import "../../../shared" SplitView { id: nodeView @@ -25,7 +26,7 @@ SplitView { ColumnLayout { id: messageContainer Layout.fillHeight: true - Text { + StyledText { id: testDescription color: Theme.lightBlueText text: "latest block (auto updates):" @@ -35,7 +36,7 @@ SplitView { font.weight: Font.Medium font.pixelSize: 20 } - Text { + StyledText { id: test color: Theme.lightBlueText text: nodeModel.lastMessage diff --git a/ui/app/AppLayouts/Profile/LeftTab/Menu.qml b/ui/app/AppLayouts/Profile/LeftTab/Menu.qml index 0a608af827..f1247d6d89 100644 --- a/ui/app/AppLayouts/Profile/LeftTab/Menu.qml +++ b/ui/app/AppLayouts/Profile/LeftTab/Menu.qml @@ -2,6 +2,7 @@ import QtQuick 2.13 import QtQuick.Controls 2.13 import QtQuick.Layouts 1.13 import "../../../../imports" +import "../../../../shared" Rectangle { property alias profileCurrentIndex: profileScreenButtons.currentIndex @@ -37,7 +38,7 @@ Rectangle { color: Theme.transparent } - Text { + StyledText { id: element1 color: "#000000" text: qsTr("ENS usernames") @@ -62,7 +63,7 @@ Rectangle { color: Theme.transparent } - Text { + StyledText { id: element2 color: "#000000" text: qsTr("Contacts") @@ -88,7 +89,7 @@ Rectangle { color: Theme.transparent } - Text { + StyledText { id: element3 color: "#000000" text: qsTr("Privacy and security") @@ -114,7 +115,7 @@ Rectangle { color: Theme.transparent } - Text { + StyledText { id: element4 color: "#000000" text: qsTr("Sync settings") @@ -140,7 +141,7 @@ Rectangle { color: Theme.transparent } - Text { + StyledText { id: element5 color: "#000000" text: qsTr("Language settings") @@ -166,7 +167,7 @@ Rectangle { color: Theme.transparent } - Text { + StyledText { id: element6 color: "#000000" text: qsTr("Notifications settings") @@ -191,7 +192,7 @@ Rectangle { color: Theme.transparent } - Text { + StyledText { id: element7 color: "#000000" text: qsTr("Advanced settings") @@ -217,7 +218,7 @@ Rectangle { color: Theme.transparent } - Text { + StyledText { id: element8 color: "#000000" text: qsTr("Need help?") @@ -242,7 +243,7 @@ Rectangle { color: Theme.transparent } - Text { + StyledText { id: element9 color: "#000000" text: qsTr("About") @@ -267,7 +268,7 @@ Rectangle { color: Theme.transparent } - Text { + StyledText { id: element10 color: "#000000" text: qsTr("Sign out") diff --git a/ui/app/AppLayouts/Profile/LeftTab/Profile.qml b/ui/app/AppLayouts/Profile/LeftTab/Profile.qml index 15259447d8..c8164923fc 100644 --- a/ui/app/AppLayouts/Profile/LeftTab/Profile.qml +++ b/ui/app/AppLayouts/Profile/LeftTab/Profile.qml @@ -2,6 +2,7 @@ import QtQuick 2.13 import QtQuick.Layouts 1.13 import QtGraphicalEffects 1.13 import "../../../../imports" +import "../../../../shared" Rectangle { property string username: "Jotaro Kujo" @@ -45,7 +46,7 @@ Rectangle { } } - Text { + StyledText { id: profileName text: username anchors.top: profileImg.bottom @@ -55,7 +56,7 @@ Rectangle { font.weight: Font.Medium font.pixelSize: 20 } - Text { + StyledText { id: pubkeyText text: pubkey width: 208 diff --git a/ui/app/AppLayouts/Profile/Sections/AboutContainer.qml b/ui/app/AppLayouts/Profile/Sections/AboutContainer.qml index cc75887782..d2795ed763 100644 --- a/ui/app/AppLayouts/Profile/Sections/AboutContainer.qml +++ b/ui/app/AppLayouts/Profile/Sections/AboutContainer.qml @@ -2,6 +2,7 @@ import QtQuick 2.13 import QtQuick.Controls 2.13 import QtQuick.Layouts 1.13 import "../../../../imports" +import "../../../../shared" Item { id: aboutContainer @@ -10,7 +11,7 @@ Item { Layout.fillHeight: true Layout.fillWidth: true - Text { + StyledText { id: element9 text: qsTr("About the app") anchors.left: parent.left @@ -21,7 +22,7 @@ Item { font.pixelSize: 20 } - Text { + StyledText { id: element10 text: qsTr("Status Desktop") anchors.left: parent.left @@ -31,7 +32,7 @@ Item { font.weight: Font.Bold font.pixelSize: 14 } - Text { + StyledText { id: element11 text: qsTr("Version: 1.0") anchors.left: parent.left @@ -41,7 +42,7 @@ Item { font.weight: Font.Bold font.pixelSize: 14 } - Text { + StyledText { id: element12 text: qsTr("Node Version: %1").arg(profileModel.nodeVersion()) anchors.left: parent.left @@ -51,7 +52,7 @@ Item { font.weight: Font.Bold font.pixelSize: 14 } - Text { + StyledText { id: privacyPolicyLink text: "Privacy Policy" anchors.left: parent.left @@ -66,7 +67,7 @@ Item { cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor } } - Text { + StyledText { text: "Frequently asked questions" anchors.left: parent.left anchors.leftMargin: 24 diff --git a/ui/app/AppLayouts/Profile/Sections/AdvancedContainer.qml b/ui/app/AppLayouts/Profile/Sections/AdvancedContainer.qml index 1d6ae77ce8..16d219c53d 100644 --- a/ui/app/AppLayouts/Profile/Sections/AdvancedContainer.qml +++ b/ui/app/AppLayouts/Profile/Sections/AdvancedContainer.qml @@ -2,6 +2,7 @@ import QtQuick 2.13 import QtQuick.Controls 2.13 import QtQuick.Layouts 1.13 import "../../../../imports" +import "../../../../shared" Item { id: advancedContainer @@ -10,7 +11,7 @@ Item { Layout.fillHeight: true Layout.fillWidth: true - Text { + StyledText { id: element7 text: qsTr("Advanced settings") anchors.left: parent.left @@ -27,7 +28,7 @@ Item { anchors.topMargin: 20 anchors.left: parent.left anchors.leftMargin: 24 - Text { + StyledText { text: qsTr("Browser Tab") } Switch { @@ -36,7 +37,7 @@ Item { browserBtn.enabled = this.checked } } - Text { + StyledText { text: qsTr("experimental (web3 not supported yet)") } } @@ -46,7 +47,7 @@ Item { anchors.topMargin: 20 anchors.left: parent.left anchors.leftMargin: 24 - Text { + StyledText { text: qsTr("Node Management Tab") } Switch { @@ -55,7 +56,7 @@ Item { nodeBtn.enabled = this.checked } } - Text { + StyledText { text: qsTr("under development") } } diff --git a/ui/app/AppLayouts/Profile/Sections/Contacts/Contact.qml b/ui/app/AppLayouts/Profile/Sections/Contacts/Contact.qml index 435e9eb05e..130466b858 100644 --- a/ui/app/AppLayouts/Profile/Sections/Contacts/Contact.qml +++ b/ui/app/AppLayouts/Profile/Sections/Contacts/Contact.qml @@ -24,7 +24,7 @@ Rectangle { anchors.verticalCenter: parent.verticalCenter source: identicon } - Text { + StyledText { id: usernameText text: name elide: Text.ElideRight @@ -35,7 +35,7 @@ Rectangle { anchors.left: accountImage.right anchors.leftMargin: Theme.padding } - Text { + StyledText { id: addressText width: 108 text: address diff --git a/ui/app/AppLayouts/Profile/Sections/ContactsContainer.qml b/ui/app/AppLayouts/Profile/Sections/ContactsContainer.qml index b5edfe7509..6fcea220f7 100644 --- a/ui/app/AppLayouts/Profile/Sections/ContactsContainer.qml +++ b/ui/app/AppLayouts/Profile/Sections/ContactsContainer.qml @@ -2,6 +2,7 @@ import QtQuick 2.13 import QtQuick.Controls 2.13 import QtQuick.Layouts 1.13 import "../../../../imports" +import "../../../../shared" import "./Contacts" Item { @@ -11,7 +12,7 @@ Item { Layout.fillHeight: true Layout.fillWidth: true - Text { + StyledText { id: element2 text: qsTr("Contacts") anchors.left: parent.left diff --git a/ui/app/AppLayouts/Profile/Sections/EnsContainer.qml b/ui/app/AppLayouts/Profile/Sections/EnsContainer.qml index 5cb01955ae..4d4c8eb650 100644 --- a/ui/app/AppLayouts/Profile/Sections/EnsContainer.qml +++ b/ui/app/AppLayouts/Profile/Sections/EnsContainer.qml @@ -2,6 +2,7 @@ import QtQuick 2.3 import QtQuick.Layouts 1.3 import QtQuick.Controls 2.3 import "../../../../imports" +import "../../../../shared" Item { id: ensContainer @@ -10,7 +11,7 @@ Item { Layout.fillHeight: true Layout.fillWidth: true - Text { + StyledText { id: element1 text: qsTr("ENS usernames") anchors.left: parent.left diff --git a/ui/app/AppLayouts/Profile/Sections/HelpContainer.qml b/ui/app/AppLayouts/Profile/Sections/HelpContainer.qml index 02db5e6fc6..70b388b27f 100644 --- a/ui/app/AppLayouts/Profile/Sections/HelpContainer.qml +++ b/ui/app/AppLayouts/Profile/Sections/HelpContainer.qml @@ -2,6 +2,7 @@ import QtQuick 2.13 import QtQuick.Controls 2.13 import QtQuick.Layouts 1.13 import "../../../../imports" +import "../../../../shared" Item { id: helpContainer @@ -10,7 +11,7 @@ Item { Layout.fillHeight: true Layout.fillWidth: true - Text { + StyledText { id: element8 text: qsTr("Help menus: FAQ, Glossary, etc.") anchors.left: parent.left @@ -21,7 +22,7 @@ Item { font.pixelSize: 20 } - Text { + StyledText { anchors.centerIn: parent text: "Frequently asked questions" onLinkActivated: Qt.openUrlExternally(link) diff --git a/ui/app/AppLayouts/Profile/Sections/LanguageContainer.qml b/ui/app/AppLayouts/Profile/Sections/LanguageContainer.qml index 8e360cb95d..a281854cf3 100644 --- a/ui/app/AppLayouts/Profile/Sections/LanguageContainer.qml +++ b/ui/app/AppLayouts/Profile/Sections/LanguageContainer.qml @@ -2,6 +2,7 @@ import QtQuick 2.13 import QtQuick.Controls 2.13 import QtQuick.Layouts 1.13 import "../../../../imports" +import "../../../../shared" Item { id: languageContainer @@ -10,7 +11,7 @@ Item { Layout.fillHeight: true Layout.fillWidth: true - Text { + StyledText { id: element5 text: qsTr("Language settings") anchors.left: parent.left diff --git a/ui/app/AppLayouts/Profile/Sections/NotificationsContainer.qml b/ui/app/AppLayouts/Profile/Sections/NotificationsContainer.qml index 558e91132d..1a8afc2412 100644 --- a/ui/app/AppLayouts/Profile/Sections/NotificationsContainer.qml +++ b/ui/app/AppLayouts/Profile/Sections/NotificationsContainer.qml @@ -2,6 +2,7 @@ import QtQuick 2.13 import QtQuick.Controls 2.13 import QtQuick.Layouts 1.13 import "../../../../imports" +import "../../../../shared" Item { id: notificationsContainer @@ -10,7 +11,7 @@ Item { Layout.fillHeight: true Layout.fillWidth: true - Text { + StyledText { id: element6 text: qsTr("Notifications settings") anchors.left: parent.left diff --git a/ui/app/AppLayouts/Profile/Sections/PrivacyContainer.qml b/ui/app/AppLayouts/Profile/Sections/PrivacyContainer.qml index 7a0c68e588..9de16389c9 100644 --- a/ui/app/AppLayouts/Profile/Sections/PrivacyContainer.qml +++ b/ui/app/AppLayouts/Profile/Sections/PrivacyContainer.qml @@ -2,6 +2,7 @@ import QtQuick 2.13 import QtQuick.Controls 2.13 import QtQuick.Layouts 1.13 import "../../../../imports" +import "../../../../shared" Item { id: privacyContainer @@ -10,7 +11,7 @@ Item { Layout.fillHeight: true Layout.fillWidth: true - Text { + StyledText { id: element3 text: qsTr("Privacy and security settings") anchors.left: parent.left diff --git a/ui/app/AppLayouts/Profile/Sections/SignoutContainer.qml b/ui/app/AppLayouts/Profile/Sections/SignoutContainer.qml index a28a6972c4..b83c85c7ad 100644 --- a/ui/app/AppLayouts/Profile/Sections/SignoutContainer.qml +++ b/ui/app/AppLayouts/Profile/Sections/SignoutContainer.qml @@ -11,7 +11,7 @@ Item { Layout.fillHeight: true Layout.fillWidth: true - Text { + StyledText { id: txtTitle text: qsTr("Sign out controls") anchors.left: parent.left diff --git a/ui/app/AppLayouts/Profile/Sections/SyncContainer.qml b/ui/app/AppLayouts/Profile/Sections/SyncContainer.qml index ca180afbd3..1fbf1ef893 100644 --- a/ui/app/AppLayouts/Profile/Sections/SyncContainer.qml +++ b/ui/app/AppLayouts/Profile/Sections/SyncContainer.qml @@ -2,6 +2,7 @@ import QtQuick 2.13 import QtQuick.Controls 2.13 import QtQuick.Layouts 1.13 import "../../../../imports" +import "../../../../shared" Item { id: syncContainer @@ -10,7 +11,7 @@ Item { Layout.fillHeight: true Layout.fillWidth: true - Text { + StyledText { id: element4 text: qsTr("Sync settings") anchors.left: parent.left diff --git a/ui/app/AppLayouts/Wallet/AssetsTab.qml b/ui/app/AppLayouts/Wallet/AssetsTab.qml index e0b9d10a81..44b8c61382 100644 --- a/ui/app/AppLayouts/Wallet/AssetsTab.qml +++ b/ui/app/AppLayouts/Wallet/AssetsTab.qml @@ -1,5 +1,6 @@ import QtQuick 2.13 import "../../../imports" +import "../../../shared" Item { Component { @@ -27,7 +28,7 @@ Item { } } } - Text { + StyledText { id: assetSymbol text: symbol anchors.left: assetInfoImage.right @@ -37,7 +38,7 @@ Item { color: Theme.black font.pixelSize: 15 } - Text { + StyledText { id: assetFullTokenName text: name anchors.bottom: parent.bottom @@ -47,7 +48,7 @@ Item { color: Theme.darkGrey font.pixelSize: 15 } - Text { + StyledText { id: assetValue text: value anchors.right: parent.right @@ -55,7 +56,7 @@ Item { font.pixelSize: 15 font.strikeout: false } - Text { + StyledText { id: assetFiatValue color: Theme.darkGrey text: fiatValue diff --git a/ui/app/AppLayouts/Wallet/CollectiblesTab.qml b/ui/app/AppLayouts/Wallet/CollectiblesTab.qml index 3553b3197d..3b11c55e45 100644 --- a/ui/app/AppLayouts/Wallet/CollectiblesTab.qml +++ b/ui/app/AppLayouts/Wallet/CollectiblesTab.qml @@ -1,8 +1,9 @@ import QtQuick 2.13 import "../../../imports" +import "../../../shared" Item { - Text { + StyledText { visible: walletModel.collectibles.rowCount() === 0 text: qsTr("No collectibles in this account") } @@ -28,7 +29,7 @@ Item { anchors.verticalCenter: parent.verticalCenter } - Text { + StyledText { id: collectibleName text: name anchors.leftMargin: Theme.padding @@ -37,7 +38,7 @@ Item { font.pixelSize: 15 } - Text { + StyledText { id: collectibleIdText text: collectibleId anchors.leftMargin: Theme.padding diff --git a/ui/app/AppLayouts/Wallet/Components/AddAccountWithSeed.qml b/ui/app/AppLayouts/Wallet/Components/AddAccountWithSeed.qml index 1a2120b124..97a01f49a8 100644 --- a/ui/app/AppLayouts/Wallet/Components/AddAccountWithSeed.qml +++ b/ui/app/AppLayouts/Wallet/Components/AddAccountWithSeed.qml @@ -64,7 +64,7 @@ ModalPopup { anchors.topMargin: Theme.padding anchors.right: parent.right anchors.rightMargin: Theme.padding - label: "Add account >" + label: "Add account 00>" disabled: passwordInput.text === "" || accountNameInput.text === "" || accountSeedInput.text === "" diff --git a/ui/app/AppLayouts/Wallet/Components/SendModalContent.qml b/ui/app/AppLayouts/Wallet/Components/SendModalContent.qml index c01dea4e45..1937ebb5a2 100644 --- a/ui/app/AppLayouts/Wallet/Components/SendModalContent.qml +++ b/ui/app/AppLayouts/Wallet/Components/SendModalContent.qml @@ -7,7 +7,7 @@ Item { property alias valueInput: txtValue property string defaultAccount: "0x1234" - Text { + StyledText { id: modalDialogTitle text: "Send" anchors.top: parent.top diff --git a/ui/app/AppLayouts/Wallet/Components/SetCurrencyModalContent.qml b/ui/app/AppLayouts/Wallet/Components/SetCurrencyModalContent.qml index e69c2cd0c1..d567127bdc 100644 --- a/ui/app/AppLayouts/Wallet/Components/SetCurrencyModalContent.qml +++ b/ui/app/AppLayouts/Wallet/Components/SetCurrencyModalContent.qml @@ -8,7 +8,7 @@ Item { id: element property string currency: "USD" - Text { + StyledText { id: modalDialogTitle text: "Settings" anchors.top: parent.top @@ -77,7 +77,7 @@ Item { width: parent.width height: 52 - Text { + StyledText { text: name + " (" + code + ")" font.pixelSize: 15 } diff --git a/ui/app/AppLayouts/Wallet/Components/TokenSettingsModalContent.qml b/ui/app/AppLayouts/Wallet/Components/TokenSettingsModalContent.qml index 05b502f1f2..b77fad92cc 100644 --- a/ui/app/AppLayouts/Wallet/Components/TokenSettingsModalContent.qml +++ b/ui/app/AppLayouts/Wallet/Components/TokenSettingsModalContent.qml @@ -50,7 +50,7 @@ Item { anchors.left: parent.left anchors.leftMargin: 0 } - Text { + StyledText { id: assetSymbol text: symbol anchors.left: assetInfoImage.right @@ -60,7 +60,7 @@ Item { color: Theme.black font.pixelSize: 15 } - Text { + StyledText { id: assetFullTokenName text: name anchors.bottom: assetInfoImage.bottom diff --git a/ui/app/AppLayouts/Wallet/Components/TransactionModal.qml b/ui/app/AppLayouts/Wallet/Components/TransactionModal.qml index 12b1860e0e..eb042c61b2 100644 --- a/ui/app/AppLayouts/Wallet/Components/TransactionModal.qml +++ b/ui/app/AppLayouts/Wallet/Components/TransactionModal.qml @@ -17,13 +17,13 @@ ModalPopup { anchors.rightMargin: Theme.smallPadding height: children[0].height + children[1].height + Theme.smallPadding - Text { + StyledText { id: confirmationsCount text: qsTr("9999 Confirmations") font.pixelSize: 14 } - Text { + StyledText { id: confirmationsInfo text: qsTr("When the transaction has 12 confirmations you can consider it settled.") font.pixelSize: 14 @@ -52,7 +52,7 @@ ModalPopup { anchors.leftMargin: Theme.smallPadding height: children[0].height - Text { + StyledText { id: labelBlock text: qsTr("Block") font.pixelSize: 14 @@ -60,7 +60,7 @@ ModalPopup { color: Theme.darkGrey } - Text { + StyledText { id: valueBlock text: blockNumber font.pixelSize: 14 @@ -77,7 +77,7 @@ ModalPopup { anchors.leftMargin: Theme.smallPadding height: children[0].height - Text { + StyledText { id: labelHash text: qsTr("Hash") font.pixelSize: 14 @@ -85,7 +85,7 @@ ModalPopup { color: Theme.darkGrey } - Text { + StyledText { id: valueHash text: blockHash width: 160 @@ -104,7 +104,7 @@ ModalPopup { anchors.leftMargin: Theme.smallPadding height: children[0].height - Text { + StyledText { id: labelFrom text: qsTr("From") font.pixelSize: 14 @@ -112,7 +112,7 @@ ModalPopup { color: Theme.darkGrey } - Text { + StyledText { id: valueFrom text: fromAddress width: 160 @@ -131,7 +131,7 @@ ModalPopup { anchors.leftMargin: Theme.smallPadding height: children[0].height - Text { + StyledText { id: labelTo text: qsTr("To") font.pixelSize: 14 @@ -139,7 +139,7 @@ ModalPopup { color: Theme.darkGrey } - Text { + StyledText { id: valueTo text: to width: 160 @@ -158,7 +158,7 @@ ModalPopup { anchors.leftMargin: Theme.smallPadding height: children[0].height - Text { + StyledText { id: labelGasLimit text: qsTr("Gas limit") font.pixelSize: 14 @@ -166,7 +166,7 @@ ModalPopup { color: Theme.darkGrey } - Text { + StyledText { id: valueGasLimit text: gasLimit font.pixelSize: 14 @@ -183,7 +183,7 @@ ModalPopup { anchors.leftMargin: Theme.smallPadding height: children[0].height - Text { + StyledText { id: labelGasPrice text: qsTr("Gas price") font.pixelSize: 14 @@ -191,7 +191,7 @@ ModalPopup { color: Theme.darkGrey } - Text { + StyledText { id: valueGasPrice text: gasPrice font.pixelSize: 14 @@ -208,7 +208,7 @@ ModalPopup { anchors.leftMargin: Theme.smallPadding height: children[0].height - Text { + StyledText { id: labelGasUsed text: qsTr("Gas used") font.pixelSize: 14 @@ -216,7 +216,7 @@ ModalPopup { color: Theme.darkGrey } - Text { + StyledText { id: valueGasUsed text: gasUsed font.pixelSize: 14 @@ -233,7 +233,7 @@ ModalPopup { anchors.leftMargin: Theme.smallPadding height: children[0].height - Text { + StyledText { id: labelNonce text: qsTr("Nonce") font.pixelSize: 14 @@ -241,7 +241,7 @@ ModalPopup { color: Theme.darkGrey } - Text { + StyledText { id: valueNonce text: nonce font.pixelSize: 14 diff --git a/ui/app/AppLayouts/Wallet/HistoryTab.qml b/ui/app/AppLayouts/Wallet/HistoryTab.qml index 228cf384bc..8233ec2e92 100644 --- a/ui/app/AppLayouts/Wallet/HistoryTab.qml +++ b/ui/app/AppLayouts/Wallet/HistoryTab.qml @@ -1,6 +1,7 @@ import QtQuick 2.13 import "./Components" import "../../../imports" +import "../../../shared" Item { Component { @@ -45,7 +46,7 @@ Item { radius: 50 } - Text { + StyledText { id: transferIcon anchors.topMargin: 25 anchors.top: parent.top @@ -57,7 +58,7 @@ Item { text: to != walletModel.currentAccount.address ? "↑" : "↓" } - Text { + StyledText { id: transactionValue anchors.left: transferIcon.right anchors.leftMargin: Theme.smallPadding @@ -74,7 +75,7 @@ Item { anchors.topMargin: Theme.bigPadding width: children[0].width + children[1].width - Text { + StyledText { text: to != walletModel.currentAccount.address ? "To " : "From " anchors.right: addressValue.left color: Theme.darkGrey @@ -83,7 +84,7 @@ Item { font.strikeout: false } - Text { + StyledText { id: addressValue text: to width: 100 @@ -101,7 +102,7 @@ Item { anchors.topMargin: Theme.bigPadding width: children[0].width + children[1].width + children[2].width - Text { + StyledText { text: "• " font.weight: Font.Bold anchors.right: timeIndicator.left @@ -110,7 +111,7 @@ Item { font.pixelSize: 15 } - Text { + StyledText { id: timeIndicator text: "At " anchors.right: timeValue.left @@ -120,7 +121,7 @@ Item { font.strikeout: false } - Text { + StyledText { id: timeValue text: timestamp anchors.right: parent.right diff --git a/ui/app/AppLayouts/Wallet/LeftTab.qml b/ui/app/AppLayouts/Wallet/LeftTab.qml index a9dd849072..a8f0ea2740 100644 --- a/ui/app/AppLayouts/Wallet/LeftTab.qml +++ b/ui/app/AppLayouts/Wallet/LeftTab.qml @@ -30,7 +30,7 @@ Item { z: 1 border.width: 0 - Text { + StyledText { id: title x: 143 y: 16 @@ -65,7 +65,7 @@ Item { font.pixelSize: 30 } - Text { + StyledText { id: totalValue color: Theme.darkGrey text: "Total value" @@ -111,7 +111,7 @@ Item { source: walletIcon color: selected || !iconColor ? Theme.transparent : iconColor // change image color } - Text { + StyledText { id: walletName text: name anchors.top: parent.top @@ -122,7 +122,7 @@ Item { font.weight: Font.Medium color: selected ? Theme.white : Theme.black } - Text { + StyledText { id: walletAddress text: address anchors.right: parent.right @@ -137,7 +137,7 @@ Item { color: selected ? Theme.white : Theme.darkGrey opacity: selected ? 0.7 : 1 } - Text { + StyledText { id: walletBalance text: balance anchors.top: parent.top diff --git a/ui/app/AppLayouts/Wallet/WalletHeader.qml b/ui/app/AppLayouts/Wallet/WalletHeader.qml index 46876a86d8..5e072e0b15 100644 --- a/ui/app/AppLayouts/Wallet/WalletHeader.qml +++ b/ui/app/AppLayouts/Wallet/WalletHeader.qml @@ -19,7 +19,7 @@ Item { Layout.fillHeight: true Layout.fillWidth: true - Text { + StyledText { id: title text: currentAccount.name anchors.top: parent.top @@ -42,7 +42,7 @@ Item { radius: 50 } - Text { + StyledText { id: walletBalance text: currentAccount.balance anchors.left: separatorDot.right @@ -51,7 +51,7 @@ Item { font.pixelSize: 22 } - Text { + StyledText { id: walletAddress text: currentAccount.address elide: Text.ElideMiddle @@ -110,7 +110,7 @@ Item { source: "../../img/diagonalArrow.svg" } - Text { + StyledText { id: sendText text: "Send" anchors.left: sendImg.right @@ -143,7 +143,7 @@ Item { rotation: 180 } - Text { + StyledText { id: receiveText text: "Receive" anchors.left: receiveImg.right diff --git a/fonts/InterStatus/InterStatus-Black.otf b/ui/fonts/InterStatus/InterStatus-Black.otf similarity index 100% rename from fonts/InterStatus/InterStatus-Black.otf rename to ui/fonts/InterStatus/InterStatus-Black.otf diff --git a/fonts/InterStatus/InterStatus-BlackItalic.otf b/ui/fonts/InterStatus/InterStatus-BlackItalic.otf similarity index 100% rename from fonts/InterStatus/InterStatus-BlackItalic.otf rename to ui/fonts/InterStatus/InterStatus-BlackItalic.otf diff --git a/fonts/InterStatus/InterStatus-Bold.otf b/ui/fonts/InterStatus/InterStatus-Bold.otf similarity index 100% rename from fonts/InterStatus/InterStatus-Bold.otf rename to ui/fonts/InterStatus/InterStatus-Bold.otf diff --git a/fonts/InterStatus/InterStatus-BoldItalic.otf b/ui/fonts/InterStatus/InterStatus-BoldItalic.otf similarity index 100% rename from fonts/InterStatus/InterStatus-BoldItalic.otf rename to ui/fonts/InterStatus/InterStatus-BoldItalic.otf diff --git a/fonts/InterStatus/InterStatus-ExtraBold.otf b/ui/fonts/InterStatus/InterStatus-ExtraBold.otf similarity index 100% rename from fonts/InterStatus/InterStatus-ExtraBold.otf rename to ui/fonts/InterStatus/InterStatus-ExtraBold.otf diff --git a/fonts/InterStatus/InterStatus-ExtraBoldItalic.otf b/ui/fonts/InterStatus/InterStatus-ExtraBoldItalic.otf similarity index 100% rename from fonts/InterStatus/InterStatus-ExtraBoldItalic.otf rename to ui/fonts/InterStatus/InterStatus-ExtraBoldItalic.otf diff --git a/fonts/InterStatus/InterStatus-ExtraLight.otf b/ui/fonts/InterStatus/InterStatus-ExtraLight.otf similarity index 100% rename from fonts/InterStatus/InterStatus-ExtraLight.otf rename to ui/fonts/InterStatus/InterStatus-ExtraLight.otf diff --git a/fonts/InterStatus/InterStatus-ExtraLightItalic.otf b/ui/fonts/InterStatus/InterStatus-ExtraLightItalic.otf similarity index 100% rename from fonts/InterStatus/InterStatus-ExtraLightItalic.otf rename to ui/fonts/InterStatus/InterStatus-ExtraLightItalic.otf diff --git a/fonts/InterStatus/InterStatus-Italic.otf b/ui/fonts/InterStatus/InterStatus-Italic.otf similarity index 100% rename from fonts/InterStatus/InterStatus-Italic.otf rename to ui/fonts/InterStatus/InterStatus-Italic.otf diff --git a/fonts/InterStatus/InterStatus-Light.otf b/ui/fonts/InterStatus/InterStatus-Light.otf similarity index 100% rename from fonts/InterStatus/InterStatus-Light.otf rename to ui/fonts/InterStatus/InterStatus-Light.otf diff --git a/fonts/InterStatus/InterStatus-LightItalic.otf b/ui/fonts/InterStatus/InterStatus-LightItalic.otf similarity index 100% rename from fonts/InterStatus/InterStatus-LightItalic.otf rename to ui/fonts/InterStatus/InterStatus-LightItalic.otf diff --git a/fonts/InterStatus/InterStatus-Medium.otf b/ui/fonts/InterStatus/InterStatus-Medium.otf similarity index 100% rename from fonts/InterStatus/InterStatus-Medium.otf rename to ui/fonts/InterStatus/InterStatus-Medium.otf diff --git a/fonts/InterStatus/InterStatus-MediumItalic.otf b/ui/fonts/InterStatus/InterStatus-MediumItalic.otf similarity index 100% rename from fonts/InterStatus/InterStatus-MediumItalic.otf rename to ui/fonts/InterStatus/InterStatus-MediumItalic.otf diff --git a/fonts/InterStatus/InterStatus-Regular.otf b/ui/fonts/InterStatus/InterStatus-Regular.otf similarity index 100% rename from fonts/InterStatus/InterStatus-Regular.otf rename to ui/fonts/InterStatus/InterStatus-Regular.otf diff --git a/fonts/InterStatus/InterStatus-SemiBold.otf b/ui/fonts/InterStatus/InterStatus-SemiBold.otf similarity index 100% rename from fonts/InterStatus/InterStatus-SemiBold.otf rename to ui/fonts/InterStatus/InterStatus-SemiBold.otf diff --git a/fonts/InterStatus/InterStatus-SemiBoldItalic.otf b/ui/fonts/InterStatus/InterStatus-SemiBoldItalic.otf similarity index 100% rename from fonts/InterStatus/InterStatus-SemiBoldItalic.otf rename to ui/fonts/InterStatus/InterStatus-SemiBoldItalic.otf diff --git a/fonts/InterStatus/InterStatus-Thin.otf b/ui/fonts/InterStatus/InterStatus-Thin.otf similarity index 100% rename from fonts/InterStatus/InterStatus-Thin.otf rename to ui/fonts/InterStatus/InterStatus-Thin.otf diff --git a/fonts/InterStatus/InterStatus-ThinItalic.otf b/ui/fonts/InterStatus/InterStatus-ThinItalic.otf similarity index 100% rename from fonts/InterStatus/InterStatus-ThinItalic.otf rename to ui/fonts/InterStatus/InterStatus-ThinItalic.otf diff --git a/ui/imports/Theme.qml b/ui/imports/Theme.qml index e14fd24822..c5be973b87 100644 --- a/ui/imports/Theme.qml +++ b/ui/imports/Theme.qml @@ -3,6 +3,11 @@ pragma Singleton import QtQuick 2.13 QtObject { + property QtObject fontMedium: FontLoader { id: _fontMedium; source: "../fonts/InterStatus/InterStatus-Medium.otf"; } + property QtObject fontBold: FontLoader { id: _fontBold; source: "../fonts/InterStatus/InterStatus-Bold.otf"; } + property QtObject fontLight: FontLoader { id: _fontLight; source: "../fonts/InterStatus/InterStatus-Light.otf"; } + property QtObject fontRegular: FontLoader { id: _fontRegular; source: "../fonts/InterStatus/InterStatus-Regular.otf"; } + readonly property color white: "#FFFFFF" readonly property color white2: "#FCFCFC" readonly property color black: "#000000" diff --git a/ui/main.qml b/ui/main.qml index b2a8b7e011..1138929d18 100644 --- a/ui/main.qml +++ b/ui/main.qml @@ -5,6 +5,7 @@ import Qt.labs.platform 1.1 import QtQml.StateMachine 1.14 as DSM import "./onboarding" import "./app" +import "./imports" ApplicationWindow { id: applicationWindow @@ -12,7 +13,6 @@ ApplicationWindow { height: 770 title: "Nim Status Client" visible: true - font.family: "Inter" signal navigateTo(string path) diff --git a/ui/nim-status-client.pro b/ui/nim-status-client.pro index b8249e8cf3..b93247b71a 100644 --- a/ui/nim-status-client.pro +++ b/ui/nim-status-client.pro @@ -51,24 +51,24 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin !isEmpty(target.path): INSTALLS += target DISTFILES += \ - ../fonts/InterStatus/InterStatus-Black.otf \ - ../fonts/InterStatus/InterStatus-BlackItalic.otf \ - ../fonts/InterStatus/InterStatus-Bold.otf \ - ../fonts/InterStatus/InterStatus-BoldItalic.otf \ - ../fonts/InterStatus/InterStatus-ExtraBold.otf \ - ../fonts/InterStatus/InterStatus-ExtraBoldItalic.otf \ - ../fonts/InterStatus/InterStatus-ExtraLight.otf \ - ../fonts/InterStatus/InterStatus-ExtraLightItalic.otf \ - ../fonts/InterStatus/InterStatus-Italic.otf \ - ../fonts/InterStatus/InterStatus-Light.otf \ - ../fonts/InterStatus/InterStatus-LightItalic.otf \ - ../fonts/InterStatus/InterStatus-Medium.otf \ - ../fonts/InterStatus/InterStatus-MediumItalic.otf \ - ../fonts/InterStatus/InterStatus-Regular.otf \ - ../fonts/InterStatus/InterStatus-SemiBold.otf \ - ../fonts/InterStatus/InterStatus-SemiBoldItalic.otf \ - ../fonts/InterStatus/InterStatus-Thin.otf \ - ../fonts/InterStatus/InterStatus-ThinItalic.otf \ + fonts/InterStatus/InterStatus-Black.otf \ + fonts/InterStatus/InterStatus-BlackItalic.otf \ + fonts/InterStatus/InterStatus-Bold.otf \ + fonts/InterStatus/InterStatus-BoldItalic.otf \ + fonts/InterStatus/InterStatus-ExtraBold.otf \ + fonts/InterStatus/InterStatus-ExtraBoldItalic.otf \ + fonts/InterStatus/InterStatus-ExtraLight.otf \ + fonts/InterStatus/InterStatus-ExtraLightItalic.otf \ + fonts/InterStatus/InterStatus-Italic.otf \ + fonts/InterStatus/InterStatus-Light.otf \ + fonts/InterStatus/InterStatus-LightItalic.otf \ + fonts/InterStatus/InterStatus-Medium.otf \ + fonts/InterStatus/InterStatus-MediumItalic.otf \ + fonts/InterStatus/InterStatus-Regular.otf \ + fonts/InterStatus/InterStatus-SemiBold.otf \ + fonts/InterStatus/InterStatus-SemiBoldItalic.otf \ + fonts/InterStatus/InterStatus-Thin.otf \ + fonts/InterStatus/InterStatus-ThinItalic.otf \ Theme.qml \ app/AppLayouts/Browser/BrowserLayout.qml \ app/AppLayouts/Chat/ChatColumn.qml \ @@ -206,6 +206,7 @@ DISTFILES += \ shared/StatusTabButton.qml \ shared/StyledButton.qml \ shared/RoundedIcon.qml \ + shared/StyledText.qml \ shared/StyledTextArea.qml \ shared/TextWithLabel.qml \ shared/qmldir diff --git a/ui/onboarding/CreatePasswordModal.qml b/ui/onboarding/CreatePasswordModal.qml index 12656df435..6be4bfde43 100644 --- a/ui/onboarding/CreatePasswordModal.qml +++ b/ui/onboarding/CreatePasswordModal.qml @@ -40,7 +40,7 @@ ModalPopup { } } - Text { + StyledText { text: qsTr("At least 6 characters. You will use this password to unlock status on this device & sign transactions.") wrapMode: Text.WordWrap anchors.right: parent.right diff --git a/ui/onboarding/EnterSeedPhraseModal.qml b/ui/onboarding/EnterSeedPhraseModal.qml index 1b4b50aea2..4b6b00fe15 100644 --- a/ui/onboarding/EnterSeedPhraseModal.qml +++ b/ui/onboarding/EnterSeedPhraseModal.qml @@ -32,7 +32,7 @@ ModalPopup { } } - Text { + StyledText { text: qsTr("Enter 12, 15, 18, 21 or 24 words.\nSeperate words by a single space.") anchors.horizontalCenter: parent.horizontalCenter anchors.bottom: parent.bottom diff --git a/ui/onboarding/GenKeyModal.qml b/ui/onboarding/GenKeyModal.qml index 0a45c74e8c..4f9b5d1742 100644 --- a/ui/onboarding/GenKeyModal.qml +++ b/ui/onboarding/GenKeyModal.qml @@ -1,5 +1,6 @@ import QtQuick 2.13 import QtQuick.Controls 2.13 +import "../imports" import "../shared" import "./Login" diff --git a/ui/onboarding/Intro.qml b/ui/onboarding/Intro.qml index c0ffa54b86..cf020086fc 100644 --- a/ui/onboarding/Intro.qml +++ b/ui/onboarding/Intro.qml @@ -78,7 +78,7 @@ RowLayout { height: 44 } - Text { + StyledText { id: txtPrivacyPolicy x: 772 text: qsTr("Status does not collect, share or sell any personal data. By continuing you agree with the privacy policy.") diff --git a/ui/onboarding/KeysMain.qml b/ui/onboarding/KeysMain.qml index c2e3f8295a..29e6c598f9 100644 --- a/ui/onboarding/KeysMain.qml +++ b/ui/onboarding/KeysMain.qml @@ -33,7 +33,7 @@ Page { source: "img/key@2x.png" } - Text { + StyledText { id: txtTitle1 text: qsTr("Get your keys") anchors.topMargin: Theme.padding @@ -44,7 +44,7 @@ Page { font.pixelSize: 22 } - Text { + StyledText { id: txtDesc1 color: Theme.darkGrey text: qsTr("A set of keys controls your account. Your keys live on your device, so only you can use them.") diff --git a/ui/onboarding/Login.qml b/ui/onboarding/Login.qml index 90bf119cd4..d1a988867d 100644 --- a/ui/onboarding/Login.qml +++ b/ui/onboarding/Login.qml @@ -33,7 +33,7 @@ Item { source: loginModel.currentAccount.identicon } - Text { + StyledText { id: usernameText text: loginModel.currentAccount.username font.weight: Font.Bold @@ -107,7 +107,7 @@ Item { } } - Text { + StyledText { id: addressText width: 90 color: Theme.darkGrey @@ -205,7 +205,7 @@ Item { onGenKeyClicked() } - Text { + StyledText { id: generateKeysLinkText color: Theme.blue text: qsTr("Generate new keys") diff --git a/ui/onboarding/Login/AddressView.qml b/ui/onboarding/Login/AddressView.qml index 949e6214c5..774673fb0f 100644 --- a/ui/onboarding/Login/AddressView.qml +++ b/ui/onboarding/Login/AddressView.qml @@ -29,7 +29,7 @@ Rectangle { anchors.verticalCenter: parent.verticalCenter source: identicon } - Text { + StyledText { id: usernameText text: username elide: Text.ElideRight @@ -41,7 +41,7 @@ Rectangle { anchors.leftMargin: Theme.padding } - Text { + StyledText { id: addressText width: 108 text: address diff --git a/ui/onboarding/Login/ConfirmAddExistingKeyModal.qml b/ui/onboarding/Login/ConfirmAddExistingKeyModal.qml index 8b2205105b..8228b4ae7f 100644 --- a/ui/onboarding/Login/ConfirmAddExistingKeyModal.qml +++ b/ui/onboarding/Login/ConfirmAddExistingKeyModal.qml @@ -9,7 +9,7 @@ ModalPopup { title: qsTr("Enter seed phrase") height: 200 - Text { + StyledText { text: "Do you want to add another existing key?" anchors.left: parent.left anchors.top: parent.top diff --git a/ui/onboarding/Slide.qml b/ui/onboarding/Slide.qml index ebebdf5aac..6c96654a4b 100644 --- a/ui/onboarding/Slide.qml +++ b/ui/onboarding/Slide.qml @@ -1,6 +1,7 @@ import QtQuick 2.13 import QtQuick.Controls 2.13 import "../imports" +import "../shared" Item { id: slide @@ -19,7 +20,7 @@ Item { source: image } - Text { + StyledText { id: txtTitle1 text: title anchors.right: parent.right @@ -39,7 +40,7 @@ Item { font.kerning: true } - Text { + StyledText { id: txtDesc1 x: 772 color: Theme.darkGrey diff --git a/ui/shared/Input.qml b/ui/shared/Input.qml index a15ee0c036..3c48b23d42 100644 --- a/ui/shared/Input.qml +++ b/ui/shared/Input.qml @@ -28,7 +28,7 @@ Item { anchors.right: parent.right anchors.left: parent.left - Text { + StyledText { id: inputLabel text: inputBox.label font.weight: Font.Medium diff --git a/ui/shared/ModalPopup.qml b/ui/shared/ModalPopup.qml index 07cf3a0a7b..8d5e0214e1 100644 --- a/ui/shared/ModalPopup.qml +++ b/ui/shared/ModalPopup.qml @@ -42,7 +42,7 @@ Popup { anchors.rightMargin: Theme.padding anchors.leftMargin: Theme.padding - Text { + StyledText { text: title anchors.top: parent.top anchors.left: parent.left diff --git a/ui/shared/PopupMenu.qml b/ui/shared/PopupMenu.qml index 8a82050779..9bdd70f4eb 100644 --- a/ui/shared/PopupMenu.qml +++ b/ui/shared/PopupMenu.qml @@ -37,7 +37,7 @@ Menu { } } - Text { + StyledText { anchors.left: menuIcon.right anchors.leftMargin: 32 topPadding: 4 diff --git a/ui/shared/Select.qml b/ui/shared/Select.qml index 9f9f33efd5..d314553d97 100644 --- a/ui/shared/Select.qml +++ b/ui/shared/Select.qml @@ -18,7 +18,7 @@ Item { anchors.right: parent.right anchors.left: parent.left - Text { + StyledText { id: inputLabel text: inputBox.label font.weight: Font.Medium diff --git a/ui/shared/StatusTabButton.qml b/ui/shared/StatusTabButton.qml index f98a754711..f29ffe9c9e 100644 --- a/ui/shared/StatusTabButton.qml +++ b/ui/shared/StatusTabButton.qml @@ -15,7 +15,7 @@ TabButton { border.color: Theme.transparent } - Text { + StyledText { id: tabBtnText text: btnText font.weight: Font.Medium diff --git a/ui/shared/StyledButton.qml b/ui/shared/StyledButton.qml index 131c94c5e9..cfb9cca1a3 100644 --- a/ui/shared/StyledButton.qml +++ b/ui/shared/StyledButton.qml @@ -24,7 +24,7 @@ Button { border.width: btnBorderWidth } - Text { + StyledText { id: txtBtnLabel color: btnStyled.disabled ? Theme.darkGrey : btnStyled.textColor font.pixelSize: 15 diff --git a/ui/shared/StyledText.qml b/ui/shared/StyledText.qml new file mode 100644 index 0000000000..c9a2104734 --- /dev/null +++ b/ui/shared/StyledText.qml @@ -0,0 +1,6 @@ +import QtQuick 2.13 +import "../imports" + +Text { + font.family: Theme.fontRegular.name +} diff --git a/ui/shared/StyledTextArea.qml b/ui/shared/StyledTextArea.qml index e23d7cdf5d..69d7ae8903 100644 --- a/ui/shared/StyledTextArea.qml +++ b/ui/shared/StyledTextArea.qml @@ -23,7 +23,7 @@ Item { anchors.right: parent.right anchors.left: parent.left - Text { + StyledText { id: inputLabel text: inputBox.label font.weight: Font.Medium @@ -56,7 +56,7 @@ Item { anchors.bottomMargin: Theme.smallPadding anchors.topMargin: Theme.smallPadding anchors.fill: parent - + font.family: Theme.fontRegular.name } } diff --git a/ui/shared/TextWithLabel.qml b/ui/shared/TextWithLabel.qml index 78130c7994..64ff35ed29 100644 --- a/ui/shared/TextWithLabel.qml +++ b/ui/shared/TextWithLabel.qml @@ -13,7 +13,7 @@ Item { anchors.right: parent.right anchors.left: parent.left - Text { + StyledText { id: inputLabel text: inputBox.label font.weight: Font.Medium diff --git a/ui/shared/qmldir b/ui/shared/qmldir index b6e08cf12a..6daf29dd7e 100644 --- a/ui/shared/qmldir +++ b/ui/shared/qmldir @@ -9,4 +9,5 @@ Input 1.0 Input.qml SearchBox 1.0 SearchBox.qml Select 1.0 Select.qml StyledTextArea 1.0 StyledTextArea.qml +StyledText 1.0 StyledText.qml RoundImage 1.0 RoundImage.qml