Merge lp:~aacid/unity8/scopeListPageHeaderScopeStyle into lp:unity8

[Albert Astals Cid]

Bind scopeStyle for the scope list header

This does nothing since the backend is not exposing any scopeStyle for the overview scope but in the case they do it'll be ready

 * Are there any related MPs required for this MP to build/function as expected?
Prerequisite

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

 * Did you make sure that your branch does not contain spurious tags?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
N/A

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1484
http://jenkins.qa.ubuntu.com/job/unity8-ci/5019/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/520/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/184/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/184
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/452/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/518
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/518/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16503

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5019/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1484
http://jenkins.qa.ubuntu.com/job/unity8-ci/5026/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/191
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/191

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5026/rebuild

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

Think it would make sense setting this from a mock and testing if some of the style elements are properly applied?

review: Needs Information

[Michał Sawicz (saviq)]

This results in a white-on-grey in the Manage header. Please just hardcode the colour as the header would be the only place that would actually follow the scope's setting, and I feel like this is a custom enough component that we should just control the whole of its UI.

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1487
http://jenkins.qa.ubuntu.com/job/unity8-ci/5041/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/556/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/205
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/206
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/206
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/477/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/554
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/554/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16558

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5041/rebuild

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?

yes

 * Did CI run pass? If not, please explain why.

not running yet. but modified tests are passing here

 * Did you make sure that the branch does not contain spurious tags?

yes

review: Approve

[Michał Sawicz (saviq)]

See my previous comment please.

Unmerged revisions

1506. By Albert Astals Cid on 2014-12-15

Use the default scope style for the header

=== modified file 'qml/Dash/ScopesList.qml'
--- qml/Dash/ScopesList.qml	2014-12-02 12:04:11 +0000
+++ qml/Dash/ScopesList.qml	2014-12-12 13:05:01 +0000
@@ -34,6 +34,10 @@
 
     state: "browse"
 
+    property var scopeStyle: ScopeStyle {
+        style: scope ? scope.customizations : {}
+    }
+
     onStateChanged: {
         if (state == "edit") {
             // As per design entering edit mode clears the possible existing search
@@ -66,6 +70,7 @@
         backIsClose: root.state == "edit"
         storeEntryEnabled: root.state == "browse"
         searchEntryEnabled: false // Disable search for now
+        scopeStyle: root.scopeStyle
         onBackClicked: {
             if (backIsClose) {
                 root.state = "browse"
@@ -111,7 +116,7 @@
 
                         editMode: root.state == "edit"
 
-                        scopeStyle: root.scope.scopeStyle
+                        scopeStyle: root.scopeStyle
                         isFavoritesFeed: categoryId == "favorites"
                         isAlsoInstalled: categoryId == "other"
 

=== modified file 'qml/Dash/ScopesListCategory.qml'
--- qml/Dash/ScopesListCategory.qml	2014-12-12 13:05:01 +0000
+++ qml/Dash/ScopesListCategory.qml	2014-12-12 13:05:01 +0000
@@ -40,6 +40,7 @@
 
     ListItems.Header {
         id: header
+        objectName: "scopesListCategoryHeader"
         width: root.width
         height: units.gu(5)
         color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText

=== modified file 'tests/mocks/Unity/fake_scopesoverview.cpp'
--- tests/mocks/Unity/fake_scopesoverview.cpp	2014-10-06 08:52:00 +0000
+++ tests/mocks/Unity/fake_scopesoverview.cpp	2014-12-12 13:05:01 +0000
@@ -22,6 +22,7 @@
 
 ScopesOverview::ScopesOverview(Scopes* parent)
  : Scope("scopesOverview", "Scopes Overview", false, parent)
+ , m_headerBlue(false)
 {
     delete m_categories; // delete the usual categories, we're not going to use it
     m_scopesOverviewCategories = new ScopesOverviewCategories(parent, this);
@@ -52,6 +53,23 @@
     }
 }
 
+void ScopesOverview::setHeaderBlue(bool blue)
+{
+    if (m_headerBlue != blue) {
+        m_headerBlue = blue;
+        Q_EMIT customizationsChanged();
+    }
+}
+
+QVariantMap ScopesOverview::customizations() const
+{
+    QVariantMap res;
+    if (m_headerBlue) {
+        res["foreground-color"] = "blue";
+    }
+    return res;
+}
+
 void ScopesOverview::setFavorite(Scope *scope, bool favorite)
 {
     m_scopesOverviewCategories->setFavorite(scope, favorite);

=== modified file 'tests/mocks/Unity/fake_scopesoverview.h'
--- tests/mocks/Unity/fake_scopesoverview.h	2014-09-26 11:21:19 +0000
+++ tests/mocks/Unity/fake_scopesoverview.h	2014-12-12 13:05:01 +0000
@@ -34,6 +34,9 @@
     void setSearchQuery(const QString& search_query) override;
     Q_INVOKABLE void activate(QVariant const& result) override;
 
+    Q_INVOKABLE void setHeaderBlue(bool blue);
+    QVariantMap customizations() const;
+
     // This is implementation detail
     void setFavorite(Scope *scope, bool favorite);
     void moveFavoriteTo(Scope *scope, int index);
@@ -41,6 +44,7 @@
 private:
     ScopesOverviewCategories *m_scopesOverviewCategories;
     unity::shell::scopes::CategoriesInterface *m_searchCategories;
+    bool m_headerBlue;
 };
 
 class ScopesOverviewCategories : public unity::shell::scopes::CategoriesInterface

=== modified file 'tests/qmltests/Dash/tst_Dash.qml'
--- tests/qmltests/Dash/tst_Dash.qml	2014-12-12 13:05:01 +0000
+++ tests/qmltests/Dash/tst_Dash.qml	2014-12-12 13:05:01 +0000
@@ -411,5 +411,21 @@
             tryCompare(dashContentList, "currentIndex", 2);
             compare(dashContentList.currentItem.scopeId, "MockScope5");
         }
+
+        function test_manage_dash_customizations() {
+            var scopesList = findChild(dash, "scopesList");
+            var scopesListPageHeader = findChild(scopesList, "innerPageHeader");
+
+            var favScopesListCategory = findChild(dash, "scopesListCategoryfavorites");
+            var scopesListCategoryHeader = findChild(favScopesListCategory, "scopesListCategoryHeader");
+
+            compare(scopesListPageHeader.config.foregroundColor, "#5d5d5d");
+            compare(scopesListCategoryHeader.color, "#5d5d5d");
+
+            scopesList.scope.setHeaderBlue(true);
+
+            compare(scopesListPageHeader.config.foregroundColor, "#0000ff");
+            compare(scopesListCategoryHeader.color, "#0000ff");
+        }
     }
 }