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/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.svg b/img/message.svg
new file mode 100644
index 0000000000..bf91a53111
--- /dev/null
+++ b/img/message.svg
@@ -0,0 +1,5 @@
+
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.svg b/img/profile.svg
new file mode 100644
index 0000000000..6aaa1a4af8
--- /dev/null
+++ b/img/profile.svg
@@ -0,0 +1,3 @@
+
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.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 dedd237d58..550a5c9449 100644
--- a/main.qml
+++ b/main.qml
@@ -22,6 +22,9 @@ ApplicationWindow {
width: 50
height: width *2 + spacing
currentIndex: 0
+ topPadding: 57
+ rightPadding: 19
+ leftPadding: 19
transformOrigin: Item.Top
Layout.alignment: Qt.AlignLeft | Qt.AlignTop
Layout.fillHeight: true
@@ -29,67 +32,89 @@ ApplicationWindow {
anchors.topMargin: 5
spacing: 5
Layout.fillWidth: true
- Layout.minimumWidth: 50
- Layout.preferredWidth: 50
- Layout.maximumWidth: 50
+ 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: "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: 50
anchors.horizontalCenter: parent.horizontalCenter
- anchors.top: firstBtn.bottom
- anchors.topMargin: parent.spacing
+ 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: "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: 0
+ anchors.topMargin: 50
anchors.horizontalCenter: parent.horizontalCenter
- anchors.top: secondBtn.bottom
+ 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: "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
@@ -117,6 +142,7 @@ ApplicationWindow {
height: parent.height
ColumnLayout {
+ anchors.rightMargin: 0
anchors.fill: parent
RowLayout {
@@ -163,6 +189,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}
}
##^##*/
diff --git a/message.png b/message.png
deleted file mode 100644
index 26d4702bce..0000000000
Binary files a/message.png and /dev/null differ
diff --git a/profile.png b/profile.png
deleted file mode 100644
index 77cee25a1f..0000000000
Binary files a/profile.png and /dev/null differ
diff --git a/wallet.png b/wallet.png
deleted file mode 100644
index 6f7f730bd8..0000000000
Binary files a/wallet.png and /dev/null differ