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: fix font loading issue and create a text component to use that font

This commit is contained in:
Jonathan Rainville 2020-06-19 14:06:58 -04:00 committed by Iuri Matias
parent f2a573bf53
commit 8755c901de
78 changed files with 192 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/app/AppLayouts/Chat/ChatColumn/EmptyChat.qml
View File

@ -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

12
ui/app/AppLayouts/Chat/ChatColumn/Message.qml
View File

@ -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

4
ui/app/AppLayouts/Chat/ChatColumn/TopBar.qml
View File

@ -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

2
ui/app/AppLayouts/Chat/ContactsColumn.qml
View File

@ -15,7 +15,7 @@ Item {
Layout.minimumWidth: 200
Layout.fillHeight: true
Text {
StyledText {
id: title
x: 772
text: qsTr("Chat")

8
ui/app/AppLayouts/Chat/ContactsColumn/Channel.qml
View File

@ -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

3
ui/app/AppLayouts/Chat/ContactsColumn/EmptyView.qml
View File

@ -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

2
ui/app/AppLayouts/Chat/components/ChannelIcon.qml
View File

@ -40,7 +40,7 @@ Rectangle {
return color
}
Text {
StyledText {
text: {
if (channelType == Constants.chatTypeOneToOne) {
return channelName;

4
ui/app/AppLayouts/Chat/components/Contact.qml
View File

@ -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

5
ui/app/AppLayouts/Chat/components/GroupChatPopup.qml
View File

@ -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
}
}

13
ui/app/AppLayouts/Chat/components/GroupInfoPopup.qml
View File

@ -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: "..."

15
ui/app/AppLayouts/Chat/components/ProfilePopup.qml
View File

@ -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

2
ui/app/AppLayouts/Chat/components/PublicChatPopup.qml
View File

@ -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.")

2
ui/app/AppLayouts/Chat/components/RenameGroupPopup.qml
View File

@ -36,7 +36,7 @@ Popup {
padding: 0
contentItem: Item {
Text {
StyledText {
id: groupTitleLabel
text: qsTr("Group name")
anchors.top: parent.top

3
ui/app/AppLayouts/Chat/components/SuggestedChannel.qml
View File

@ -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

5
ui/app/AppLayouts/Node/NodeLayout.qml
View File

@ -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

21
ui/app/AppLayouts/Profile/LeftTab/Menu.qml
View File

@ -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")

5
ui/app/AppLayouts/Profile/LeftTab/Profile.qml
View File

@ -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

13
ui/app/AppLayouts/Profile/Sections/AboutContainer.qml
View File

@ -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: "<a href='https://www.iubenda.com/privacy-policy/45710059'>Privacy Policy</a>"
anchors.left: parent.left
@ -66,7 +67,7 @@ Item {
cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor
}
}
Text {
StyledText {
text: "<a href='https://status.im/docs/FAQs.html'>Frequently asked questions</a>"
anchors.left: parent.left
anchors.leftMargin: 24

11
ui/app/AppLayouts/Profile/Sections/AdvancedContainer.qml
View File

@ -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")
}
}

4
ui/app/AppLayouts/Profile/Sections/Contacts/Contact.qml
View File

@ -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

3
ui/app/AppLayouts/Profile/Sections/ContactsContainer.qml
View File

@ -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

3
ui/app/AppLayouts/Profile/Sections/EnsContainer.qml
View File

@ -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

5
ui/app/AppLayouts/Profile/Sections/HelpContainer.qml
View File

@ -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: "<a href='https://status.im/docs/FAQs.html'>Frequently asked questions</a>"
onLinkActivated: Qt.openUrlExternally(link)

3
ui/app/AppLayouts/Profile/Sections/LanguageContainer.qml
View File

@ -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

3
ui/app/AppLayouts/Profile/Sections/NotificationsContainer.qml
View File

@ -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

3
ui/app/AppLayouts/Profile/Sections/PrivacyContainer.qml
View File

@ -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

2
ui/app/AppLayouts/Profile/Sections/SignoutContainer.qml
View File

@ -11,7 +11,7 @@ Item {
Layout.fillHeight: true
Layout.fillWidth: true
Text {
StyledText {
id: txtTitle
text: qsTr("Sign out controls")
anchors.left: parent.left

3
ui/app/AppLayouts/Profile/Sections/SyncContainer.qml
View File

@ -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

9
ui/app/AppLayouts/Wallet/AssetsTab.qml
View File

@ -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

7
ui/app/AppLayouts/Wallet/CollectiblesTab.qml
View File

@ -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

2
ui/app/AppLayouts/Wallet/Components/AddAccountWithSeed.qml
View File

@ -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 === ""

2
ui/app/AppLayouts/Wallet/Components/SendModalContent.qml
View File

@ -7,7 +7,7 @@ Item {
property alias valueInput: txtValue
property string defaultAccount: "0x1234"
Text {
StyledText {
id: modalDialogTitle
text: "Send"
anchors.top: parent.top

4
ui/app/AppLayouts/Wallet/Components/SetCurrencyModalContent.qml
View File

@ -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
}

4
ui/app/AppLayouts/Wallet/Components/TokenSettingsModalContent.qml
View File

@ -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

36
ui/app/AppLayouts/Wallet/Components/TransactionModal.qml
View File

@ -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

15
ui/app/AppLayouts/Wallet/HistoryTab.qml
View File

@ -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

10
ui/app/AppLayouts/Wallet/LeftTab.qml
View File

@ -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

10
ui/app/AppLayouts/Wallet/WalletHeader.qml
View File

@ -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

0
fonts/InterStatus/InterStatus-Black.otf → ui/fonts/InterStatus/InterStatus-Black.otf
View File

0
fonts/InterStatus/InterStatus-BlackItalic.otf → ui/fonts/InterStatus/InterStatus-BlackItalic.otf
View File

0
fonts/InterStatus/InterStatus-Bold.otf → ui/fonts/InterStatus/InterStatus-Bold.otf
View File

0
fonts/InterStatus/InterStatus-BoldItalic.otf → ui/fonts/InterStatus/InterStatus-BoldItalic.otf
View File

0
fonts/InterStatus/InterStatus-ExtraBold.otf → ui/fonts/InterStatus/InterStatus-ExtraBold.otf
View File

0
fonts/InterStatus/InterStatus-ExtraBoldItalic.otf → ui/fonts/InterStatus/InterStatus-ExtraBoldItalic.otf
View File

0
fonts/InterStatus/InterStatus-ExtraLight.otf → ui/fonts/InterStatus/InterStatus-ExtraLight.otf
View File

0
fonts/InterStatus/InterStatus-ExtraLightItalic.otf → ui/fonts/InterStatus/InterStatus-ExtraLightItalic.otf
View File

0
fonts/InterStatus/InterStatus-Italic.otf → ui/fonts/InterStatus/InterStatus-Italic.otf
View File

0
fonts/InterStatus/InterStatus-Light.otf → ui/fonts/InterStatus/InterStatus-Light.otf
View File

0
fonts/InterStatus/InterStatus-LightItalic.otf → ui/fonts/InterStatus/InterStatus-LightItalic.otf
View File

0
fonts/InterStatus/InterStatus-Medium.otf → ui/fonts/InterStatus/InterStatus-Medium.otf
View File

0
fonts/InterStatus/InterStatus-MediumItalic.otf → ui/fonts/InterStatus/InterStatus-MediumItalic.otf
View File

0
fonts/InterStatus/InterStatus-Regular.otf → ui/fonts/InterStatus/InterStatus-Regular.otf
View File

0
fonts/InterStatus/InterStatus-SemiBold.otf → ui/fonts/InterStatus/InterStatus-SemiBold.otf
View File

0
fonts/InterStatus/InterStatus-SemiBoldItalic.otf → ui/fonts/InterStatus/InterStatus-SemiBoldItalic.otf
View File

0
fonts/InterStatus/InterStatus-Thin.otf → ui/fonts/InterStatus/InterStatus-Thin.otf
View File

0
fonts/InterStatus/InterStatus-ThinItalic.otf → ui/fonts/InterStatus/InterStatus-ThinItalic.otf
View File

5
ui/imports/Theme.qml
View File

@ -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"

2
ui/main.qml
View File

@ -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)

37
ui/nim-status-client.pro
View File

@ -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

2
ui/onboarding/CreatePasswordModal.qml
View File

@ -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

2
ui/onboarding/EnterSeedPhraseModal.qml
View File

@ -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

1
ui/onboarding/GenKeyModal.qml
View File

@ -1,5 +1,6 @@
import QtQuick 2.13
import QtQuick.Controls 2.13
import "../imports"
import "../shared"
import "./Login"

2
ui/onboarding/Intro.qml
View File

@ -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.")

4
ui/onboarding/KeysMain.qml
View File

@ -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.")

6
ui/onboarding/Login.qml
View File

@ -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")

4
ui/onboarding/Login/AddressView.qml
View File

@ -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

2
ui/onboarding/Login/ConfirmAddExistingKeyModal.qml
View File

@ -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

5
ui/onboarding/Slide.qml
View File

@ -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

2
ui/shared/Input.qml
View File

@ -28,7 +28,7 @@ Item {
anchors.right: parent.right
anchors.left: parent.left
Text {
StyledText {
id: inputLabel
text: inputBox.label
font.weight: Font.Medium

2
ui/shared/ModalPopup.qml
View File

@ -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

2
ui/shared/PopupMenu.qml
View File

@ -37,7 +37,7 @@ Menu {
}
}
Text {
StyledText {
anchors.left: menuIcon.right
anchors.leftMargin: 32
topPadding: 4

2
ui/shared/Select.qml
View File

@ -18,7 +18,7 @@ Item {
anchors.right: parent.right
anchors.left: parent.left
Text {
StyledText {
id: inputLabel
text: inputBox.label
font.weight: Font.Medium

2
ui/shared/StatusTabButton.qml
View File

@ -15,7 +15,7 @@ TabButton {
border.color: Theme.transparent
}
Text {
StyledText {
id: tabBtnText
text: btnText
font.weight: Font.Medium

2
ui/shared/StyledButton.qml
View File

@ -24,7 +24,7 @@ Button {
border.width: btnBorderWidth
}
Text {
StyledText {
id: txtBtnLabel
color: btnStyled.disabled ? Theme.darkGrey : btnStyled.textColor
font.pixelSize: 15

6
ui/shared/StyledText.qml Normal file
View File

@ -0,0 +1,6 @@
import QtQuick 2.13
import "../imports"
Text {
font.family: Theme.fontRegular.name
}

4
ui/shared/StyledTextArea.qml
View File

@ -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
}
}

2
ui/shared/TextWithLabel.qml
View File

@ -13,7 +13,7 @@ Item {
anchors.right: parent.right
anchors.left: parent.left
Text {
StyledText {
id: inputLabel
text: inputBox.label
font.weight: Font.Medium

1
ui/shared/qmldir
View File

@ -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