From dc56578f8ee6a9a3dc6fe7c6af06513f98694124 Mon Sep 17 00:00:00 2001 From: Jonathan Rainville Date: Fri, 8 May 2020 12:08:59 -0400 Subject: [PATCH 1/2] start of something new --- .gitignore | 1 + message.png => img/message.png | Bin profile.png => img/profile.png | Bin wallet.png => img/wallet.png | Bin main.qml | 23 +++++++++++++---------- 5 files changed, 14 insertions(+), 10 deletions(-) rename message.png => img/message.png (100%) rename profile.png => img/profile.png (100%) rename wallet.png => img/wallet.png (100%) diff --git a/.gitignore b/.gitignore index 8dc814c6a5..2aaf6b361d 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ nim_status_client nim_libstatus data/ noBackup/ +.idea diff --git a/message.png b/img/message.png similarity index 100% rename from message.png rename to img/message.png diff --git a/profile.png b/img/profile.png similarity index 100% rename from profile.png rename to img/profile.png diff --git a/wallet.png b/img/wallet.png similarity index 100% rename from wallet.png rename to img/wallet.png diff --git a/main.qml b/main.qml index bab1e79bec..c28b28058b 100644 --- a/main.qml +++ b/main.qml @@ -21,6 +21,9 @@ ApplicationWindow { id: tabBar width: 50 height: width *2 + spacing + topPadding: 57 + rightPadding: 19 + leftPadding: 19 transformOrigin: Item.Top Layout.alignment: Qt.AlignLeft | Qt.AlignTop Layout.fillHeight: true @@ -28,9 +31,9 @@ ApplicationWindow { anchors.topMargin: 5 spacing: 5 Layout.fillWidth: true - Layout.minimumWidth: 50 - Layout.preferredWidth: 50 - Layout.maximumWidth: 50 + Layout.minimumWidth: 85 + Layout.preferredWidth: 85 + Layout.maximumWidth: 85 Layout.minimumHeight: 0 TabButton { @@ -45,7 +48,7 @@ ApplicationWindow { id: image anchors.fill: parent fillMode: Image.PreserveAspectFit - source: "message.png" + source: "img/message.png" } } @@ -54,15 +57,15 @@ ApplicationWindow { width: 50 height: 50 text: "" + anchors.topMargin: 80 anchors.horizontalCenter: parent.horizontalCenter - anchors.top: firstBtn.bottom - anchors.topMargin: parent.spacing + anchors.top: firstBtn.top Image { id: image1 anchors.fill: parent fillMode: Image.PreserveAspectFit - source: "wallet.png" + source: "img/wallet.png" } } @@ -71,15 +74,15 @@ ApplicationWindow { width: 50 height: 50 text: "" - anchors.topMargin: 0 + anchors.topMargin: 80 anchors.horizontalCenter: parent.horizontalCenter - anchors.top: secondBtn.bottom + anchors.top: secondBtn.top Image { id: image2 anchors.fill: parent fillMode: Image.PreserveAspectFit - source: "profile.png" + source: "img/profile.png" } } } From 09c3f679bc43ca55264a21c5ec7da9982540984a Mon Sep 17 00:00:00 2001 From: Jonathan Rainville Date: Fri, 8 May 2020 14:06:47 -0400 Subject: [PATCH 2/2] feat: add new svg icons and show the right one --- img/compass.svg | 4 +++ img/compassActive.svg | 4 +++ img/message.png | Bin 630 -> 0 bytes img/message.svg | 5 ++++ img/messageActive.svg | 5 ++++ img/profile.png | Bin 621 -> 0 bytes img/profile.svg | 3 +++ img/profileActive.svg | 3 +++ img/wallet.png | Bin 393 -> 0 bytes img/wallet.svg | 3 +++ img/walletActive.svg | 3 +++ main.qml | 60 +++++++++++++++++++++++++++++------------- 12 files changed, 72 insertions(+), 18 deletions(-) create mode 100644 img/compass.svg create mode 100644 img/compassActive.svg delete mode 100644 img/message.png create mode 100644 img/message.svg create mode 100644 img/messageActive.svg delete mode 100644 img/profile.png create mode 100644 img/profile.svg create mode 100644 img/profileActive.svg delete mode 100644 img/wallet.png create mode 100644 img/wallet.svg create mode 100644 img/walletActive.svg diff --git a/img/compass.svg b/img/compass.svg new file mode 100644 index 0000000000..b4e706b78b --- /dev/null +++ b/img/compass.svg @@ -0,0 +1,4 @@ + + + + diff --git a/img/compassActive.svg b/img/compassActive.svg new file mode 100644 index 0000000000..35f8f4e93c --- /dev/null +++ b/img/compassActive.svg @@ -0,0 +1,4 @@ + + + + diff --git a/img/message.png b/img/message.png deleted file mode 100644 index 26d4702bce023af7181d4a5a0cbbbb33a17eafd1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 630 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD3?#3*wSy#F1AIbUfi&gd&Z}47fu@L;1o;Is z2qa8cfB*ge^9>I5`{ygf_Xijhz`%IY)5S5Qg7NJQcCp!30<90NAI#)t z;{N{k{g=HeS4_Gub_V_Qlb?Qn8S^B*_QMYgCakhs`B699FV}(ZW!1Z-&tLqnTHI}X zQF3p|fxL~0ecWYIJ(W@iy&kOHWZf%?@?VCw(gxr$FWvBmfa!Qhl1p9 z?)lnxcgelo6Rgge99sO;=Y!jmHJu+;T4sJccKP@3@I^8==h-I+<~2_Kkd_@`zKv(v zzk3 zIjSw&f46VjDydERtS?vEPbg!FX;Ib|<&ZI5%4F)kK8W$@3SE&E7M!U}i)1uUvFOd2 zbDG8KTvBI4%#MGJOpOapTCe}(z%#ed^nfHs|75B1)ekv;%ztU}f#r$Q@;IBugD*mu z`wq1Fm9;A?*v`#rR2G=3ca7@-N5#JTU%qghE6y@lw}w~Ho@4*AaEl+z{*D(NxJ7vH z1ezo;x-v@znk*1>W!}3WV}YCCv->u+RsWy86h6DZ^4AgJwfz<{eC_A|^7AaVR-R@# R + + + + diff --git a/img/messageActive.svg b/img/messageActive.svg new file mode 100644 index 0000000000..d836304d6f --- /dev/null +++ b/img/messageActive.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/img/profile.png b/img/profile.png deleted file mode 100644 index 77cee25a1f2e72641f032b763f4e615c5272b86a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 621 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD3?#3*wSy#_0(?STfi#7n@8P#kKqEv;g8YIR z-rpBcaG22FaK2#w{Dk%K1`F~x)Z4V*|INQPaOYm7|uEW zyuxG6Q}Hh8c27&XT3>%c*%Sa_bWZ`q$s*^d$gOkO@&G<{BjV#zJds%tH>K5VuHADArmPnHXlU_Hxa zAZ@CA$Zt`c6su{APu;5-k^UDNvhH~AXL0m>cl1|dm1F6?c%_v>`uY7;vzAS)>{>Ei z!*BHiOK}h5HN~4hcs0Q=f@7Mq5ITY1#)K2x(>v_D6B{kMDx6-b; z+rE1Jue)}^7IT}7RWFY{y%EGR>67KHfGhjX9hH2v=~0&`N!`*@UD z4*wHdz?#AM>3_=ae>Go!8NNARyyXAH%|NRAQpSz{$4z`M|6#UhE-`NVAIk + + diff --git a/img/profileActive.svg b/img/profileActive.svg new file mode 100644 index 0000000000..0c02d1f2f4 --- /dev/null +++ b/img/profileActive.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/wallet.png b/img/wallet.png deleted file mode 100644 index 6f7f730bd8094a1e32da8258fa3524f3e6636717..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 393 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD3?#3*wSy##1AIbUfi$ULF{|52pdNveAirRS z_X-00@2_u2hLWW@`DP8^C$OvU5WD#Pb2oVvZ%PbF<(^BIc`mokrD@Y^oQtW_fHdVhM| znioO;x?AS;F4N%@U%K*w$(I!FDJ{~IL}y%7Uff=gv(dqkpZA@oi9hQDewPNn^*k;L zOdmskFbj4xq$P&dC+s=Z^^5s&sM&Ak$F9C|+!yvJ2sCo+DZj8OR^#69n~vJ5**T*5 zJWG}{9cALqo2jF)-@46YmQlRllBE}N9%r}BU$pvC|NMA4R>OgTe~DWM4fm=21n diff --git a/img/wallet.svg b/img/wallet.svg new file mode 100644 index 0000000000..df5ea7142d --- /dev/null +++ b/img/wallet.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/walletActive.svg b/img/walletActive.svg new file mode 100644 index 0000000000..d63cdc8a0c --- /dev/null +++ b/img/walletActive.svg @@ -0,0 +1,3 @@ + + + diff --git a/main.qml b/main.qml index c28b28058b..7b2114e338 100644 --- a/main.qml +++ b/main.qml @@ -21,6 +21,7 @@ ApplicationWindow { id: tabBar width: 50 height: width *2 + spacing + currentIndex: 0 topPadding: 57 rightPadding: 19 leftPadding: 19 @@ -31,67 +32,89 @@ ApplicationWindow { anchors.topMargin: 5 spacing: 5 Layout.fillWidth: true - Layout.minimumWidth: 85 - Layout.preferredWidth: 85 - Layout.maximumWidth: 85 + Layout.minimumWidth: 80 + Layout.preferredWidth: 80 + Layout.maximumWidth: 80 Layout.minimumHeight: 0 TabButton { id: firstBtn - width: 50 - height: 50 + x: 0 + width: 40 + height: 40 text: "" + padding: 0 transformOrigin: Item.Center anchors.horizontalCenter: parent.horizontalCenter + background: Rectangle { + color: "#ECEFFC" + opacity: parent.checked ? 1 : 0 + radius: 50 + } Image { id: image - anchors.fill: parent + anchors.verticalCenter: parent.verticalCenter + anchors.horizontalCenter: parent.horizontalCenter fillMode: Image.PreserveAspectFit - source: "img/message.png" + source: parent.checked ? "img/messageActive.svg" : "img/message.svg" } } TabButton { id: secondBtn - width: 50 - height: 50 + width: 40 + height: 40 text: "" - anchors.topMargin: 80 + anchors.topMargin: 50 anchors.horizontalCenter: parent.horizontalCenter anchors.top: firstBtn.top + background: Rectangle { + color: "#ECEFFC" + opacity: parent.checked ? 1 : 0 + radius: 50 + } Image { id: image1 - anchors.fill: parent + anchors.verticalCenter: parent.verticalCenter + anchors.horizontalCenter: parent.horizontalCenter fillMode: Image.PreserveAspectFit - source: "img/wallet.png" + source: parent.checked ? "img/walletActive.svg" : "img/wallet.svg" } } TabButton { id: thirdBtn - width: 50 - height: 50 + width: 40 + height: 40 text: "" - anchors.topMargin: 80 + anchors.topMargin: 50 anchors.horizontalCenter: parent.horizontalCenter anchors.top: secondBtn.top + background: Rectangle { + color: "#ECEFFC" + opacity: parent.checked ? 1 : 0 + radius: 50 + } Image { id: image2 - anchors.fill: parent + anchors.verticalCenter: parent.verticalCenter + anchors.horizontalCenter: parent.horizontalCenter fillMode: Image.PreserveAspectFit - source: "img/profile.png" + source: parent.checked ? "img/profileActive.svg" : "img/profile.svg" } } } StackLayout { width: parent.width + Layout.fillWidth: true currentIndex: tabBar.currentIndex SplitView { + id: splitView x: 9 y: 0 Layout.fillHeight: true @@ -119,6 +142,7 @@ ApplicationWindow { height: parent.height ColumnLayout { + anchors.rightMargin: 0 anchors.fill: parent RowLayout { @@ -160,6 +184,6 @@ ApplicationWindow { /*##^## Designer { - D{i:4;anchors_height:40;anchors_width:40}D{i:6;anchors_height:40;anchors_width:40} + D{i:0;formeditorZoom:1.5}D{i:8;anchors_height:40;anchors_width:40} } ##^##*/