diff --git a/Inter-Black.otf b/Inter-Black.otf new file mode 100644 index 0000000000..97bd2160a9 Binary files /dev/null and b/Inter-Black.otf differ diff --git a/Inter-BlackItalic.otf b/Inter-BlackItalic.otf new file mode 100644 index 0000000000..3ba3c6ec28 Binary files /dev/null and b/Inter-BlackItalic.otf differ diff --git a/Inter-Bold.otf b/Inter-Bold.otf new file mode 100644 index 0000000000..43b12eabc2 Binary files /dev/null and b/Inter-Bold.otf differ diff --git a/Inter-BoldItalic.otf b/Inter-BoldItalic.otf new file mode 100644 index 0000000000..a07fdd57b5 Binary files /dev/null and b/Inter-BoldItalic.otf differ diff --git a/Inter-ExtraBold.otf b/Inter-ExtraBold.otf new file mode 100644 index 0000000000..9d539bb3ef Binary files /dev/null and b/Inter-ExtraBold.otf differ diff --git a/Inter-ExtraBoldItalic.otf b/Inter-ExtraBoldItalic.otf new file mode 100644 index 0000000000..403e05ea1c Binary files /dev/null and b/Inter-ExtraBoldItalic.otf differ diff --git a/Inter-ExtraLight.otf b/Inter-ExtraLight.otf new file mode 100644 index 0000000000..6950958f07 Binary files /dev/null and b/Inter-ExtraLight.otf differ diff --git a/Inter-ExtraLightItalic.otf b/Inter-ExtraLightItalic.otf new file mode 100644 index 0000000000..6b0b8ff551 Binary files /dev/null and b/Inter-ExtraLightItalic.otf differ diff --git a/Inter-Italic.otf b/Inter-Italic.otf new file mode 100644 index 0000000000..7b63db5e01 Binary files /dev/null and b/Inter-Italic.otf differ diff --git a/Inter-Light.otf b/Inter-Light.otf new file mode 100644 index 0000000000..d4f94c373b Binary files /dev/null and b/Inter-Light.otf differ diff --git a/Inter-LightItalic.otf b/Inter-LightItalic.otf new file mode 100644 index 0000000000..9a4b7a0348 Binary files /dev/null and b/Inter-LightItalic.otf differ diff --git a/Inter-Medium.otf b/Inter-Medium.otf new file mode 100644 index 0000000000..ff6e126fa7 Binary files /dev/null and b/Inter-Medium.otf differ diff --git a/Inter-MediumItalic.otf b/Inter-MediumItalic.otf new file mode 100644 index 0000000000..15ed45187f Binary files /dev/null and b/Inter-MediumItalic.otf differ diff --git a/Inter-Regular.otf b/Inter-Regular.otf new file mode 100644 index 0000000000..c0dab1bfd7 Binary files /dev/null and b/Inter-Regular.otf differ diff --git a/Inter-SemiBold.otf b/Inter-SemiBold.otf new file mode 100644 index 0000000000..4c238105ef Binary files /dev/null and b/Inter-SemiBold.otf differ diff --git a/Inter-SemiBoldItalic.otf b/Inter-SemiBoldItalic.otf new file mode 100644 index 0000000000..8720a8af67 Binary files /dev/null and b/Inter-SemiBoldItalic.otf differ diff --git a/Inter-Thin.otf b/Inter-Thin.otf new file mode 100644 index 0000000000..7309924164 Binary files /dev/null and b/Inter-Thin.otf differ diff --git a/Inter-ThinItalic.otf b/Inter-ThinItalic.otf new file mode 100644 index 0000000000..df9085ec4d Binary files /dev/null and b/Inter-ThinItalic.otf differ diff --git a/Inter-V.otf b/Inter-V.otf new file mode 100644 index 0000000000..1d7242eb31 Binary files /dev/null and b/Inter-V.otf differ diff --git a/fonts/Inter/Inter-Black.otf b/fonts/Inter/Inter-Black.otf new file mode 100644 index 0000000000..97bd2160a9 Binary files /dev/null and b/fonts/Inter/Inter-Black.otf differ diff --git a/fonts/Inter/Inter-BlackItalic.otf b/fonts/Inter/Inter-BlackItalic.otf new file mode 100644 index 0000000000..3ba3c6ec28 Binary files /dev/null and b/fonts/Inter/Inter-BlackItalic.otf differ diff --git a/fonts/Inter/Inter-Bold.otf b/fonts/Inter/Inter-Bold.otf new file mode 100644 index 0000000000..43b12eabc2 Binary files /dev/null and b/fonts/Inter/Inter-Bold.otf differ diff --git a/fonts/Inter/Inter-BoldItalic.otf b/fonts/Inter/Inter-BoldItalic.otf new file mode 100644 index 0000000000..a07fdd57b5 Binary files /dev/null and b/fonts/Inter/Inter-BoldItalic.otf differ diff --git a/fonts/Inter/Inter-ExtraBold.otf b/fonts/Inter/Inter-ExtraBold.otf new file mode 100644 index 0000000000..9d539bb3ef Binary files /dev/null and b/fonts/Inter/Inter-ExtraBold.otf differ diff --git a/fonts/Inter/Inter-ExtraBoldItalic.otf b/fonts/Inter/Inter-ExtraBoldItalic.otf new file mode 100644 index 0000000000..403e05ea1c Binary files /dev/null and b/fonts/Inter/Inter-ExtraBoldItalic.otf differ diff --git a/fonts/Inter/Inter-ExtraLight.otf b/fonts/Inter/Inter-ExtraLight.otf new file mode 100644 index 0000000000..6950958f07 Binary files /dev/null and b/fonts/Inter/Inter-ExtraLight.otf differ diff --git a/fonts/Inter/Inter-ExtraLightItalic.otf b/fonts/Inter/Inter-ExtraLightItalic.otf new file mode 100644 index 0000000000..6b0b8ff551 Binary files /dev/null and b/fonts/Inter/Inter-ExtraLightItalic.otf differ diff --git a/fonts/Inter/Inter-Italic.otf b/fonts/Inter/Inter-Italic.otf new file mode 100644 index 0000000000..7b63db5e01 Binary files /dev/null and b/fonts/Inter/Inter-Italic.otf differ diff --git a/fonts/Inter/Inter-Light.otf b/fonts/Inter/Inter-Light.otf new file mode 100644 index 0000000000..d4f94c373b Binary files /dev/null and b/fonts/Inter/Inter-Light.otf differ diff --git a/fonts/Inter/Inter-LightItalic.otf b/fonts/Inter/Inter-LightItalic.otf new file mode 100644 index 0000000000..9a4b7a0348 Binary files /dev/null and b/fonts/Inter/Inter-LightItalic.otf differ diff --git a/fonts/Inter/Inter-Medium.otf b/fonts/Inter/Inter-Medium.otf new file mode 100644 index 0000000000..ff6e126fa7 Binary files /dev/null and b/fonts/Inter/Inter-Medium.otf differ diff --git a/fonts/Inter/Inter-MediumItalic.otf b/fonts/Inter/Inter-MediumItalic.otf new file mode 100644 index 0000000000..15ed45187f Binary files /dev/null and b/fonts/Inter/Inter-MediumItalic.otf differ diff --git a/fonts/Inter/Inter-Regular.otf b/fonts/Inter/Inter-Regular.otf new file mode 100644 index 0000000000..c0dab1bfd7 Binary files /dev/null and b/fonts/Inter/Inter-Regular.otf differ diff --git a/fonts/Inter/Inter-SemiBold.otf b/fonts/Inter/Inter-SemiBold.otf new file mode 100644 index 0000000000..4c238105ef Binary files /dev/null and b/fonts/Inter/Inter-SemiBold.otf differ diff --git a/fonts/Inter/Inter-SemiBoldItalic.otf b/fonts/Inter/Inter-SemiBoldItalic.otf new file mode 100644 index 0000000000..8720a8af67 Binary files /dev/null and b/fonts/Inter/Inter-SemiBoldItalic.otf differ diff --git a/fonts/Inter/Inter-Thin.otf b/fonts/Inter/Inter-Thin.otf new file mode 100644 index 0000000000..7309924164 Binary files /dev/null and b/fonts/Inter/Inter-Thin.otf differ diff --git a/fonts/Inter/Inter-ThinItalic.otf b/fonts/Inter/Inter-ThinItalic.otf new file mode 100644 index 0000000000..df9085ec4d Binary files /dev/null and b/fonts/Inter/Inter-ThinItalic.otf differ diff --git a/fonts/Inter/Inter-V.otf b/fonts/Inter/Inter-V.otf new file mode 100644 index 0000000000..1d7242eb31 Binary files /dev/null and b/fonts/Inter/Inter-V.otf differ diff --git a/img/placeholder-profile.png b/img/placeholder-profile.png new file mode 100644 index 0000000000..3808679069 Binary files /dev/null and b/img/placeholder-profile.png differ diff --git a/imports/Theme.qml b/imports/Theme.qml index 9afc0d7218..c641287b89 100644 --- a/imports/Theme.qml +++ b/imports/Theme.qml @@ -8,4 +8,7 @@ QtObject { readonly property color blue: "#4360DF" readonly property color transparent: "#ffffff" readonly property color darkGrey: "#939BA1" + + readonly property int padding: 16 + readonly property int smallPadding: 16 } diff --git a/main.qml b/main.qml index bcf85bed2d..08d4cdafc6 100644 --- a/main.qml +++ b/main.qml @@ -11,6 +11,7 @@ ApplicationWindow { height: 768 title: "Nim Status Client" visible: true + font.family: "Inter" SystemTrayIcon { visible: true @@ -203,7 +204,7 @@ ApplicationWindow { anchors.right: parent.right anchors.rightMargin: 65 anchors.left: parent.left - anchors.leftMargin: 16 + anchors.leftMargin: Theme.padding TextField { id: searchText @@ -219,7 +220,7 @@ ApplicationWindow { Image { id: image4 anchors.left: parent.left - anchors.leftMargin: 10 + anchors.leftMargin: Theme.smallPadding anchors.verticalCenter: parent.verticalCenter fillMode: Image.PreserveAspectFit source: "img/search.svg" @@ -241,7 +242,7 @@ ApplicationWindow { color: Theme.blue radius: 50 anchors.right: parent.right - anchors.rightMargin: 16 + anchors.rightMargin: Theme.padding anchors.top: parent.top anchors.topMargin: 59 @@ -273,11 +274,11 @@ ApplicationWindow { height: 64 color: ListView.isCurrentItem ? Theme.lightBlue : Theme.transparent anchors.right: parent.right - anchors.rightMargin: 16 + anchors.rightMargin: Theme.padding anchors.top: applicationWindow.top anchors.topMargin: 0 anchors.left: parent.left - anchors.leftMargin: 16 + anchors.leftMargin: Theme.padding radius: 8 MouseArea { @@ -290,7 +291,7 @@ ApplicationWindow { width: 40 color: Theme.darkGrey anchors.left: parent.left - anchors.leftMargin: 16 + anchors.leftMargin: Theme.padding anchors.top: parent.top anchors.topMargin: 12 anchors.bottom: parent.bottom @@ -304,28 +305,28 @@ ApplicationWindow { font.weight: Font.Medium font.pixelSize: 15 anchors.left: contactImage.right - anchors.leftMargin: 16 + anchors.leftMargin: Theme.padding anchors.top: parent.top - anchors.topMargin: 10 + anchors.topMargin: Theme.smallPadding color: "black" } Text { id: lastChatMessage text: "Chatting blah blah..." anchors.bottom: parent.bottom - anchors.bottomMargin: 10 + anchors.bottomMargin: Theme.smallPadding font.pixelSize: 15 anchors.left: contactImage.right - anchors.leftMargin: 16 + anchors.leftMargin: Theme.padding color: Theme.darkGrey } Text { id: contactTime text: "12:22 AM" anchors.right: parent.right - anchors.rightMargin: 16 + anchors.rightMargin: Theme.padding anchors.top: parent.top - anchors.topMargin: 10 + anchors.topMargin: Theme.smallPadding font.pixelSize: 11 color: Theme.darkGrey } @@ -335,9 +336,9 @@ ApplicationWindow { height: 22 radius: 50 anchors.bottom: parent.bottom - anchors.bottomMargin: 10 + anchors.bottomMargin: Theme.smallPadding anchors.right: parent.right - anchors.rightMargin: 16 + anchors.rightMargin: Theme.padding color: Theme.blue Text { id: contactNumberChats @@ -369,6 +370,72 @@ ApplicationWindow { anchors.rightMargin: 0 anchors.fill: parent + RowLayout { + id: chatContainer + width: 100 + height: 100 + Layout.alignment: Qt.AlignLeft | Qt.AlignTop + + Rectangle { + id: chatBox + width: 200 + height: 158 + color: "#00000000" + Layout.alignment: Qt.AlignLeft | Qt.AlignTop + Layout.fillWidth: true + border.color: "#00000000" + + Image { + id: chatImage + width: 30 + height: 30 + anchors.left: parent.left + anchors.leftMargin: 16 + anchors.top: parent.top + anchors.topMargin: 16 + fillMode: Image.PreserveAspectFit + source: "img/placeholder-profile.png" + } + + Text { + id: chatName + text: qsTr("Slushy Welltodo Woodborer") + anchors.top: parent.top + anchors.topMargin: 22 + anchors.left: chatImage.right + anchors.leftMargin: 16 + font.bold: true + font.pixelSize: 14 + } + + Text { + id: chatText + text: qsTr("I’m generally against putting too many rules on social interaction because it makes interaction anything but social, but technical specifics on how to get on board or participate in a team are I think generally useful, especially if they prevent maintainers from pasting the same response to every PR / issue.") + font.family: "Inter" + wrapMode: Text.WordWrap + anchors.right: parent.right + anchors.rightMargin: 60 + anchors.left: chatName.left + anchors.leftMargin: 0 + anchors.top: chatName.bottom + anchors.topMargin: 16 + font.pixelSize: 14 + } + + Text { + id: chatTime + color: Theme.darkGrey + font.family: "Inter" + text: qsTr("7:30 AM") + anchors.bottom: parent.bottom + anchors.bottomMargin: 16 + anchors.right: parent.right + anchors.rightMargin: 16 + font.pixelSize: 10 + } + } + } + RowLayout { Layout.fillHeight: true TextArea { id: callResult; Layout.fillWidth: true; text: logic.callResult; readOnly: true } @@ -386,6 +453,7 @@ ApplicationWindow { enabled: txtData.text !== "" } } + } } @@ -414,6 +482,6 @@ ApplicationWindow { /*##^## Designer { - D{i:9;anchors_height:40;anchors_width:40} + D{i:0;formeditorZoom:0.8999999761581421} } ##^##*/ diff --git a/nim-status-client.pro b/nim-status-client.pro index 69f5f25819..96802c7b06 100644 --- a/nim-status-client.pro +++ b/nim-status-client.pro @@ -29,5 +29,24 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin !isEmpty(target.path): INSTALLS += target DISTFILES += \ + Inter-Black.otf \ + Inter-BlackItalic.otf \ + Inter-Bold.otf \ + Inter-BoldItalic.otf \ + Inter-ExtraBold.otf \ + Inter-ExtraBoldItalic.otf \ + Inter-ExtraLight.otf \ + Inter-ExtraLightItalic.otf \ + Inter-Italic.otf \ + Inter-Light.otf \ + Inter-LightItalic.otf \ + Inter-Medium.otf \ + Inter-MediumItalic.otf \ + Inter-Regular.otf \ + Inter-SemiBold.otf \ + Inter-SemiBoldItalic.otf \ + Inter-Thin.otf \ + Inter-ThinItalic.otf \ + Inter-V.otf \ Theme.qml \ imports/qmldir