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 26d4702bce..0000000000
Binary files a/img/message.png and /dev/null differ
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.png b/img/profile.png
deleted file mode 100644
index 77cee25a1f..0000000000
Binary files a/img/profile.png and /dev/null differ
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.png b/img/wallet.png
deleted file mode 100644
index 6f7f730bd8..0000000000
Binary files a/img/wallet.png and /dev/null differ
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}
}
##^##*/