Merge lp:~nik90/ubuntu-clock-app/minor-fixes-new-design into lp:ubuntu-clock-app

[Nekhelesh Ramananthan]

- Reduced bindings in ActionIcon.qml
- Removed unnecessary QtQuick.Layout import
- Fixed stopwatch swipe delete UI issue introduced in new design implementation

- Reduced bindings in ActionIcon.qml
- Removed unnecessary QtQuick.Layout import
- Fixed stopwatch swipe delete UI issue introduced in new design implementation

Steps to reproduce the stopwatch swipe delete issue in trunk,
1. Start stopwatch and create 2-3 laps.
2. Swipe right to show the delete icon. Don't delete the lap though.
3. Instead swipe left to hide the delete icon.

Notice in step 3 that the delete icon doesn't fully go back to hiding.

[Nekhelesh Ramananthan (nik90)]

Check list,

* Does the MP add/remove user visible strings? If Yes, has the pot file been
    updated?

Not applicable

* Does the MP change the UI? If Yes, has it been approved by design?

No UI Changes

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

Yes

* If the MP fixes a bug or implements a feature, are there accompanying unit
    and autopilot tests?

None

* Is the clock app trunk buildable and runnable using Qtcreator?

Yes

* Was the debian changelog updated?

Yes

* Was the copyright years updated if necessary?

Not applicable.

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Continuous integration, rev:449
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/1072/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/628/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/1072/rebuild

review: Needs Fixing (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Looks good to me!

review: Approve

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'app/MainPage.qml'
--- app/MainPage.qml	2016-02-25 22:46:35 +0000
+++ app/MainPage.qml	2016-02-26 10:04:29 +0000
@@ -48,8 +48,6 @@
     // Clock App Alarm Model Reference Variable
     property var alarmModel
 
-    flickable: null
-
     Timer {
         id: hideBottomEdgeHintTimer
         interval: 3000

=== modified file 'app/components/ActionIcon.qml'
--- app/components/ActionIcon.qml	2016-02-25 22:16:54 +0000
+++ app/components/ActionIcon.qml	2016-02-26 10:04:29 +0000
@@ -22,10 +22,7 @@
 AbstractButton {
     id: abstractButton
 
-    property alias iconName: _icon.name
-    property alias iconSource: _icon.source
-    property alias iconWidth: _icon.width
-    property alias iconColor: _icon.color
+    property alias icon: _icon
 
     width: units.gu(4)
     height: width

=== modified file 'app/components/HeaderNavigation.qml'
--- app/components/HeaderNavigation.qml	2016-02-25 22:16:54 +0000
+++ app/components/HeaderNavigation.qml	2016-02-26 10:04:29 +0000
@@ -31,14 +31,14 @@
         spacing: units.gu(2)
 
         ActionIcon {
-            iconName: "clock"
-            iconColor: listview.currentIndex == 0 ? "#19b6ee" : "#5d5d5d"
+            icon.name: "clock"
+            icon.color: listview.currentIndex === 0 ? "#19b6ee" : "#5d5d5d"
             onClicked: listview.currentIndex = 0
         }
         
         ActionIcon {
-            iconName: "stopwatch"
-            iconColor: listview.currentIndex == 1 ? "#19b6ee" : "#5d5d5d"
+            icon.name: "stopwatch"
+            icon.color: listview.currentIndex === 1 ? "#19b6ee" : "#5d5d5d"
             onClicked: listview.currentIndex = 1
         }
     }
@@ -54,7 +54,7 @@
             rightMargin: units.gu(1)
         }
 
-        iconName: "settings"
+        icon.name: "settings"
         
         onClicked: {
             mainStack.push(Qt.resolvedUrl("../alarm/AlarmSettingsPage.qml"))

=== modified file 'app/stopwatch/LapListView.qml'
--- app/stopwatch/LapListView.qml	2016-02-25 22:16:54 +0000
+++ app/stopwatch/LapListView.qml	2016-02-26 10:04:29 +0000
@@ -17,14 +17,14 @@
  */
 
 import QtQuick 2.4
-import QtQuick.Layouts 1.1
 import Ubuntu.Components 1.3
 import Stopwatch 1.0
 
-ListView {
+UbuntuListView {
     id: lapListView
 
     clip: true
+    currentIndex: -1
 
     StopwatchFormatTime {
         id: stopwatchFormatTime
@@ -77,7 +77,11 @@
 
     delegate: ListItem {
         divider.visible: true
-        width: parent.width - units.gu(4)
+        divider.anchors.leftMargin: units.gu(2)
+        divider.anchors.right: parent.right
+        divider.anchors.rightMargin: units.gu(2)
+
+        width: parent.width
         anchors.horizontalCenter: parent.horizontalCenter
 
         leadingActions: ListItemActions {
@@ -96,7 +100,8 @@
                 left: parent.left
                 right: parent.right
                 verticalCenter: parent.verticalCenter
-                leftMargin: units.gu(1)
+                leftMargin: units.gu(3)
+                rightMargin: units.gu(2)
             }
 
             Label {

=== modified file 'app/ubuntu-clock-app.qml'
--- app/ubuntu-clock-app.qml	2016-02-25 22:16:54 +0000
+++ app/ubuntu-clock-app.qml	2016-02-26 10:04:29 +0000
@@ -116,15 +116,6 @@
                 asynchronous: false
             }
 
-            /*
-              Create a new Date() object and pass the date, month, year, hour, minute
-              and second received from the DateTime plugin manually to ensure the
-              timezone info is set correctly.
-
-              Javascript Month is 0-11 while QDateTime month is 1-12. Hence the -1
-              is required.
-            */
-
             alarmModel: alarmModelLoader.item
             /*
                FIXME: When the upstream QT bug at

=== modified file 'debian/changelog'
--- debian/changelog	2016-02-25 23:11:44 +0000
+++ debian/changelog	2016-02-26 10:04:29 +0000
@@ -24,6 +24,7 @@
   [ Nekhelesh Ramananthan ]
   * Fix 'Shutter' effect animation on title bar when opening bottom edge (LP: #1543496)
   * Migrate to the new SDK Bottom edge (LP: #1549988)
+  * Reduce binding in ActionIcon.qml and fixed stopwatch slide delete UI issue.
 
  -- Bartosz Kosiorek <[e-mail]>  Wed, 30 Dec 2015 01:43:24 +0100