Merge lp:~neokore/ubuntu-weather-app/ReturnToMainInfoAfterScroll into lp:ubuntu-weather-app/obsolete.trunk

[Raúl Yeguas]

Returns the last element to primary information screen and skip animation.

Fixes bug 1227150. Forecast should always return to primary information screen.

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

PASSED: Continuous integration, rev:119
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/47/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/410
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-precise-amd64-ci/45
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-quantal-amd64-ci/45
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-raring-amd64-ci/45
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-saucy-amd64-ci/45

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

review: Approve (continuous-integration)

[Martin Borho (martin-borho)]

Looks good, well done!

review: Approve

=== modified file 'components/CurrentWeather.qml'
--- components/CurrentWeather.qml	2013-09-17 18:17:44 +0000
+++ components/CurrentWeather.qml	2013-09-18 17:31:18 +0000
@@ -61,6 +61,7 @@
                                 dailyForecastList.decrementCurrentIndex();
                             }
                             dailyForecastList.positionViewAtIndex(dailyForecastList.currentIndex,ListView.SnapPosition);
+                            flipable.flipped = false;
                         }
                     }
                 }
@@ -269,7 +270,6 @@
             transitions:[
                 Transition {
                     to:"back"
-                    reversible: true
                     SequentialAnimation{
                         ParallelAnimation {
                             NumberAnimation { target: currentCondition; property: "anchors.verticalCenterOffset"; duration: UbuntuAnimation.SlowDuration; to: units.gu(8); easing: UbuntuAnimation.StandardEasing }
@@ -286,20 +286,37 @@
                 Transition {
                     from: "back"
                     to:"front"
-                    SequentialAnimation{
-                        ParallelAnimation {
-                            NumberAnimation {target: frontrect; property: "opacity"; to:1; duration: UbuntuAnimation.SlowDuration}
-                            NumberAnimation {target: backrect; property: "opacity"; to:0; duration: UbuntuAnimation.SlowDuration}
-                        }
-                        ParallelAnimation{
-                            NumberAnimation {target: currentConditionIcon; property: "opacity"; to:1; duration: UbuntuAnimation.SlowDuration}
-                            NumberAnimation {target: currentConditionTempContent; property: "opacity"; to:1; duration: UbuntuAnimation.SlowDuration}
-                            NumberAnimation { target: currentCondition; property: "anchors.verticalCenterOffset"; duration: UbuntuAnimation.SlowDuration; to: 0; easing: UbuntuAnimation.StandardEasingReverse }
-                            NumberAnimation { target: currentConditionTemp; property: "anchors.verticalCenterOffset"; duration: UbuntuAnimation.SlowDuration; to: 0; easing: UbuntuAnimation.StandardEasingReverse }
+                    ScriptAction{
+                        script: {
+                            if(dailyForecastList.currentItem == dailyForecastItem){
+                                 back2frontAnim.start();
+                            }else{
+                                backrect.opacity = 0;
+                                frontrect.opacity = 1;
+                                currentConditionIcon.opacity = 1;
+                                currentConditionTempContent.opacity = 1;
+                                currentCondition.anchors.verticalCenterOffset = 0;
+                                currentConditionTemp.anchors.verticalCenterOffset = 0;
+                            }
                         }
                     }
                 }
             ]
+
+            SequentialAnimation{
+                id: back2frontAnim
+                running: false
+                ParallelAnimation {
+                    NumberAnimation {target: frontrect; property: "opacity"; to:1; duration: UbuntuAnimation.SlowDuration}
+                    NumberAnimation {target: backrect; property: "opacity"; to:0; duration: UbuntuAnimation.SlowDuration}
+                }
+                ParallelAnimation{
+                    NumberAnimation {target: currentConditionIcon; property: "opacity"; to:1; duration: UbuntuAnimation.SlowDuration}
+                    NumberAnimation {target: currentConditionTempContent; property: "opacity"; to:1; duration: UbuntuAnimation.SlowDuration}
+                    NumberAnimation { target: currentCondition; property: "anchors.verticalCenterOffset"; duration: UbuntuAnimation.SlowDuration; to: 0; easing: UbuntuAnimation.StandardEasingReverse }
+                    NumberAnimation { target: currentConditionTemp; property: "anchors.verticalCenterOffset"; duration: UbuntuAnimation.SlowDuration; to: 0; easing: UbuntuAnimation.StandardEasingReverse }
+                }
+            }
         }
     }