Merge pull request #107 from sailfish-spotify/margins-fix

Fix invalid margins
sailfish-spotify · Mar 22, 2019 · 22787ba · 22787ba
2 parents 1d05ef7 + 6a242ff
commit 22787ba
Show file tree

Hide file tree

Showing 21 changed files with 38 additions and 59 deletions.
diff --git a/qml/components/AlbumTrackListItem.qml b/qml/components/AlbumTrackListItem.qml
@@ -18,15 +18,16 @@ Item {
     property var dataModel
     signal toggleFavorite()
 
-    width: parent.width
+    width: parent.width - 2 * Theme.horizontalPageMargin
+    x: Theme.horizontalPageMargin
     height: Math.max(labelss.height, savedImage.height)
     anchors.verticalCenter: parent.verticalCenter
 
     opacity: Util.isTrackPlayable(dataModel.item) ? 1.0 : 0.4
 
     Image {
         id: savedImage
-        anchors.left: parent.left
+        x: Theme.horizontalPageMargin
         anchors.verticalCenter: parent.verticalCenter
         height: Theme.iconSizeSmall
         asynchronous: true
@@ -53,6 +54,7 @@ Item {
         id: labelss
         anchors.left: savedImage.right
         anchors.right: parent.right
+        anchors.rightMargin: Theme.horizontalPageMargin
         anchors.verticalCenter: parent.verticalCenter
         anchors.leftMargin: Theme.paddingMedium
 

diff --git a/qml/components/ArtistPicker.qml b/qml/components/ArtistPicker.qml
@@ -40,9 +40,7 @@ Dialog {
 
         delegate: ListItem {
             id: delegateItem
-
-            width: parent.width - 2*Theme.paddingMedium
-            x: Theme.paddingMedium
+            width: parent.width
             contentHeight: Theme.itemSizeLarge
 
             onClicked: {

diff --git a/qml/components/ConfirmDialog.qml b/qml/components/ConfirmDialog.qml
@@ -24,8 +24,8 @@ Dialog {
 
             Label {
                 id: msgTextArea
-                x: Theme.paddingMedium
-                width: parent.width - 2*Theme.paddingMedium
+                x: Theme.horizontalPageMargin
+                width: parent.width - 2*Theme.horizontalPageMargin
                 textFormat: Text.RichText
                 truncationMode: TruncationMode.Fade
                 text: confirmMessageText

diff --git a/qml/components/NavigationMenuDialog.qml b/qml/components/NavigationMenuDialog.qml
@@ -86,14 +86,11 @@ Dialog {
          }
 
          delegate: ListItem {
-             width: parent.width - 2*Theme.paddingLarge
-             x: Theme.paddingLarge
-
              Image {
                  id: image
                  width: Theme.iconSizeMedium
                  height: width
-                 anchors.left: parent.left
+                 x: Theme.horizontalPageMargin
                  anchors.verticalCenter: parent.verticalCenter
                  fillMode: Image.PreserveAspectFit
                  source: model.icon

diff --git a/qml/components/PlaylistPicker.qml b/qml/components/PlaylistPicker.qml
@@ -36,8 +36,7 @@ Dialog {
         delegate: ListItem {
             id: delegateItem
 
-            width: parent.width - 2*Theme.paddingMedium
-            x: Theme.paddingMedium
+            width: parent.width
             contentHeight: Theme.itemSizeLarge
 
             onClicked: {
@@ -55,8 +54,7 @@ Dialog {
         section.delegate : Component {
             id: sectionHeading
             Item {
-                width: parent.width - 2*Theme.paddingMedium
-                x: Theme.paddingMedium
+                width: parent.width
                 height: childrenRect.height
 
                 Text {

diff --git a/qml/components/SearchResultListItem.qml b/qml/components/SearchResultListItem.qml
@@ -13,7 +13,6 @@ import "../Util.js" as Util
 
 Row {
     id: row
-
     property var dataModel
 
     // not used, same as in AlbumTrackListItem so Loader can be used
@@ -23,7 +22,8 @@ Row {
 
     signal toggleFavorite()    
 
-    width: parent.width
+    width: parent.width - 2 * Theme.horizontalPageMargin
+    x: Theme.horizontalPageMargin
     spacing: Theme.paddingMedium
 
     opacity: (dataModel.type !== Util.SpotifyItemType.Track
@@ -33,17 +33,15 @@ Row {
         id: image
         width: height
         height: column.height
-        anchors {
-            verticalCenter: parent.verticalCenter
-        }
+        anchors.verticalCenter: parent.verticalCenter
         asynchronous: true
         fillMode: Image.PreserveAspectFit
         source: getImageURL(dataModel)
     }
 
     Column {
         id: column
-        width: parent.width - image.width - 2 * Theme.paddingMedium
+        width: parent.width - image.width - parent.spacing
 
         Label {
             id: nameLabel

diff --git a/qml/components/SectionDelegate.qml b/qml/components/SectionDelegate.qml
@@ -3,8 +3,8 @@ import Sailfish.Silica 1.0
 
 Component {
     Item {
-        width: parent.width - 2*Theme.paddingMedium
-        x: Theme.paddingMedium
+        width: parent.width - 2 * Theme.horizontalPageMargin
+        x: Theme.horizontalPageMargin
         height: childrenRect.height
         Text {
             width: parent.width

diff --git a/qml/pages/Album.qml b/qml/pages/Album.qml
@@ -112,8 +112,7 @@ Page {
 
         delegate: ListItem {
             id: listItem
-            width: parent.width - 2*Theme.paddingMedium
-            x: Theme.paddingMedium
+            width: parent.width
             contentHeight: Theme.itemSizeExtraSmall
 
             AlbumTrackListItem {

diff --git a/qml/pages/Artist.qml b/qml/pages/Artist.qml
@@ -122,8 +122,7 @@ Page {
 
         delegate: ListItem {
             id: listItem
-            width: parent.width - 2*Theme.paddingMedium
-            x: Theme.paddingMedium
+            width: parent.width
             contentHeight: Theme.itemSizeLarge
 
             SearchResultListItem {

diff --git a/qml/pages/Devices.qml b/qml/pages/Devices.qml
@@ -80,13 +80,13 @@ Page {
 
         delegate: ListItem {
             id: delegate
-            width: parent.width - 2*Theme.paddingMedium
-            x: Theme.paddingMedium
+            width: parent.width
             opacity: sp == 1 ? 1.0 : 0.4
 
             Column {
                 id: column
-                width: parent.width
+                x: Theme.horizontalPageMargin
+                width: parent.width - 2 * Theme.horizontalPageMargin
                 Label {
                     id: nameLabel
                     //color: is_active ? Theme.highlightColor : Theme.primaryColor

diff --git a/qml/pages/GenreMood.qml b/qml/pages/GenreMood.qml
@@ -53,15 +53,14 @@ Page {
 
         delegate: ListItem {
             id: listItem
-            width: parent.width - 2*Theme.paddingMedium
-            x: Theme.paddingMedium
+            width: parent.width
             contentHeight: Theme.itemSizeLarge
 
             Image {
                 id: categoryIcon
                 width: Theme.iconSizeLarge
                 height: width
-                anchors.left: parent.left
+                x: Theme.horizontalPageMargin
                 anchors.verticalCenter: parent.verticalCenter
                 asynchronous: true
                 fillMode: Image.PreserveAspectFit
@@ -72,6 +71,7 @@ Page {
                 id: categoryName
                 anchors.left: categoryIcon.right
                 anchors.right: parent.right
+                anchors.rightMargin: Theme.horizontalPageMargin
                 anchors.leftMargin: Theme.paddingMedium
                 anchors.verticalCenter: parent.verticalCenter
                 color: Theme.primaryColor

diff --git a/qml/pages/GenreMoodPlaylist.qml b/qml/pages/GenreMoodPlaylist.qml
@@ -56,15 +56,14 @@ Page {
 
         delegate: ListItem {
             id: listItem
-            width: parent.width - 2*Theme.paddingMedium
-            x: Theme.paddingMedium
+            width: parent.width
             contentHeight: Theme.itemSizeLarge
 
             Image {
+                x: Theme.horizontalPageMargin
                 id: categoryIcon
                 width: Theme.iconSizeLarge
                 height: width
-                anchors.left: parent.left
                 anchors.verticalCenter: parent.verticalCenter
                 asynchronous: true
                 fillMode: Image.PreserveAspectFit

diff --git a/qml/pages/History.qml b/qml/pages/History.qml
@@ -61,8 +61,7 @@ Page {
 
         delegate: ListItem {
             id: listItem
-            width: parent.width - 2*Theme.paddingMedium
-            x: Theme.paddingMedium
+            width: parent.width
             //height: searchResultListItem.height
             contentHeight: Theme.itemSizeLarge
 

diff --git a/qml/pages/MyStuff.qml b/qml/pages/MyStuff.qml
@@ -77,8 +77,7 @@ Page {
 
         delegate: ListItem {
             id: listItem
-            width: parent.width - 2*Theme.paddingMedium
-            x: Theme.paddingMedium
+            width: parent.width
             contentHeight: Theme.itemSizeLarge
 
             SearchResultListItem {

diff --git a/qml/pages/NavigationMenu.qml b/qml/pages/NavigationMenu.qml
@@ -87,14 +87,13 @@ Page {
          }
 
          delegate: ListItem {
-             width: parent.width - 2*Theme.paddingLarge
-             x: Theme.paddingLarge
+             width: parent.width
 
              Image {
                  id: image
                  width: Theme.iconSizeMedium
                  height: width
-                 anchors.left: parent.left
+                 x: Theme.horizontalPageMargin
                  anchors.verticalCenter: parent.verticalCenter
                  fillMode: Image.PreserveAspectFit
                  source: model.icon
@@ -104,6 +103,7 @@ Page {
                  anchors.left: image.right
                  anchors.leftMargin: Theme.paddingLarge
                  anchors.right: parent.right
+                 anchors.rightMargin: Theme.horizontalPageMargin
                  anchors.verticalCenter: parent.verticalCenter
                  color: _currentIndex === index ? Theme.highlightColor : Theme.primaryColor
                  text: model.name

diff --git a/qml/pages/NewAndFeatured.qml b/qml/pages/NewAndFeatured.qml
@@ -72,9 +72,7 @@ Page {
 
         delegate: ListItem {
             id: listItem
-            width: parent.width - 2*Theme.paddingMedium
-            x: Theme.paddingMedium
-            //height: searchResultListItem.height
+            width: parent.width
             contentHeight: Theme.itemSizeLarge
 
             SearchResultListItem {

diff --git a/qml/pages/Playing.qml b/qml/pages/Playing.qml
@@ -249,8 +249,7 @@ Page {
 
             delegate: ListItem {
                 id: listItem
-                width: parent.width - 2*Theme.paddingMedium
-                x: Theme.paddingMedium
+                width: parent.width
                 contentHeight: contextType == 0
                                ? Theme.itemSizeExtraSmall
                                : Theme.itemSizeLarge

diff --git a/qml/pages/Playlist.qml b/qml/pages/Playlist.qml
@@ -110,8 +110,7 @@ Page {
 
         delegate: ListItem {
             id: listItem
-            width: parent.width - 2*Theme.paddingMedium
-            x: Theme.paddingMedium
+            width: parent.width
             contentHeight: Theme.itemSizeLarge
 
             SearchResultListItem {

diff --git a/qml/pages/Recommended.qml b/qml/pages/Recommended.qml
@@ -180,8 +180,7 @@ Page {
                 }
                 delegate: ListItem {
                     id: seedListItem
-                    width: parent.width //- 2*Theme.paddingMedium
-                    //x: Theme.paddingMedium
+                    width: parent.width
                     contentHeight: Theme.itemSizeLarge
                     SearchResultListItem {
                         id: seedResultListItem
@@ -305,8 +304,7 @@ Page {
 
         delegate: ListItem {
             id: listItem
-            width: parent.width - 2*Theme.paddingMedium
-            x: Theme.paddingMedium
+            width: parent.width
             contentHeight: Theme.itemSizeLarge
 
             SearchResultListItem {

diff --git a/qml/pages/Search.qml b/qml/pages/Search.qml
@@ -151,9 +151,7 @@ Page {
 
         delegate: ListItem {
             id: listItem
-            width: parent.width - 2*Theme.paddingMedium
-            x: Theme.paddingMedium
-            //height: searchResultListItem.height
+            width: parent.width
             contentHeight: Theme.itemSizeLarge
 
             SearchResultListItem {

diff --git a/qml/pages/TopStuff.qml b/qml/pages/TopStuff.qml
@@ -66,8 +66,7 @@ Page {
 
         delegate: ListItem {
             id: listItem
-            width: parent.width - 2*Theme.paddingMedium
-            x: Theme.paddingMedium
+            width: parent.width
             contentHeight: Theme.itemSizeLarge
 
             SearchResultListItem {