ubuntu-touch-coreapps-reviewers team mailing list archive

[Alan Pope  <alan@xxxxxxxxxx>]

Alan Pope  has proposed merging lp:~popey/ubuntu-filemanager-app/update-colours into lp:ubuntu-filemanager-app with lp:~fboucault/ubuntu-filemanager-app/migrate_toolkit_13 as a prerequisite.

Commit message:
Change colour theme to match other core apps

Requested reviews:
  Ubuntu File Manager Developers (ubuntu-filemanager-dev)

For more details, see:
https://code.launchpad.net/~popey/ubuntu-filemanager-app/update-colours/+merge/283206

Change colour theme to match other core apps
-- 
Your team Ubuntu File Manager Developers is requested to review the proposed merge of lp:~popey/ubuntu-filemanager-app/update-colours into lp:ubuntu-filemanager-app.

=== modified file 'com.ubuntu.filemanager.desktop.in.in'
--- com.ubuntu.filemanager.desktop.in.in	2014-08-13 08:36:53 +0000
+++ com.ubuntu.filemanager.desktop.in.in	2016-01-19 19:26:47 +0000
@@ -7,3 +7,5 @@
 _Name=File Manager
 X-Ubuntu-Touch=true
 X-Ubuntu-Default-Department-ID=accessories
+X-Ubuntu-Splash-Show-Header=true
+X-Ubuntu-Splash-Color=#F5F5F5

=== modified file 'po/com.ubuntu.filemanager.pot'
--- po/com.ubuntu.filemanager.pot	2016-01-19 19:26:47 +0000
+++ po/com.ubuntu.filemanager.pot	2016-01-19 19:26:47 +0000
@@ -1,6 +1,6 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Canonical Ltd.
-# This file is distributed under the same license as the  package.
+# This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-18 11:27+0100\n"
+"POT-Creation-Date: 2016-01-19 19:19+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -31,7 +31,7 @@
 msgid "Device"
 msgstr ""
 
-#: ../src/app/qml/components/PlacesSidebar.qml:53
+#: ../src/app/qml/components/PlacesSidebar.qml:54
 #: ../src/app/qml/ui/FolderListPage.qml:31 ../src/app/qml/ui/PlacesPage.qml:27
 #: ../src/app/qml/ui/PlacesPopover.qml:102
 msgid "Places"
@@ -41,21 +41,21 @@
 msgid "Open with"
 msgstr ""
 
-#: ../src/app/qml/filemanager.qml:81 ../src/app/qml/ui/FolderListPage.qml:107
+#: ../src/app/qml/filemanager.qml:80 ../src/app/qml/ui/FolderListPage.qml:107
 #: ../src/app/qml/ui/SettingsSheet.qml:31
 msgid "Settings"
 msgstr ""
 
-#: ../src/app/qml/filemanager.qml:82
+#: ../src/app/qml/filemanager.qml:81
 msgid "Change app settings"
 msgstr ""
 
-#: ../src/app/qml/filemanager.qml:259 ../src/app/qml/ui/FolderListPage.qml:379
+#: ../src/app/qml/filemanager.qml:258 ../src/app/qml/ui/FolderListPage.qml:379
 #: ../src/app/qml/ui/ViewPopover.qml:70
 msgid "Icons"
 msgstr ""
 
-#: ../src/app/qml/filemanager.qml:259 ../src/app/qml/ui/FolderListPage.qml:395
+#: ../src/app/qml/filemanager.qml:258 ../src/app/qml/ui/FolderListPage.qml:395
 #: ../src/app/qml/ui/ViewPopover.qml:71
 msgid "List"
 msgstr ""
@@ -88,7 +88,8 @@
 #: ../src/app/qml/ui/FileOperationProgressDialog.qml:44
 #: ../src/app/qml/ui/FolderListPage.qml:357
 #: ../src/app/qml/ui/FolderListPage.qml:670
-#: ../src/app/qml/ui/FolderListPage.qml:737 ../src/app/qml/ui/GoToDialog.qml:67
+#: ../src/app/qml/ui/FolderListPage.qml:737
+#: ../src/app/qml/ui/GoToDialog.qml:67
 #: ../src/app/qml/ui/NetAuthenticationDialog.qml:108
 msgid "Cancel"
 msgstr ""

=== modified file 'src/app/qml/components/PathHistoryRow.qml'
--- src/app/qml/components/PathHistoryRow.qml	2016-01-19 19:26:47 +0000
+++ src/app/qml/components/PathHistoryRow.qml	2016-01-19 19:26:47 +0000
@@ -84,7 +84,7 @@
                 text: i18n.tr("Device")
                 fontSize: flickable.textSize
                 anchors.verticalCenter: parent.verticalCenter
-                color: folder === "/" ? "white" : UbuntuColors.warmGrey
+                color: UbuntuColors.darkGrey
                 clip: true
                 /* Maximum Width = Flickable Width */
                 width: if (contentWidth > flickable.width) { flickable.width }
@@ -139,7 +139,7 @@
                     text: pathText(folder,index)
                     fontSize: flickable.textSize
                     anchors.verticalCenter: parent.verticalCenter
-                    color: repeater.model === index + 1 ? "white" : UbuntuColors.warmGrey
+                    color: repeater.model === index + 1 ? UbuntuColors.darkGrey : UbuntuColors.darkGrey
                     clip: true
 
                     /* Maximum Width = Flickable Width */
@@ -153,7 +153,7 @@
                     width: flickable.iconWidth
                     anchors.verticalCenter: parent.verticalCenter
                     anchors.right: label.left
-                    color: "white"
+                    color: UbuntuColors.darkGrey
                     // clip: true
                 }
 
@@ -196,7 +196,7 @@
                                              : pathText(repeater.memoryPath,index)
                     fontSize: flickable.textSize
                     anchors.verticalCenter: parent.verticalCenter
-                    color: UbuntuColors.warmGrey
+                    color: UbuntuColors.darkGrey
                     clip: true
 
                     /* Maximum Width = Flickable Width */
@@ -210,7 +210,7 @@
                     width: flickable.iconWidth
                     anchors.verticalCenter: parent.verticalCenter
                     anchors.right: memoryLabel.left
-                    color: "white"
+                    color: UbuntuColors.darkGrey
                     // clip: true
                 }
 

=== modified file 'src/app/qml/components/PlacesSidebar.qml'
--- src/app/qml/components/PlacesSidebar.qml	2016-01-19 19:26:47 +0000
+++ src/app/qml/components/PlacesSidebar.qml	2016-01-19 19:26:47 +0000
@@ -25,6 +25,7 @@
     id: root
 
     //color: Qt.rgba(0.5,0.5,0.5,0.3)
+    color: "#F5F5F5"
     width: expanded ? (collapsed ? units.gu(8) : units.gu(22)) : 0
 
     property bool collapsed: collapsedSidebar

=== modified file 'src/app/qml/filemanager.qml'
--- src/app/qml/filemanager.qml	2016-01-19 19:26:47 +0000
+++ src/app/qml/filemanager.qml	2016-01-19 19:26:47 +0000
@@ -50,9 +50,9 @@
 
     property bool showSidebar: width >= units.gu(50)
 
-    headerColor: "#464646"
-    backgroundColor: "#464646"
-    footerColor: "#464646"
+    headerColor: "#F5F5F5"
+    backgroundColor: "#F5F5F5"
+    footerColor: "#F5F5F5"
 
     QtObject {
         id: fileSelector

=== modified file 'src/app/qml/upstream/FakeHeader.qml'
--- src/app/qml/upstream/FakeHeader.qml	2016-01-19 19:26:47 +0000
+++ src/app/qml/upstream/FakeHeader.qml	2016-01-19 19:26:47 +0000
@@ -25,9 +25,9 @@
     Rectangle {
         height: units.gu(7)
         width: parent.width
-        color: "#464646"
+        color: "#F5F5F5"
     }
-    
+
     Rectangle {
         color: Qt.rgba(0.2,0.2,0.2,0.97)
         height: units.gu(2)

=== modified file 'src/app/qml/upstream/PageWithBottomEdge.qml'
--- src/app/qml/upstream/PageWithBottomEdge.qml	2016-01-19 19:26:47 +0000
+++ src/app/qml/upstream/PageWithBottomEdge.qml	2016-01-19 19:26:47 +0000
@@ -176,7 +176,7 @@
         z: 1
         width: tipLabel.paintedWidth + units.gu(6)
         height: bottomEdge.tipHeight + units.gu(1)
-        color: "#464646"
+        color: "#F5F5F5"
         Label {
             id: tipLabel
 
@@ -292,7 +292,7 @@
         readonly property int pageStartY: fakeHeader.height
 
         z: 1
-        color: "#606060" // "#797979" // Qt.rgba(0.2,0.2,0.2,0.97)
+        color: "#F5F5F5" // "#606060" // "#797979" // Qt.rgba(0.2,0.2,0.2,0.97)
         // color: Theme.palette.normal.background
         clip: true
         anchors {