← Back to team overview

ubuntu-touch-coreapps-reviewers team mailing list archive

[Merge] lp:~vthompson/music-app/lighter-now-playing-toolbar into lp:music-app

 

Victor Thompson has proposed merging lp:~vthompson/music-app/lighter-now-playing-toolbar into lp:music-app.

Commit message:
 * Lighten the Full View and Queue toolbars to match current design
 * Lighten the app header

Requested reviews:
  Music App Developers (music-app-dev)

For more details, see:
https://code.launchpad.net/~vthompson/music-app/lighter-now-playing-toolbar/+merge/279654

 * Lighten the Full View and Queue toolbars to match current design
 * Lighten the app header
-- 
Your team Music App Developers is requested to review the proposed merge of lp:~vthompson/music-app/lighter-now-playing-toolbar into lp:music-app.
=== modified file 'app/components/NowPlayingFullView.qml'
--- app/components/NowPlayingFullView.qml	2015-10-18 17:45:48 +0000
+++ app/components/NowPlayingFullView.qml	2015-12-04 20:33:31 +0000
@@ -142,7 +142,7 @@
             right: parent.right
             top: blurredBackground.bottom
         }
-        color: styleMusic.common.black
+        color: styleMusic.toolbar.fullBackgroundColor
     }
 
     /* Progress bar component */

=== modified file 'app/components/NowPlayingToolbar.qml'
--- app/components/NowPlayingToolbar.qml	2015-08-12 23:36:44 +0000
+++ app/components/NowPlayingToolbar.qml	2015-12-04 20:33:31 +0000
@@ -28,7 +28,7 @@
     anchors {
         fill: parent
     }
-    color: styleMusic.common.black
+    color: styleMusic.toolbar.fullBackgroundColor
 
     /* Repeat button */
     MouseArea {
@@ -154,7 +154,7 @@
             left: parent.left
             right: parent.right
         }
-        color: styleMusic.common.black
+        color: styleMusic.toolbar.fullBackgroundColor
         height: units.gu(0.25)
         visible: isListView
 

=== modified file 'app/components/Style.qml'
--- app/components/Style.qml	2015-08-12 23:36:44 +0000
+++ app/components/Style.qml	2015-12-04 20:33:31 +0000
@@ -64,7 +64,7 @@
     property QtObject mainView: QtObject{
         property color backgroundColor: "#1e1e23"
         property color footerColor: backgroundColor
-        property color headerColor: backgroundColor
+        property color headerColor: "#292929"
     }
 
     property QtObject nowPlaying: QtObject {
@@ -95,9 +95,7 @@
     }
 
     property QtObject toolbar: QtObject {
-        property color fullBackgroundColor: "#0f0f0f";
-        property color fullInnerPlayCircleColor: "#0d0d0d";
-        property color fullOuterPlayCircleColor: "#363636";
+        property color fullBackgroundColor: "#292929";
         property color fullProgressBackgroundColor: "#252525";
         property color fullProgressTroughColor: UbuntuColors.orange;
     }

=== modified file 'app/music-app.qml'
--- app/music-app.qml	2015-12-03 14:14:14 +0000
+++ app/music-app.qml	2015-12-04 20:33:31 +0000
@@ -38,6 +38,7 @@
     id: mainView
 
     backgroundColor: styleMusic.mainView.backgroundColor
+    headerColor: styleMusic.mainView.headerColor
     theme.name: "Ubuntu.Components.Themes.SuruDark"
 
     // Startup settings

=== modified file 'debian/changelog'
--- debian/changelog	2015-12-03 14:14:14 +0000
+++ debian/changelog	2015-12-04 20:33:31 +0000
@@ -1,7 +1,12 @@
 music-app (2.3) UNRELEASED; urgency=medium
 
+  [ Andrew Hayzen ]
   * Release 2.2ubuntu2 and start on 2.3
 
+  [ Victor Thompson ]
+  * Lighten the Full View and Queue toolbars to match current design
+  * Lighten the app header
+
  -- Andrew Hayzen <ahayzen@xxxxxxxxx>  Thu, 03 Dec 2015 14:11:35 +0000
 
 music-app (2.2ubuntu2) vivid; urgency=medium


Follow ups