Merge lp:~martin-borho/ubuntu-weather-app/hourly-fix-and-haptics into lp:ubuntu-weather-app/obsolete.trunk

[Martin Borho]

Optimized and added haptic effect to hourly scrolling

Optimized and added haptic effect to hourly scrolling

[Raúl Yeguas (neokore)]

Feels good for me! Well done!

review: Approve

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

review: Approve (continuous-integration)

=== modified file 'components/CurrentWeather.qml'
--- components/CurrentWeather.qml	2014-01-27 14:56:23 +0000
+++ components/CurrentWeather.qml	2014-02-06 18:45:53 +0000
@@ -61,6 +61,7 @@
                 property int startY: 0
                 property double startTime: 0
                 property int sectionHeight: parent.height/hourly.count
+                property int lastIndex: -1
                 // without tab header!
                 height: parent.height-units.gu(9.5)
                 width:parent.width
@@ -99,8 +100,9 @@
                         // slow scrolling detected
                         var movement = Math.round(distance/sectionHeight);
                         if(movement > 0) {
-                            var hourIndex = movement-1;
-                            if(currentWeather.hourly.get(hourIndex) !== undefined) {
+                            var hourIndex = movement-1,
+                                currentHour = currentWeather.hourly.get(hourIndex);
+                            if( currentHour !== undefined && (lastIndex < 0 || lastIndex !== hourIndex)) {
                                 wasHourlyScrolled = true;
                                 currentConditionIcon.condition = currentWeather.hourly.get(hourIndex).icon;
                                 var temp = currentWeather.hourly.get(hourIndex)[mainView.settings["units"]].temp;
@@ -111,7 +113,9 @@
                                 // TRANSLATORS: this is a date to which a time of the day will be appended
                                 var dateTimeString = Qt.formatDateTime(dateTime, i18n.tr('dddd, dd MMMM')) + ' - ' + Qt.formatTime(dateTime);
                                 dateComponent.dateString = dateTimeString;
-                                dateComponent.renderText();
+                                dateComponent.renderText();                                
+                                hourlyScrollEffect.start();
+                                lastIndex = hourIndex;
                             }
                         }
                     }
@@ -126,6 +130,7 @@
                         adjustBackground(Math.round(currentDayData.temp));
                         dateComponent.dateString = currentDayData.date;
                         dateComponent.renderText();
+                        lastIndex = -1;
                     }
                 }
             }
 
=== modified file 'components/LocationTab.qml'
--- components/LocationTab.qml	2014-01-24 19:32:20 +0000
+++ components/LocationTab.qml	2014-02-06 18:45:53 +0000
@@ -19,6 +19,7 @@
 import QtQuick 2.0
 import Ubuntu.Components.Popups 0.1
 import Ubuntu.Components 0.1
+import QtFeedback 5.0
 
 Tab {
     id: locationTab
@@ -86,6 +87,14 @@
         }
     }
 
+    HapticsEffect {
+        id: hourlyScrollEffect
+        attackTime: 1
+        intensity: 0.2
+        duration: 5
+        fadeTime: 1
+    }
+
     // Menu for options
     page: Page {
         id: locationPage