Merge lp:~martin-borho/ubuntu-weather-app/new_header_with_fixed_icons into lp:ubuntu-weather-app/obsolete.trunk

[Martin Borho]

New tab header.

New tab header.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:298
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/230/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-weather-app/46
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-weather-app/46/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-utopic-amd64-ci/37

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/230/rebuild

review: Needs Fixing (continuous-integration)

[Nekhelesh Ramananthan (nik90)]

13 tools: ToolbarItems {
14 id: pageTools
15 ToolbarButton {

Now that you are transitioning to the new headers why not remove tools, ToolbarItems and transition to the new header API? One drawback is that you will drop support for trusty since the new headers require Ubuntu Components 1.1 that are only available in utopic.

review: Needs Information

[lp:~martin-borho/ubuntu-weather-app/new_header_with_fixed_icons]

299. By Martin Borho on 2014-08-16

transitioned Actions to new header api

[Martin Borho (martin-borho)]

Thanks for the tip, I wasn't really aware of it...

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:299
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/232/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-weather-app/50
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-weather-app/50/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-utopic-amd64-ci/39

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/232/rebuild

review: Approve (continuous-integration)

[David Planella (dpm)]

Looks good to me, thanks!

Martin, unrelated to this, but to your question a few days ago about sheets: what I'd recommend for Settings would be to use a Page, in the same way the clock reboot app does it.

review: Approve

[Martin Borho (martin-borho)]

Yes, I've already started replacing Sheets with Pages, but I would wait for a preview of the new design, before heading in that direction.

[Martin Borho (martin-borho)]

@david: had a second thought: https://code.launchpad.net/~martin-borho/ubuntu-weather-app/pagestack/+merge/231093 :)

[David Planella (dpm)]

Nice! :-)

On Sat, Aug 16, 2014 at 8:23 PM, Martin Borho <email address hidden>
wrote:

> @david: had a second thought:
> https://code.launchpad.net/~martin-borho/ubuntu-weather-app/pagestack/+merge/231093
> :)
> --
>
> https://code.launchpad.net/~martin-borho/ubuntu-weather-app/new_header_with_fixed_icons/+merge/230707
> You are reviewing the proposed merge of
> lp:~martin-borho/ubuntu-weather-app/new_header_with_fixed_icons into
> lp:ubuntu-weather-app.
>

=== modified file 'components/LocationTab.qml'
--- components/LocationTab.qml	2014-04-16 13:21:04 +0000
+++ components/LocationTab.qml	2014-08-16 10:01:36 +0000
@@ -18,7 +18,7 @@
  */
 import QtQuick 2.0
 import Ubuntu.Components.Popups 0.1
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
 import Ubuntu.Layouts 0.1
 import QtFeedback 5.0
@@ -63,6 +63,7 @@
             if(visible == true) {
                 var data = dayForecastModel.get(0)
                 adjustBackground(Math.round(data.temp))
+                dailyForecastList.currentItem.appearAnimation.start()
             }
         }
     }
@@ -127,6 +128,40 @@
         anchors.fill: parent
         anchors.topMargin: units.gu(9.5)
 
+        head.actions: [
+            Action {
+                id: refreshAction
+                objectName: "RefreshButton"
+                iconName: "reload"
+                text: i18n.tr("Refresh")
+
+                onTriggered: {
+                    mainView.tabIndexAtRefresh = tabs.selectedTabIndex
+                    mainView.refreshData(false, true);
+                }
+            },
+            Action {
+                objectName: "EditButton"
+                id: editLocationAction
+                iconName: "add"
+                text: i18n.tr("Edit")
+
+                onTriggered: {
+                    mainView.showLocationManager()
+                }
+            },
+            Action {
+                objectName: "SettingsButton"
+                id: configAction
+                iconName: "settings"
+                text: i18n.tr("Settings")
+
+                onTriggered: {
+                    mainView.showSettings();
+                }
+            }
+        ]
+
         ListModel {
             id: dayForecastModel
         }
@@ -332,47 +367,5 @@
                 }
             }
         }
-
-        tools: ToolbarItems {
-            id: pageTools
-            ToolbarButton {
-                objectName: "RefreshButton"
-                action:Action {
-                    id: refreshAction
-                    objectName: "RefreshAction"
-                    iconName: "reload"
-                    text: i18n.tr("Refresh")
-
-                    onTriggered: {
-                        mainView.tabIndexAtRefresh = tabs.selectedTabIndex
-                        mainView.refreshData(false, true);
-                    }
-                }
-            }
-            ToolbarButton {
-                objectName: "EditButton"
-                action:Action {
-                    id: editLocationAction
-                    iconName: "add"
-                    text: i18n.tr("Edit")
-
-                    onTriggered: {
-                        mainView.showLocationManager()
-                    }
-                }
-            }
-            ToolbarButton {
-                objectName: "SettingsButton"
-                action:Action {
-                    id: configAction
-                    iconName: "settings"
-                    text: i18n.tr("Settings")
-
-                    onTriggered: {
-                        mainView.showSettings();
-                    }
-                }
-            }
-        }
     }
 }

=== modified file 'tests/autopilot/ubuntu_weather_app/tests/test_locationmanager.py'
--- tests/autopilot/ubuntu_weather_app/tests/test_locationmanager.py	2014-06-26 09:29:19 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/test_locationmanager.py	2014-08-16 10:01:36 +0000
@@ -56,7 +56,7 @@
         if kb:
             self.keyboard.press_and_release('Ctrl+n')
         else:
-            self.main_view.open_toolbar().click_button("EditButton")
+            self.main_view.get_header().click_action_button("EditButton")
 
         # test location manager becomes visible
         managerSheet = self.main_view.select_single(

=== modified file 'tests/autopilot/ubuntu_weather_app/tests/test_mainview.py'
--- tests/autopilot/ubuntu_weather_app/tests/test_mainview.py	2014-06-26 09:29:19 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/test_mainview.py	2014-08-16 10:01:36 +0000
@@ -107,7 +107,7 @@
         if kb:
             self.keyboard.press_and_release('Ctrl+r')
         else:
-            self.main_view.open_toolbar().click_button("RefreshButton")
+            self.main_view.get_header().click_action_button("RefreshButton")
         self.main_view.wait_for_activity_to_finish()
 
         # get the data from the refreshed tabs, have to be new

=== modified file 'tests/autopilot/ubuntu_weather_app/tests/test_settings.py'
--- tests/autopilot/ubuntu_weather_app/tests/test_settings.py	2014-06-26 09:29:19 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/test_settings.py	2014-08-16 10:01:36 +0000
@@ -30,7 +30,7 @@
 
     def _open_settings_sheet(self):
         """Opens the settings sheet"""
-        self.main_view.open_toolbar().click_button("SettingsButton")
+        self.main_view.get_header().click_action_button("SettingsButton")
 
     def _move_pointer_around(self):
         """

=== modified file 'ubuntu-weather-app.qml'
--- ubuntu-weather-app.qml	2014-05-16 10:36:11 +0000
+++ ubuntu-weather-app.qml	2014-08-16 10:01:36 +0000
@@ -35,6 +35,8 @@
     width: units.gu(50)
     height: units.gu(67)
 
+    useDeprecatedToolbar: false
+
     headerColor: "#E04414"
     backgroundColor: "#E04414"
     footerColor: "#E1983E"
@@ -225,7 +227,8 @@
         //storage.clearSetting('units');
 
         //Theme.palette.selected.backgroundText = "#000000";
-        Theme.palette.normal.backgroundText = "#55FFFFFF";
+        Theme.palette.normal.backgroundText = "#55FFFF";
+        Theme.palette.normal.background = "#ECECEC"
 
         storage.getSettings(function(storedSettings) {            
             for(var settingName in storedSettings) {