fix other blurry images on hdpi screens

fix other blurry images on hdpi screens fix image size ensure plist has high res directive addd directive to info runner
2020-06-25 09:23:17 -04:00 · 2020-06-25 09:23:17 -04:00 · e859250501
parent 14cd79a415
commit e859250501
36 changed files with 106 additions and 42 deletions
--- a/Info.plist
+++ b/Info.plist
@ -22,5 +22,7 @@
        <integer>1</integer>
        <key>IFMinorVersion</key>
        <integer>0</integer>
+        <key>NSHighResolutionCapable</key>
+        <string>True</string>
    </dict>
 </plist>
--- a/Info.runner.plist
+++ b/Info.runner.plist
@ -22,5 +22,7 @@
        <integer>1</integer>
        <key>IFMinorVersion</key>
        <integer>0</integer>
+        <key>NSHighResolutionCapable</key>
+        <string>True</string>
    </dict>
 </plist>
--- a/ui/app/AppLayouts/Chat/ChatColumn/ChatInput.qml
+++ b/ui/app/AppLayouts/Chat/ChatColumn/ChatInput.qml
@ -27,7 +27,6 @@ Rectangle {
        spacing: 0
        anchors.fill: parent

-
        ScrollView {
            anchors.fill: parent
            Layout.fillWidth: true
--- a/ui/app/AppLayouts/Chat/ChatColumn/Message.qml
+++ b/ui/app/AppLayouts/Chat/ChatColumn/Message.qml
@ -169,7 +169,7 @@ Item {
        mipmap: true
        smooth: false
        antialiasing: true
-        
+
        MouseArea {
            cursorShape: Qt.PointingHandCursor
            anchors.fill: parent
--- a/ui/app/AppLayouts/Chat/ContactsColumn/Channel.qml
+++ b/ui/app/AppLayouts/Chat/ContactsColumn/Channel.qml
@ -43,7 +43,7 @@ Rectangle {
      channelIdenticon: identicon
    }

-    Image {
+    SVGImage {
        id: channelIcon
        width: 16
        height: 16
--- a/ui/app/AppLayouts/Chat/components/ChannelIcon.qml
+++ b/ui/app/AppLayouts/Chat/components/ChannelIcon.qml
@ -67,7 +67,7 @@ Rectangle {
      border.color: "#10000000"
      border.width: 1
      color: Theme.transparent
-      Image {
+      SVGImage {
          width: contactImage.width ? contactImage.width : 40
          height: contactImage.height ? contactImage.height : 40
          fillMode: Image.PreserveAspectFit
--- a/ui/app/AppLayouts/Chat/components/GroupChatPopup.qml
+++ b/ui/app/AppLayouts/Chat/components/GroupChatPopup.qml
@ -171,8 +171,10 @@ ModalPopup {
                    }
                }
            ]
-            Image {
+            SVGImage {
                id: "btnSelectMembersImg"
+                width: 50
+                height: 50
            }
            background: Rectangle {
                color: "transparent"
@ -196,8 +198,10 @@ ModalPopup {
            height: 44
            anchors.bottom: parent.bottom
            anchors.left: parent.left
-            Image {
+            SVGImage {
                source: "../../../img/arrow-left-btn-active.svg"
+                width: 50
+                height: 50
            }
            background: Rectangle {
                color: "transparent"
--- a/ui/app/AppLayouts/Chat/components/GroupInfoPopup.qml
+++ b/ui/app/AppLayouts/Chat/components/GroupInfoPopup.qml
@ -115,7 +115,7 @@ ModalPopup {
            anchors.left: groupName.right
            radius: 8

-            Image {
+            SVGImage {
                id: editGroupImg
                source: "../../../img/edit-group.svg"
                anchors.horizontalCenter: parent.horizontalCenter
@ -259,6 +259,9 @@ ModalPopup {
                Column {
                    Image {
                        source: model.identicon
+                        mipmap: true
+                        smooth: false
+                        antialiasing: true
                    }
                }
                Column {
@ -330,8 +333,10 @@ ModalPopup {
            height: 44
            anchors.bottom: parent.bottom
            anchors.left: parent.left
-            Image {
+            SVGImage {
                source: "../../../img/arrow-left-btn-active.svg"
+                width: 50
+                height: 50
            }
            background: Rectangle {
                color: "transparent"
--- a/ui/app/AppLayouts/Chat/components/PrivateChatPopup.qml
+++ b/ui/app/AppLayouts/Chat/components/PrivateChatPopup.qml
@ -67,8 +67,10 @@ ModalPopup {
        height: 44
        anchors.bottom: parent.bottom
        anchors.right: parent.right
-        Image {
+        SVGImage {
            source: chatKey.text == "" ? "../../../img/arrow-button-inactive.svg" : "../../../img/arrow-btn-active.svg"
+            width: 50
+            height: 50
        }
        background: Rectangle {
            color: "transparent"
--- a/ui/app/AppLayouts/Chat/components/ProfilePopup.qml
+++ b/ui/app/AppLayouts/Chat/components/ProfilePopup.qml
@ -33,7 +33,7 @@ ModalPopup {
            color: Theme.transparent
            anchors.top: parent.top
            anchors.topMargin: Theme.padding
-            Image {
+            SVGImage {
                width: parent.width
                height: parent.height
                fillMode: Image.PreserveAspectFit
@ -76,8 +76,10 @@ ModalPopup {
            anchors.rightMargin: 32 + Theme.smallPadding
            radius: 8

-            Image {
+            SVGImage {
                source: "../../../img/qr-code-icon.svg"
+                width: 25
+                height: 25
                anchors.horizontalCenter: parent.horizontalCenter
                anchors.verticalCenter: parent.verticalCenter
            }
@ -210,7 +212,7 @@ ModalPopup {
    //     anchors.leftMargin: Theme.padding
    //     radius: 8

-    //     Image {
+    //     SVGImage {
    //         source: "../../../../shared/img/copy-to-clipboard-icon.svg"
    //         anchors.horizontalCenter: parent.horizontalCenter
    //         anchors.verticalCenter: parent.verticalCenter
--- a/ui/app/AppLayouts/Chat/components/PublicChatPopup.qml
+++ b/ui/app/AppLayouts/Chat/components/PublicChatPopup.qml
@ -89,8 +89,10 @@ ModalPopup {
        background: Rectangle {
            color: "transparent"
        }
-        Image {
+        SVGImage {
            source: channelName.text == "" ? "../../../img/arrow-button-inactive.svg" : "../../../img/arrow-btn-active.svg"
+            width: 50
+            height: 50
        }
        MouseArea {
            id: btnMAJoinChat
--- a/ui/app/AppLayouts/Wallet/CollectiblesTab.qml
+++ b/ui/app/AppLayouts/Wallet/CollectiblesTab.qml
@ -17,12 +17,12 @@ Item {
            anchors.rightMargin: 0
            anchors.left: parent.left
            anchors.leftMargin: 0
-            height: 40
+            height: 132

-            Image {
+            SVGImage {
                id: collectibleImage
-                width: 36
-                height: 36
+                width: 128
+                height: 128
                source: image
                anchors.left: parent.left
                anchors.leftMargin: 0
@ -32,9 +32,9 @@ Item {
            StyledText {
                id: collectibleName
                text: name
-                anchors.leftMargin: Theme.padding
                anchors.verticalCenter: parent.verticalCenter
                anchors.left: collectibleImage.right
+                anchors.leftMargin: Theme.padding
                font.pixelSize: 15
            }

--- a/ui/app/AppLayouts/Wallet/LeftTab.qml
+++ b/ui/app/AppLayouts/Wallet/LeftTab.qml
@ -100,7 +100,7 @@ Item {
            anchors.left: parent.left
            anchors.leftMargin: Theme.padding

-            Image {
+            SVGImage {
                id: walletIcon
                width: 12
                height: 12
--- a/ui/app/AppLayouts/Wallet/WalletHeader.qml
+++ b/ui/app/AppLayouts/Wallet/WalletHeader.qml
@ -102,7 +102,7 @@ Item {
            width: sendImg.width + sendText.width + walletMenu.btnMargin
            height: sendText.height

-            Image {
+            SVGImage {
                id: sendImg
                width: 12
                height: 12
@ -134,7 +134,7 @@ Item {
            anchors.left: sendBtn.right
            anchors.leftMargin: walletMenu.btnOuterMargin

-            Image {
+            SVGImage {
                id: receiveImg
                width: 12
                height: 12
@ -158,7 +158,7 @@ Item {
            anchors.leftMargin: walletMenu.btnOuterMargin
            width: settingsImg.width
            height: settingsImg.height
-            Image {
+            SVGImage {
                id: settingsImg
                width: 18
                height: 18
--- a/ui/app/AppLayouts/Wallet/components/SendModalContent.qml
+++ b/ui/app/AppLayouts/Wallet/components/SendModalContent.qml
@ -18,13 +18,15 @@ Item {
        anchors.topMargin: 16
    }

-    Image {
+    SVGImage {
        id: closeModalImg
        anchors.top: parent.top
        anchors.right: parent.right
        anchors.rightMargin: 16
        anchors.topMargin: 16
        source: "../../../../shared/img/close.svg"
+        width: 25
+        height: 25
        MouseArea {
            id: closeModalMouseArea
            cursorShape: Qt.PointingHandCursor
--- a/ui/app/AppLayouts/Wallet/components/SetCurrencyModalContent.qml
+++ b/ui/app/AppLayouts/Wallet/components/SetCurrencyModalContent.qml
@ -19,13 +19,15 @@ Item {
        anchors.topMargin: 16
    }

-    Image {
+    SVGImage {
        id: closeModalImg
        anchors.top: parent.top
        anchors.right: parent.right
        anchors.rightMargin: 16
        anchors.topMargin: 16
        source: "../../../../shared/img/close.svg"
+        width: 25
+        height: 25
        MouseArea {
            id: closeModalMouseArea
            cursorShape: Qt.PointingHandCursor
--- a/ui/onboarding/CreatePasswordModal.qml
+++ b/ui/onboarding/CreatePasswordModal.qml
@ -85,7 +85,7 @@ ModalPopup {
        anchors.bottom: popup.bottom
        anchors.left: parent.left

-        Image {
+        SVGImage {
            id: loadingImg
            visible: loading
            anchors.top: submitBtn.top
--- a/ui/onboarding/EnterSeedPhraseModal.qml
+++ b/ui/onboarding/EnterSeedPhraseModal.qml
@ -54,7 +54,7 @@ ModalPopup {
            color: Theme.lightBlue
        }

-        Image {
+        SVGImage {
            sourceSize.height: 15
            sourceSize.width: 20
            anchors.horizontalCenter: parent.horizontalCenter
--- a/ui/onboarding/GenKeyModal.qml
+++ b/ui/onboarding/GenKeyModal.qml
@ -38,7 +38,7 @@ ModalPopup {
            color: Theme.lightBlue
        }

-        Image {
+        SVGImage {
            sourceSize.height: 15
            sourceSize.width: 20
            anchors.horizontalCenter: parent.horizontalCenter
--- a/ui/onboarding/Intro.qml
+++ b/ui/onboarding/Intro.qml
@ -29,6 +29,7 @@ RowLayout {
                image: "img/chat@2x.jpg"
                title: qsTr("Truly private communication")
                description: qsTr("Chat over a peer-to-peer, encrypted network\n where messages can't be censored or hacked")
+                isFirst: true
            }
            Slide {
                image: "img/wallet@2x.jpg"
@ -76,6 +77,7 @@ RowLayout {
            anchors.horizontalCenter: parent.horizontalCenter
            width: 146
            height: 44
+
        }

        StyledText {
--- a/ui/onboarding/KeysMain.qml
+++ b/ui/onboarding/KeysMain.qml
@ -27,11 +27,9 @@ Page {
        Image {
            id: keysImg
            anchors.horizontalCenter: parent.horizontalCenter
-            sourceSize.width: 160
-            sourceSize.height: 160
            anchors.top: parent.top
            fillMode: Image.PreserveAspectFit
-            source: "img/key@2x.png"
+            source: "img/keys@2x.jpg"
        }

        StyledText {
--- a/ui/onboarding/Login.qml
+++ b/ui/onboarding/Login.qml
@ -73,7 +73,7 @@ Item {

            radius: 4

-            Image {
+            SVGImage {
                id: caretImg
                width: 10
                height: 6
@ -146,7 +146,7 @@ Item {
                loading = true
                loginModel.login(txtPassword.textField.text)
            }
-            Image {
+            SVGImage {
                anchors.horizontalCenter: parent.horizontalCenter
                anchors.verticalCenter: parent.verticalCenter
                // TODO replace by a real loading image
--- a/ui/onboarding/Slide.qml
+++ b/ui/onboarding/Slide.qml
@ -8,13 +8,12 @@ Item {
    property string image: "img/chat@2x.jpg"
    property string title: "Truly private communication"
    property string description: "Chat over a peer-to-peer, encrypted network\n where messages can't be censored or hacked"
+    property bool isFirst: false
    property bool isLast: false

    Image {
        id: img1
        anchors.horizontalCenter: parent.horizontalCenter
-        sourceSize.width: 414
-        sourceSize.height: 414
        anchors.topMargin: 17
        fillMode: Image.PreserveAspectFit
        source: image
@ -40,6 +39,35 @@ Item {
        font.kerning: true
    }

+    Button {
+        id: btnPrevious1
+        width: 40
+        height: 40
+        anchors.top: txtDesc1.top
+        anchors.bottomMargin: -2
+        anchors.bottom: txtDesc1.bottom
+        anchors.topMargin: -2
+        anchors.right: txtDesc1.left
+        anchors.rightMargin: 32
+        onClicked: vwOnboarding.currentIndex--
+        visible: !isFirst
+        background: Rectangle {
+            id: rctPrevious1
+            color: Theme.grey
+            border.width: 0
+            radius: 50
+
+            SVGImage {
+                anchors.horizontalCenter: parent.horizontalCenter
+                anchors.verticalCenter: parent.verticalCenter
+                source: "img/next.svg"
+                width: 10
+                height: 10
+                mirror: true
+            }
+        }
+    }
+
    StyledText {
        id: txtDesc1
        x: 772
@ -73,10 +101,12 @@ Item {
            border.width: 0
            radius: 50

-            Image {
+            SVGImage {
                anchors.horizontalCenter: parent.horizontalCenter
                anchors.verticalCenter: parent.verticalCenter
                source: "img/next.svg"
+                width: 10
+                height: 10
            }
        }
    }
--- a/ui/onboarding/img/key.png
+++ b/ui/onboarding/img/key.png
--- a/ui/onboarding/img/key@2x.png
+++ b/ui/onboarding/img/key@2x.png
--- a/ui/onboarding/img/keys-dark@2x.jpg
+++ b/ui/onboarding/img/keys-dark@2x.jpg
--- a/ui/onboarding/img/keys-dark@3x.jpg
+++ b/ui/onboarding/img/keys-dark@3x.jpg
--- a/ui/onboarding/img/keys@2x.jpg
+++ b/ui/onboarding/img/keys@2x.jpg
--- a/ui/onboarding/img/keys@3x.jpg
+++ b/ui/onboarding/img/keys@3x.jpg
--- a/ui/shared/Identicon.qml
+++ b/ui/shared/Identicon.qml
@ -21,7 +21,6 @@ Rectangle {
        mipmap: true
        smooth: false
        antialiasing: true
-
    }
 }

--- a/ui/shared/Input.qml
+++ b/ui/shared/Input.qml
@ -74,7 +74,7 @@ Item {
            }
        }

-        Image {
+        SVGImage {
            id: iconImg
            sourceSize.height: iconHeight
            sourceSize.width: iconWidth
--- a/ui/shared/ModalPopup.qml
+++ b/ui/shared/ModalPopup.qml
@ -65,9 +65,11 @@ Popup {
            anchors.right: parent.right
            radius: 8

-            Image {
+            SVGImage {
                id: closeModalImg
                source: "./img/close.svg"
+                width: 25
+                height: 25
                anchors.horizontalCenter: parent.horizontalCenter
                anchors.verticalCenter: parent.verticalCenter
            }
--- a/ui/shared/PopupMenu.qml
+++ b/ui/shared/PopupMenu.qml
@ -2,6 +2,7 @@ import QtQuick 2.13
 import QtQuick.Controls 2.13
 import QtGraphicalEffects 1.13
 import "../imports"
+import "../shared"

 Menu {
    property alias arrowX: bgPopupMenuTopArrow.x
@ -23,14 +24,16 @@ Menu {
                anchors.leftMargin: 12
                height: popupMenuItemIcon.height
                anchors.verticalCenter: parent.verticalCenter
-                Image {
-                    fillMode: Image.Pad
+                SVGImage {
                    id: popupMenuItemIcon
                    source: popupMenuItem.icon.source
                    visible: false
+                    width: 25
+                    height: 25
                }

                ColorOverlay {
+                    cached: true
                    anchors.fill: popupMenuItemIcon
                    anchors.verticalCenter: parent.verticalCenter
                    source: popupMenuItemIcon
--- a/ui/shared/RoundedIcon.qml
+++ b/ui/shared/RoundedIcon.qml
@ -13,7 +13,7 @@ Rectangle {
    color: bg
    radius: size / 2

-    Image {
+    SVGImage {
        id: roundedIconImage
        width: 12
        height: 12
--- a/ui/shared/Select.qml
+++ b/ui/shared/Select.qml
@ -78,7 +78,7 @@ Item {
            }
        }

-        Image {
+        SVGImage {
            id: caret
            width: 11
            height: 6
--- a/ui/shared/StyledButton.qml
+++ b/ui/shared/StyledButton.qml
@ -33,4 +33,12 @@ Button {
        text: btnStyled.label
        font.weight: Font.Medium
    }
+
+    MouseArea {
+        cursorShape: Qt.PointingHandCursor
+        anchors.fill: parent
+        onClicked: {
+            parent.onClicked()
+        }
+    }
 }