From 5a5f28917c7dc0f04200caacf03a95b8adc54973 Mon Sep 17 00:00:00 2001
From: Iktwo Sh <elmaildeliktwo@gmail.com>
Date: Fri, 19 Sep 2014 00:08:26 -0700
Subject: [PATCH] Renamed dpMultiplier to dp

---
 qml/AboutPage.qml            |  8 ++++----
 qml/FakeMainPage.qml         | 22 +++++++++++-----------
 qml/FakePlaybackControls.qml | 28 ++++++++++++++--------------
 qml/FakeSearchPage.qml       | 14 +++++++-------
 qml/FlatButtonStyle.qml      |  2 +-
 qml/PlaybackControls.qml     | 34 +++++++++++++++++-----------------
 qml/PlaylistDelegate.qml     | 22 +++++++++++-----------
 qml/SearchPage.qml           | 16 ++++++++--------
 qml/SongDelegate.qml         | 28 ++++++++++++++--------------
 qml/TutorialPage.qml         |  8 ++++----
 qml/UpdateDialog.qml         | 25 ++++++++++++-------------
 qml/components/Divider.qml   |  4 ++--
 12 files changed, 105 insertions(+), 106 deletions(-)

diff --git a/qml/AboutPage.qml b/qml/AboutPage.qml
index 35db479..35b92cf 100644
--- a/qml/AboutPage.qml
+++ b/qml/AboutPage.qml
@@ -28,7 +28,7 @@ Page {
 
             anchors {
                 fill: parent
-                margins: 4 * ScreenValues.dpMultiplier
+                margins: 4 * ScreenValues.dp
             }
 
             flickableItem.interactive: true; focus: true
@@ -45,7 +45,7 @@ Page {
                     anchors.horizontalCenter: parent.horizontalCenter
                     width: parent.width
 
-                    spacing: 4 * ScreenValues.dpMultiplier
+                    spacing: 4 * ScreenValues.dp
 
                     Label {
                         width: parent.width
@@ -59,7 +59,7 @@ Page {
                     }
 
                     Item {
-                        height: ScreenValues.dpMultiplier * 8
+                        height: ScreenValues.dp * 8
                         width: 1
                     }
 
@@ -97,7 +97,7 @@ Page {
                     }
 
                     Item {
-                        height: ScreenValues.dpMultiplier * 8
+                        height: ScreenValues.dp * 8
                         width: 1
                     }
 
diff --git a/qml/FakeMainPage.qml b/qml/FakeMainPage.qml
index 2b475d9..74d705d 100644
--- a/qml/FakeMainPage.qml
+++ b/qml/FakeMainPage.qml
@@ -72,7 +72,7 @@ Item {
             id: songList
 
             width: parent.width
-            height: (64 * ScreenValues.dpMultiplier + 1 * ScreenValues.dpMultiplier) * count
+            height: (64 * ScreenValues.dp + 1 * ScreenValues.dp) * count
 
             model: fakeModel
             clip: true
@@ -96,7 +96,7 @@ Item {
         Rectangle {
             id: messageBackground
 
-            property int margin: ScreenValues.dpMultiplier * 8
+            property int margin: ScreenValues.dp * 8
 
             width: parent.width
             height: Math.min(margin * 2 + (buttonDone.y + buttonDone.height) - (labelMessage.y + (labelMessage.height - labelMessage.paintedHeight)), columnMessage.height)
@@ -124,7 +124,7 @@ Item {
                 anchors.horizontalCenter: parent.horizontalCenter
                 Layout.fillWidth: true
 
-                font.pixelSize: ScreenValues.dpMultiplier * 18
+                font.pixelSize: ScreenValues.dp * 18
                 color: Theme.mainTextColor
                 text: qsTr("This is your playlist. The music that you add will appear here. Also when you play music the media controls will appear at the bottom.")
                 renderType: Text.NativeRendering
@@ -142,9 +142,9 @@ Item {
 
                 anchors.horizontalCenter: parent.horizontalCenter
                 text: qsTr("Done")
-                Layout.preferredHeight: 40 * ScreenValues.dpMultiplier
-                Layout.preferredWidth: 152 * ScreenValues.dpMultiplier
-                height: 40 * ScreenValues.dpMultiplier
+                Layout.preferredHeight: 40 * ScreenValues.dp
+                Layout.preferredWidth: 152 * ScreenValues.dp
+                height: 40 * ScreenValues.dp
                 style: FlatButtonStyle { }
 
                 onClicked: {
@@ -181,7 +181,7 @@ Item {
     Rectangle {
         id: messageBackgroundDettached
 
-        property int margin: ScreenValues.dpMultiplier * 8
+        property int margin: ScreenValues.dp * 8
 
         width: parent.width
         height: Math.min(margin * 2 + (buttonDoneDettached.y + buttonDoneDettached.height) - (labelMessageDettached.y + (labelMessageDettached.height - labelMessageDettached.paintedHeight)), columnMessageDettached.height)
@@ -209,7 +209,7 @@ Item {
             anchors.horizontalCenter: parent.horizontalCenter
             Layout.fillWidth: true
 
-            font.pixelSize: ScreenValues.dpMultiplier * 18
+            font.pixelSize: ScreenValues.dp * 18
             color: Theme.mainTextColor
             text: qsTr("This is your playlist. The music that you add will appear here. Also when you play music the media controls will appear at the bottom.")
             renderType: Text.NativeRendering
@@ -227,9 +227,9 @@ Item {
 
             anchors.horizontalCenter: parent.horizontalCenter
             text: qsTr("Done")
-            Layout.preferredHeight: 40 * ScreenValues.dpMultiplier
-            Layout.preferredWidth: 152 * ScreenValues.dpMultiplier
-            height: 40 * ScreenValues.dpMultiplier
+            Layout.preferredHeight: 40 * ScreenValues.dp
+            Layout.preferredWidth: 152 * ScreenValues.dp
+            height: 40 * ScreenValues.dp
             style: FlatButtonStyle { }
 
             onClicked: {
diff --git a/qml/FakePlaybackControls.qml b/qml/FakePlaybackControls.qml
index 0cb6763..833f299 100644
--- a/qml/FakePlaybackControls.qml
+++ b/qml/FakePlaybackControls.qml
@@ -10,7 +10,7 @@ Rectangle {
     property alias song: songLabel.text
 
     color: "#fafafa"
-    height: column.height + 1 * ScreenValues.dpMultiplier
+    height: column.height + 1 * ScreenValues.dp
     width: parent.width
 
     ColumnLayout {
@@ -33,7 +33,7 @@ Rectangle {
                 background: Rectangle {
                     color: Style.PROGRESS_BAR_BACKGROUND_LIGHT
                     implicitWidth: control.width
-                    implicitHeight: 4 * ScreenValues.dpMultiplier
+                    implicitHeight: 4 * ScreenValues.dp
                 }
                 progress: Rectangle {
                     color: "#0066CC"
@@ -47,7 +47,7 @@ Rectangle {
             anchors {
                 left: parent.left
                 right: parent.right
-                margins: 1 * ScreenValues.dpMultiplier
+                margins: 1 * ScreenValues.dp
             }
 
             RowLayout {
@@ -60,17 +60,17 @@ Rectangle {
                     verticalAlignment: "AlignVCenter"
                     text: "02:10"
                     renderType: Text.NativeRendering
-                    font.pixelSize: 12 * ScreenValues.dpMultiplier
+                    font.pixelSize: 12 * ScreenValues.dp
                 }
 
                 RowLayout {
-                    spacing: 8 * ScreenValues.dpMultiplier
+                    spacing: 8 * ScreenValues.dp
 
                     ImageButton {
                         id: previousBtn
 
-                        height: 48 * ScreenValues.dpMultiplier
-                        width: 48 * ScreenValues.dpMultiplier
+                        height: 48 * ScreenValues.dp
+                        width: 48 * ScreenValues.dp
 
                         source: "qrc:/images/" + Theme.getBestIconSize(Math.min(icon.height, icon.width)) + "previous"
                         enabled: false
@@ -79,8 +79,8 @@ Rectangle {
                     ImageButton {
                         id: playBtn
 
-                        height: 48 * ScreenValues.dpMultiplier
-                        width: 48 * ScreenValues.dpMultiplier
+                        height: 48 * ScreenValues.dp
+                        width: 48 * ScreenValues.dp
 
                         source: "qrc:/images/" + Theme.getBestIconSize(Math.min(icon.height, icon.width)) + "pause"
                         enabled: false
@@ -89,8 +89,8 @@ Rectangle {
                     ImageButton {
                         id: nextBtn
 
-                        height: 48 * ScreenValues.dpMultiplier
-                        width: 48 * ScreenValues.dpMultiplier
+                        height: 48 * ScreenValues.dp
+                        width: 48 * ScreenValues.dp
 
                         source: "qrc:/images/" + Theme.getBestIconSize(Math.min(icon.height, icon.width)) + "next"
                         enabled: false
@@ -104,7 +104,7 @@ Rectangle {
                     text: "04:14"
                     horizontalAlignment: "AlignRight"
                     renderType: Text.NativeRendering
-                    font.pixelSize: 12 * ScreenValues.dpMultiplier
+                    font.pixelSize: 12 * ScreenValues.dp
                 }
             }
         }
@@ -115,12 +115,12 @@ Rectangle {
             anchors {
                 left: parent.left
                 right: parent.right
-                margins: 1 * ScreenValues.dpMultiplier
+                margins: 1 * ScreenValues.dp
             }
 
             color: Style.TEXT_COLOR_DARK
             renderType: Text.NativeRendering
-            font.pixelSize: 14 * ScreenValues.dpMultiplier
+            font.pixelSize: 14 * ScreenValues.dp
         }
     }
 }
diff --git a/qml/FakeSearchPage.qml b/qml/FakeSearchPage.qml
index d93b3b1..514ba72 100644
--- a/qml/FakeSearchPage.qml
+++ b/qml/FakeSearchPage.qml
@@ -61,7 +61,7 @@ Page {
                         }
 
                         color: "#ddefefef"
-                        height: 1 * ScreenValues.dpMultiplier
+                        height: 1 * ScreenValues.dp
                     }
 
                     Rectangle {
@@ -71,7 +71,7 @@ Page {
                         }
 
                         color: "#ddefefef"
-                        width: 1 * ScreenValues.dpMultiplier
+                        width: 1 * ScreenValues.dp
                         height: width * 5
                     }
 
@@ -82,7 +82,7 @@ Page {
                         }
 
                         color: "#ddefefef"
-                        width: 1 * ScreenValues.dpMultiplier
+                        width: 1 * ScreenValues.dp
                         height: width * 5
                     }
                 }
@@ -116,13 +116,13 @@ Page {
             Item {
                 id: busyFooterContainer
                 width: resultsList.width
-                height: musicStreamer.searching && resultsList.count > 0 ? 48 * ScreenValues.dpMultiplier : 0
+                height: musicStreamer.searching && resultsList.count > 0 ? 48 * ScreenValues.dp : 0
 
                 Connections {
                     target: musicStreamer
                     onSearchingChanged: {
                         if (musicStreamer.searching && resultsList.count > 0)
-                            busyFooterContainer.height = 48 * ScreenValues.dpMultiplier
+                            busyFooterContainer.height = 48 * ScreenValues.dp
                         else
                             busyFooterContainer.height = 0
                     }
@@ -132,7 +132,7 @@ Page {
                     target: resultsList
                     onCountChanged: {
                         if (musicStreamer.searching && resultsList.count > 0)
-                            busyFooterContainer.height = 48 * ScreenValues.dpMultiplier
+                            busyFooterContainer.height = 48 * ScreenValues.dp
                         else
                             busyFooterContainer.height = 0
                     }
@@ -140,7 +140,7 @@ Page {
 
                 BusyIndicator {
                     anchors.centerIn: parent
-                    height: parent.height - 8 * ScreenValues.dpMultiplier
+                    height: parent.height - 8 * ScreenValues.dp
                     width: height
                     running: parent.height > 0
                     style: BusyIndicatorStyle {
diff --git a/qml/FlatButtonStyle.qml b/qml/FlatButtonStyle.qml
index e0d6656..032c458 100644
--- a/qml/FlatButtonStyle.qml
+++ b/qml/FlatButtonStyle.qml
@@ -19,7 +19,7 @@ ButtonStyle {
         elide: "ElideRight"
         color: control.pressed ? Qt.darker(fontColor) : fontColor
         text: buttonStyle.control.text
-        font.pixelSize: 14 * ScreenValues.dpMultiplier
+        font.pixelSize: 14 * ScreenValues.dp
         renderType: "NativeRendering"
         verticalAlignment: "AlignVCenter"
         horizontalAlignment: "AlignHCenter"
diff --git a/qml/PlaybackControls.qml b/qml/PlaybackControls.qml
index a5b8935..ab151aa 100644
--- a/qml/PlaybackControls.qml
+++ b/qml/PlaybackControls.qml
@@ -34,7 +34,7 @@ Rectangle {
     }
 
     color: "#fafafa"
-    height: column.height + 1 * ScreenValues.dpMultiplier
+    height: column.height + 1 * ScreenValues.dp
     width: parent.width
 
     ColumnLayout {
@@ -63,7 +63,7 @@ Rectangle {
                 background: Rectangle {
                     color: Style.PROGRESS_BAR_BACKGROUND_LIGHT
                     implicitWidth: control.width
-                    implicitHeight: 4 * ScreenValues.dpMultiplier
+                    implicitHeight: 4 * ScreenValues.dp
                 }
                 progress: Rectangle {
                     color: "#0066CC"
@@ -89,7 +89,7 @@ Rectangle {
             anchors {
                 left: parent.left
                 right: parent.right
-                margins: 1 * ScreenValues.dpMultiplier
+                margins: 1 * ScreenValues.dp
             }
 
             RowLayout {
@@ -97,7 +97,7 @@ Rectangle {
 
                 Item {
                     height: 1
-                    Layout.preferredWidth: 4 * ScreenValues.dpMultiplier
+                    Layout.preferredWidth: 4 * ScreenValues.dp
                 }
 
                 Label {
@@ -108,17 +108,17 @@ Rectangle {
                     verticalAlignment: "AlignVCenter"
                     text: formatMilliseconds(audioElement.position)
                     renderType: Text.NativeRendering
-                    font.pixelSize: 12 * ScreenValues.dpMultiplier
+                    font.pixelSize: 12 * ScreenValues.dp
                 }
 
                 RowLayout {
-                    spacing: 8 * ScreenValues.dpMultiplier
+                    spacing: 8 * ScreenValues.dp
 
                     ImageButton {
                         id: previousBtn
 
-                        height: 48 * ScreenValues.dpMultiplier
-                        width: 48 * ScreenValues.dpMultiplier
+                        height: 48 * ScreenValues.dp
+                        width: 48 * ScreenValues.dp
 
                         source: "qrc:/images/" + Theme.getBestIconSize(Math.min(icon.height, icon.width)) + "previous"
 
@@ -128,8 +128,8 @@ Rectangle {
                     ImageButton {
                         id: playBtn
 
-                        height: 48 * ScreenValues.dpMultiplier
-                        width: 48 * ScreenValues.dpMultiplier
+                        height: 48 * ScreenValues.dp
+                        width: 48 * ScreenValues.dp
 
                         source: "qrc:/images/" + Theme.getBestIconSize(Math.min(icon.height, icon.width)) + (audioElement.playbackState == Audio.PlayingState || (audioElement.status == Audio.Buffering || audioElement.status == Audio.Stalled) && audioElement.playbackState != Audio.PausedState ? "pause" : "play")
 
@@ -144,8 +144,8 @@ Rectangle {
                     ImageButton {
                         id: nextBtn
 
-                        height: 48 * ScreenValues.dpMultiplier
-                        width: 48 * ScreenValues.dpMultiplier
+                        height: 48 * ScreenValues.dp
+                        width: 48 * ScreenValues.dp
 
                         source: "qrc:/images/" + Theme.getBestIconSize(Math.min(icon.height, icon.width)) + "next"
 
@@ -160,12 +160,12 @@ Rectangle {
                     text: formatMilliseconds(audioElement.duration)
                     horizontalAlignment: "AlignRight"
                     renderType: Text.NativeRendering
-                    font.pixelSize: 12 * ScreenValues.dpMultiplier
+                    font.pixelSize: 12 * ScreenValues.dp
                 }
 
                 Item {
                     height: 1
-                    Layout.preferredWidth: 4 * ScreenValues.dpMultiplier
+                    Layout.preferredWidth: 4 * ScreenValues.dp
                 }
             }
         }
@@ -175,11 +175,11 @@ Rectangle {
 
             anchors.horizontalCenter: parent.horizontalCenter
 
-            width: parent.width - (16 * ScreenValues.dpMultiplier)
-            Layout.preferredWidth: parent.width - (16 * ScreenValues.dpMultiplier)
+            width: parent.width - (16 * ScreenValues.dp)
+            Layout.preferredWidth: parent.width - (16 * ScreenValues.dp)
             color: Style.TEXT_COLOR_DARK
             renderType: Text.NativeRendering
-            font.pixelSize: 14 * ScreenValues.dpMultiplier
+            font.pixelSize: 14 * ScreenValues.dp
         }
     }
 }
diff --git a/qml/PlaylistDelegate.qml b/qml/PlaylistDelegate.qml
index 307453e..2355799 100644
--- a/qml/PlaylistDelegate.qml
+++ b/qml/PlaylistDelegate.qml
@@ -11,7 +11,7 @@ Item {
     signal requestedRemove()
     signal pressAndHold()
 
-    height: 64 * ScreenValues.dpMultiplier + 1 * ScreenValues.dpMultiplier
+    height: 64 * ScreenValues.dp + 1 * ScreenValues.dp
     width: parent.width
 
     MouseArea {
@@ -43,12 +43,12 @@ Item {
             id: songName
 
             anchors {
-                top: parent.top; topMargin: 12 * ScreenValues.dpMultiplier
-                right: removeButton.left; rightMargin: 8 * ScreenValues.dpMultiplier
-                left: parent.left; leftMargin: 8 * ScreenValues.dpMultiplier
+                top: parent.top; topMargin: 12 * ScreenValues.dp
+                right: removeButton.left; rightMargin: 8 * ScreenValues.dp
+                left: parent.left; leftMargin: 8 * ScreenValues.dp
             }
 
-            font.pixelSize: 18 * ScreenValues.dpMultiplier
+            font.pixelSize: 18 * ScreenValues.dp
 
             color: Style.TEXT_COLOR_DARK
             elide: Text.ElideRight
@@ -60,12 +60,12 @@ Item {
 
         Label {
             anchors {
-                bottom: parent.bottom; bottomMargin:  12 * ScreenValues.dpMultiplier
-                right: removeButton.left; rightMargin: 8 * ScreenValues.dpMultiplier
-                left: parent.left; leftMargin: 8 * ScreenValues.dpMultiplier
+                bottom: parent.bottom; bottomMargin:  12 * ScreenValues.dp
+                right: removeButton.left; rightMargin: 8 * ScreenValues.dp
+                left: parent.left; leftMargin: 8 * ScreenValues.dp
             }
 
-            font.pixelSize: 12 * ScreenValues.dpMultiplier
+            font.pixelSize: 12 * ScreenValues.dp
 
             elide: Text.ElideRight
             color: Style.TEXT_SECONDARY_COLOR_DARK
@@ -77,10 +77,10 @@ Item {
         ImageButton {
             id: removeButton
 
-            anchors { right: parent.right; rightMargin: 8 * ScreenValues.dpMultiplier }
+            anchors { right: parent.right; rightMargin: 8 * ScreenValues.dp }
 
             height: parent.height
-            width: 48 * ScreenValues.dpMultiplier
+            width: 48 * ScreenValues.dp
 
             source: "qrc:/images/" + Theme.getBestIconSize(Math.min(icon.height, icon.width)) + "remove"
 
diff --git a/qml/SearchPage.qml b/qml/SearchPage.qml
index 959c60d..824567a 100644
--- a/qml/SearchPage.qml
+++ b/qml/SearchPage.qml
@@ -43,7 +43,7 @@ Page {
 
             inputMethodHints: Qt.ImhNoPredictiveText
             placeholderText: qsTr("Search songs and artists")
-            font.pixelSize: 14 * ScreenValues.dpMultiplier
+            font.pixelSize: 14 * ScreenValues.dp
 
             onAccepted: root.search()
 
@@ -64,7 +64,7 @@ Page {
                         }
 
                         color: "#ddefefef"
-                        height: 1 * ScreenValues.dpMultiplier
+                        height: 1 * ScreenValues.dp
                     }
 
                     Rectangle {
@@ -74,7 +74,7 @@ Page {
                         }
 
                         color: "#ddefefef"
-                        width: 1 * ScreenValues.dpMultiplier
+                        width: 1 * ScreenValues.dp
                         height: width * 5
                     }
 
@@ -85,7 +85,7 @@ Page {
                         }
 
                         color: "#ddefefef"
-                        width: 1 * ScreenValues.dpMultiplier
+                        width: 1 * ScreenValues.dp
                         height: width * 5
                     }
                 }
@@ -119,13 +119,13 @@ Page {
             Item {
                 id: busyFooterContainer
                 width: resultsList.width
-                height: musicStreamer.searching && resultsList.count > 0 ? 48 * ScreenValues.dpMultiplier : 0
+                height: musicStreamer.searching && resultsList.count > 0 ? 48 * ScreenValues.dp : 0
 
                 Connections {
                     target: musicStreamer
                     onSearchingChanged: {
                         if (musicStreamer.searching && resultsList.count > 0)
-                            busyFooterContainer.height = 48 * ScreenValues.dpMultiplier
+                            busyFooterContainer.height = 48 * ScreenValues.dp
                         else
                             busyFooterContainer.height = 0
                     }
@@ -135,7 +135,7 @@ Page {
                     target: resultsList
                     onCountChanged: {
                         if (musicStreamer.searching && resultsList.count > 0)
-                            busyFooterContainer.height = 48 * ScreenValues.dpMultiplier
+                            busyFooterContainer.height = 48 * ScreenValues.dp
                         else
                             busyFooterContainer.height = 0
                     }
@@ -143,7 +143,7 @@ Page {
 
                 BusyIndicator {
                     anchors.centerIn: parent
-                    height: parent.height - 8 * ScreenValues.dpMultiplier
+                    height: parent.height - 8 * ScreenValues.dp
                     width: height
                     running: parent.height > 0
                     style: BusyIndicatorStyle {
diff --git a/qml/SongDelegate.qml b/qml/SongDelegate.qml
index 2e80dd0..915ee2d 100644
--- a/qml/SongDelegate.qml
+++ b/qml/SongDelegate.qml
@@ -33,7 +33,7 @@ Item {
             return "#2ecc71"
     }
 
-    height: 84 * ScreenValues.dpMultiplier
+    height: 84 * ScreenValues.dp
     width: parent.width
 
     RowLayout {
@@ -44,18 +44,18 @@ Item {
 
             anchors {
                 verticalCenter: parent.verticalCenter
-                left: parent.left; leftMargin: 8 * ScreenValues.dpMultiplier
+                left: parent.left; leftMargin: 8 * ScreenValues.dp
             }
 
             antialiasing: true
-            Layout.preferredHeight: 68 * ScreenValues.dpMultiplier
-            Layout.preferredWidth: 68 * ScreenValues.dpMultiplier
+            Layout.preferredHeight: 68 * ScreenValues.dp
+            Layout.preferredWidth: 68 * ScreenValues.dp
             fillMode: Image.PreserveAspectCrop
             source: "http://www.goear.com/band/picture/" + model.picture
         }
 
         Item {
-            Layout.preferredWidth: 8 * ScreenValues.dpMultiplier
+            Layout.preferredWidth: 8 * ScreenValues.dp
             Layout.fillHeight: true
         }
 
@@ -66,7 +66,7 @@ Item {
             Label {
                 id: songName
 
-                font.pixelSize: 14 * ScreenValues.dpMultiplier
+                font.pixelSize: 14 * ScreenValues.dp
 
                 Layout.fillWidth: true
                 color: Style.TEXT_COLOR_DARK
@@ -81,7 +81,7 @@ Item {
 
                 Label {
                     Layout.fillWidth: true
-                    font.pixelSize: 12 * ScreenValues.dpMultiplier
+                    font.pixelSize: 12 * ScreenValues.dp
 
                     elide: Text.ElideRight
                     color: Style.TEXT_SECONDARY_COLOR_DARK
@@ -104,7 +104,7 @@ Item {
 
                         anchors.centerIn: parent
 
-                        font.pixelSize: 12 * ScreenValues.dpMultiplier
+                        font.pixelSize: 12 * ScreenValues.dp
 
                         color: Style.TEXT_COLOR_LIGHT
                         elide: Text.ElideRight
@@ -117,7 +117,7 @@ Item {
 
             Label {
                 Layout.fillWidth: true
-                font.pixelSize: 12 * ScreenValues.dpMultiplier
+                font.pixelSize: 12 * ScreenValues.dp
 
                 elide: Text.ElideRight
                 color: Style.TEXT_SECONDARY_COLOR_DARK
@@ -132,13 +132,13 @@ Item {
 
             anchors.right: parent.right
 
-            spacing: 4 * ScreenValues.dpMultiplier
-            Layout.preferredWidth: spacing + (48 * ScreenValues.dpMultiplier * 2)
+            spacing: 4 * ScreenValues.dp
+            Layout.preferredWidth: spacing + (48 * ScreenValues.dp * 2)
             Layout.fillHeight: true
 
             Item {
                 Layout.fillHeight: true
-                Layout.preferredWidth: 48 * ScreenValues.dpMultiplier
+                Layout.preferredWidth: 48 * ScreenValues.dp
 
                 ImageButton {
                     anchors.fill: parent
@@ -151,7 +151,7 @@ Item {
 
             Item {
                 Layout.fillHeight: true
-                Layout.preferredWidth: 48 * ScreenValues.dpMultiplier
+                Layout.preferredWidth: 48 * ScreenValues.dp
 
                 ImageButton {
                     anchors.fill: parent
@@ -166,7 +166,7 @@ Item {
 
     Rectangle {
         color: "#55bdc3c7"
-        height: 1 * ScreenValues.dpMultiplier
+        height: 1 * ScreenValues.dp
         width: parent.width
     }
 }
diff --git a/qml/TutorialPage.qml b/qml/TutorialPage.qml
index d7e6bbd..d58c1bc 100644
--- a/qml/TutorialPage.qml
+++ b/qml/TutorialPage.qml
@@ -116,7 +116,7 @@ Page {
                     width: 0.8 * (isScreenPortrait ? parent.width : parent.height)
 
                     color: "#808080"
-                    font.pixelSize: ScreenValues.dpMultiplier * 24
+                    font.pixelSize: ScreenValues.dp * 24
                     text: "Welcome to Musicgear"
                     wrapMode: Text.Wrap
                     horizontalAlignment: "AlignHCenter"
@@ -133,7 +133,7 @@ Page {
                     id: column
 
                     anchors {
-                        top: welcomeLabel.bottom; topMargin: ScreenValues.dpMultiplier * 16
+                        top: welcomeLabel.bottom; topMargin: ScreenValues.dp * 16
                         horizontalCenter: parent.horizontalCenter
                     }
 
@@ -189,13 +189,13 @@ Page {
                     id: swipeLabel
                     anchors {
                         horizontalCenter: imageIcon.horizontalCenter
-                        top: column.bottom; topMargin: ScreenValues.dpMultiplier * 16
+                        top: column.bottom; topMargin: ScreenValues.dp * 16
                     }
 
                     width: 0.8 * (isScreenPortrait ? parent.width : parent.height)
 
                     color: "#808080"
-                    font.pixelSize: ScreenValues.dpMultiplier * 12
+                    font.pixelSize: ScreenValues.dp * 12
                     text: "Swipe up to begin"
                     wrapMode: Text.Wrap
                     horizontalAlignment: "AlignHCenter"
diff --git a/qml/UpdateDialog.qml b/qml/UpdateDialog.qml
index bff34d4..ec2c78a 100644
--- a/qml/UpdateDialog.qml
+++ b/qml/UpdateDialog.qml
@@ -15,10 +15,10 @@ Dialog {
             }
 
             text: qsTr("Update")
-            height: 40 * ScreenValues.dpMultiplier
-            Layout.preferredHeight: 40 * ScreenValues.dpMultiplier
-            width: Math.min(root.width / 2.5, 220 * ScreenValues.dpMultiplier)
-            Layout.preferredWidth: Math.min(root.width / 2.5, 220 * ScreenValues.dpMultiplier)
+            height: 40 * ScreenValues.dp
+            Layout.preferredHeight: 40 * ScreenValues.dp
+            width: Math.min(root.width / 2.5, 220 * ScreenValues.dp)
+            Layout.preferredWidth: Math.min(root.width / 2.5, 220 * ScreenValues.dp)
             style: FlatButtonStyle { }
             onClicked: updateCheckerElement.openPackageOnGooglePlay()
         },
@@ -28,12 +28,11 @@ Dialog {
             }
 
             text: qsTr("Skip")
-            height: 40 * ScreenValues.dpMultiplier
-            Layout.preferredHeight: 40 * ScreenValues.dpMultiplier
-            width: Math.min(root.width / 2.5, 220 * ScreenValues.dpMultiplier)
-            Layout.preferredWidth: Math.min(root.width / 2.5, 220 * ScreenValues.dpMultiplier)
+            height: 40 * ScreenValues.dp
+            Layout.preferredHeight: 40 * ScreenValues.dp
+            width: Math.min(root.width / 2.5, 220 * ScreenValues.dp)
+            Layout.preferredWidth: Math.min(root.width / 2.5, 220 * ScreenValues.dp)
             style: FlatButtonStyle { backgroundColor: "#cccccc"; fontColor: "#757575" }
-
             onClicked: root.close()
         },
         Button {
@@ -42,10 +41,10 @@ Dialog {
             }
 
             text: qsTr("Skip until next")
-            height: 40 * ScreenValues.dpMultiplier
-            Layout.preferredHeight: 40 * ScreenValues.dpMultiplier
-            width: Math.min(root.width / 2.5, 220 * ScreenValues.dpMultiplier)
-            Layout.preferredWidth: Math.min(root.width / 2.5, 220 * ScreenValues.dpMultiplier)
+            height: 40 * ScreenValues.dp
+            Layout.preferredHeight: 40 * ScreenValues.dp
+            width: Math.min(root.width / 2.5, 220 * ScreenValues.dp)
+            Layout.preferredWidth: Math.min(root.width / 2.5, 220 * ScreenValues.dp)
             style: FlatButtonStyle { backgroundColor: "#cccccc"; fontColor: "#757575" }
 
             onClicked: {
diff --git a/qml/components/Divider.qml b/qml/components/Divider.qml
index 24e191e..8cff659 100644
--- a/qml/components/Divider.qml
+++ b/qml/components/Divider.qml
@@ -5,8 +5,8 @@ import "style.js" as Style
 Rectangle {
     property bool horizontal: true
 
-    width: horizontal ? parent.width : Math.max(1, 1 * ScreenValues.dpMultiplier)
-    height: horizontal ? Math.max(1, 1 * ScreenValues.dpMultiplier) : parent.height
+    width: horizontal ? parent.width : Math.max(1, 1 * ScreenValues.dp)
+    height: horizontal ? Math.max(1, 1 * ScreenValues.dp) : parent.height
 
     color: Style.DIVIDER_DARK
 }