diff --git a/ui/app/AppLayouts/Profile/LeftTab/Menu.qml b/ui/app/AppLayouts/Profile/LeftTab/Menu.qml index 467eaff623..7352f24884 100644 --- a/ui/app/AppLayouts/Profile/LeftTab/Menu.qml +++ b/ui/app/AppLayouts/Profile/LeftTab/Menu.qml @@ -21,7 +21,7 @@ ScrollView { model: ProfileConstants.menuButtons delegate: MenuButton { text: modelData .text - source: "../../../img/" + modelData .filename + source: "../../../img/profile/" + modelData.filename active: profileMenu.profileCurrentIndex === modelData.id Layout.fillWidth: true onClicked: function () { diff --git a/ui/app/AppLayouts/Profile/LeftTab/components/MenuButton.qml b/ui/app/AppLayouts/Profile/LeftTab/components/MenuButton.qml index c25d34fd73..4114ca1e94 100644 --- a/ui/app/AppLayouts/Profile/LeftTab/components/MenuButton.qml +++ b/ui/app/AppLayouts/Profile/LeftTab/components/MenuButton.qml @@ -17,10 +17,13 @@ Rectangle { width: parent.width radius: Style.current.radius - SVGImage { + Image { id: iconImage source: menuButton.source - height: 22 + height: 24 + width: 24 + sourceSize.width: width + sourceSize.height: height anchors.left: parent.left anchors.leftMargin: Style.current.padding anchors.verticalCenter: parent.verticalCenter diff --git a/ui/app/AppLayouts/Profile/LeftTab/constants.js b/ui/app/AppLayouts/Profile/LeftTab/constants.js index 47671eb2fc..c0dd68335c 100644 --- a/ui/app/AppLayouts/Profile/LeftTab/constants.js +++ b/ui/app/AppLayouts/Profile/LeftTab/constants.js @@ -19,19 +19,19 @@ var menuButtons = [{ }, { "id": CONTACTS, "text": qsTr("Contacts"), - "filename": "profileActive.svg" + "filename": "contacts.svg" }, { "id": ENS, "text": qsTr("ENS usernames"), - "filename": "atSign.svg" + "filename": "ensUsernames.svg" }, { "id": PRIVACY_AND_SECURITY, "text": qsTr("Privacy and security"), - "filename": "lock.svg" + "filename": "security.svg" }, { "id": APPEARANCE, "text": qsTr("Appearance"), - "filename": "sun.svg" + "filename": "appearance.svg" }, { "id": SOUND, "text": qsTr("Sound"), @@ -43,25 +43,25 @@ var menuButtons = [{ }, { "id": NOTIFICATIONS, "text": qsTr("Notifications"), - "filename": "bell.svg" + "filename": "notifications.svg" }, { "id": SYNC_SETTINGS, "text": qsTr("Sync settings"), - "filename": "phone.svg" + "filename": "sync.svg" }, { "id": DEVICES_SETTINGS, "text": qsTr("Devices settings"), - "filename": "phone.svg" + "filename": "sync.svg" }, { "id": ADVANCED, "text": qsTr("Advanced"), - "filename": "slider.svg" + "filename": "advanced.svg" }, { "id": NEED_HELP, "text": qsTr("Need help?"), - "filename": "question.svg" + "filename": "help.svg" }, { "id": ABOUT, "text": qsTr("About"), - "filename": "info.svg" + "filename": "about.svg" }] diff --git a/ui/app/img/atSign.svg b/ui/app/img/atSign.svg deleted file mode 100644 index 1a8ee3945b..0000000000 --- a/ui/app/img/atSign.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/ui/app/img/lock.svg b/ui/app/img/lock.svg deleted file mode 100644 index 5517e970cb..0000000000 --- a/ui/app/img/lock.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/ui/app/img/myProfile.svg b/ui/app/img/myProfile.svg index aa0910005f..d2464038f1 100644 --- a/ui/app/img/myProfile.svg +++ b/ui/app/img/myProfile.svg @@ -1,5 +1,5 @@ - - - - + + + + diff --git a/ui/app/img/phone.svg b/ui/app/img/phone.svg deleted file mode 100644 index 4a823001c6..0000000000 --- a/ui/app/img/phone.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/ui/app/img/profile.svg b/ui/app/img/profile.svg index 7be6a06512..cd1e75dae1 100644 --- a/ui/app/img/profile.svg +++ b/ui/app/img/profile.svg @@ -1,4 +1,5 @@ - - + + + diff --git a/ui/app/img/profile/about.svg b/ui/app/img/profile/about.svg new file mode 100644 index 0000000000..cb10df9d0b --- /dev/null +++ b/ui/app/img/profile/about.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/ui/app/img/profile/advanced.svg b/ui/app/img/profile/advanced.svg new file mode 100644 index 0000000000..63da3b0524 --- /dev/null +++ b/ui/app/img/profile/advanced.svg @@ -0,0 +1,4 @@ + + + + diff --git a/ui/app/img/profile/appearance.svg b/ui/app/img/profile/appearance.svg new file mode 100644 index 0000000000..1e3043ec19 --- /dev/null +++ b/ui/app/img/profile/appearance.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/ui/app/img/profile/contacts.svg b/ui/app/img/profile/contacts.svg new file mode 100644 index 0000000000..46933de291 --- /dev/null +++ b/ui/app/img/profile/contacts.svg @@ -0,0 +1,4 @@ + + + + diff --git a/ui/app/img/profile/ensUsernames.svg b/ui/app/img/profile/ensUsernames.svg new file mode 100644 index 0000000000..3697232961 --- /dev/null +++ b/ui/app/img/profile/ensUsernames.svg @@ -0,0 +1,3 @@ + + + diff --git a/ui/app/img/profile/globe.svg b/ui/app/img/profile/globe.svg new file mode 100644 index 0000000000..6ddc64260c --- /dev/null +++ b/ui/app/img/profile/globe.svg @@ -0,0 +1,3 @@ + + + diff --git a/ui/app/img/profile/help.svg b/ui/app/img/profile/help.svg new file mode 100644 index 0000000000..a81aa967cd --- /dev/null +++ b/ui/app/img/profile/help.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/ui/app/img/profile/logout.svg b/ui/app/img/profile/logout.svg new file mode 100644 index 0000000000..38a02a3310 --- /dev/null +++ b/ui/app/img/profile/logout.svg @@ -0,0 +1,4 @@ + + + + diff --git a/ui/app/img/profile/myProfile.svg b/ui/app/img/profile/myProfile.svg new file mode 100644 index 0000000000..d2464038f1 --- /dev/null +++ b/ui/app/img/profile/myProfile.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/ui/app/img/profile/notifications.svg b/ui/app/img/profile/notifications.svg new file mode 100644 index 0000000000..4dd5161316 --- /dev/null +++ b/ui/app/img/profile/notifications.svg @@ -0,0 +1,3 @@ + + + diff --git a/ui/app/img/profile/security.svg b/ui/app/img/profile/security.svg new file mode 100644 index 0000000000..7604766b71 --- /dev/null +++ b/ui/app/img/profile/security.svg @@ -0,0 +1,4 @@ + + + + diff --git a/ui/app/img/sound.svg b/ui/app/img/profile/sound.svg similarity index 100% rename from ui/app/img/sound.svg rename to ui/app/img/profile/sound.svg diff --git a/ui/app/img/profile/sync.svg b/ui/app/img/profile/sync.svg new file mode 100644 index 0000000000..0aaf0ea55f --- /dev/null +++ b/ui/app/img/profile/sync.svg @@ -0,0 +1,4 @@ + + + + diff --git a/ui/app/img/profileActive.svg b/ui/app/img/profileActive.svg index e2003cbce7..d2464038f1 100644 --- a/ui/app/img/profileActive.svg +++ b/ui/app/img/profileActive.svg @@ -1,4 +1,5 @@ - - - + + + + diff --git a/ui/app/img/question.svg b/ui/app/img/question.svg deleted file mode 100644 index b58cf2f282..0000000000 --- a/ui/app/img/question.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/ui/app/img/slider.svg b/ui/app/img/slider.svg deleted file mode 100644 index c3c37755b4..0000000000 --- a/ui/app/img/slider.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/ui/app/img/sun.svg b/ui/app/img/sun.svg deleted file mode 100644 index 5d956ebac8..0000000000 --- a/ui/app/img/sun.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/ui/shared/CopyToClipBoardButton.qml b/ui/shared/CopyToClipBoardButton.qml index 6848d05f21..1ed42772b7 100644 --- a/ui/shared/CopyToClipBoardButton.qml +++ b/ui/shared/CopyToClipBoardButton.qml @@ -11,9 +11,11 @@ Rectangle { property var onClick: function() {} property string textToCopy: "" - SVGImage { + Image { width: 20 height: 20 + sourceSize.width: width + sourceSize.height: height source: "./img/copy-to-clipboard-icon.svg" anchors.horizontalCenter: parent.horizontalCenter anchors.verticalCenter: parent.verticalCenter