← Back to team overview

ubuntu-touch-coreapps-reviewers team mailing list archive

[Merge] lp:~gang65/ubuntu-clock-app/ubuntu-clock-fixed-bottomedge-status into lp:ubuntu-clock-app

 

Bartosz Kosiorek has proposed merging lp:~gang65/ubuntu-clock-app/ubuntu-clock-fixed-bottomedge-status into lp:ubuntu-clock-app.

Commit message:
Fixed bottom edge title showing incorrect status on app startup (LP: #1381432)

Requested reviews:
  Ubuntu Clock Developers (ubuntu-clock-dev)

For more details, see:
https://code.launchpad.net/~gang65/ubuntu-clock-app/ubuntu-clock-fixed-bottomedge-status/+merge/264781

Fixed bottom edge title showing incorrect status on app startup (LP: #1381432)
-- 
Your team Ubuntu Clock Developers is requested to review the proposed merge of lp:~gang65/ubuntu-clock-app/ubuntu-clock-fixed-bottomedge-status into lp:ubuntu-clock-app.
=== modified file 'app/alarm/AlarmModelComponent.qml'
--- app/alarm/AlarmModelComponent.qml	2014-10-10 19:58:31 +0000
+++ app/alarm/AlarmModelComponent.qml	2015-07-15 00:07:53 +0000
@@ -21,5 +21,9 @@
 
 AlarmModel {
     id: alarmModel
+
+    property bool isReady: false
+
     Component.onCompleted: console.log("[LOG]: Alarm Database loaded")
+    onModelReset: isReady = true
 }

=== modified file 'app/ubuntu-clock-app.qml'
--- app/ubuntu-clock-app.qml	2015-01-22 00:11:57 +0000
+++ app/ubuntu-clock-app.qml	2015-07-15 00:07:53 +0000
@@ -133,7 +133,7 @@
             */
 
             alarmModel: alarmModelLoader.item
-            bottomEdgeEnabled: alarmModelLoader.status === Loader.Ready
+            bottomEdgeEnabled: alarmModelLoader.status === Loader.Ready && alarmModelLoader.item.isReady
             clockTime: new Date
                        (
                            localTimeSource.localDateString.split(":")[0],

=== modified file 'debian/changelog'
--- debian/changelog	2015-07-10 19:42:45 +0000
+++ debian/changelog	2015-07-15 00:07:53 +0000
@@ -1,5 +1,8 @@
 ubuntu-clock-app (3.4ubuntu2) UNRELEASED; urgency=medium
 
+  [Nekhelesh Ramananthan]
+  * Fixed bottom edge title showing incorrect status on app startup (LP: #1381432)
+
   [ Nicholas Skaggs ]
   * Update testing layout.
 


Follow ups