← Back to team overview

ubuntu-touch-coreapps-reviewers team mailing list archive

[Merge] lp:~etherpulse/ubuntu-clock-app/alarm_on_off into lp:ubuntu-clock-app

 

Eran Uzan has proposed merging lp:~etherpulse/ubuntu-clock-app/alarm_on_off into lp:ubuntu-clock-app.

Requested reviews:
  Ubuntu Clock Developers (ubuntu-clock-dev)
Related bugs:
  Bug #1518892 in Ubuntu Clock App: "[clock] Switching alarm on/off"
  https://bugs.launchpad.net/ubuntu-clock-app/+bug/1518892

For more details, see:
https://code.launchpad.net/~etherpulse/ubuntu-clock-app/alarm_on_off/+merge/313286

Moved the edit action of the alarm to a trailing action and changed the onClicked behaviour of the alarm item to toggle the alarm state (enabled/disabled).
-- 
Your team Ubuntu Clock Developers is requested to review the proposed merge of lp:~etherpulse/ubuntu-clock-app/alarm_on_off into lp:ubuntu-clock-app.
=== modified file 'app/alarm/AlarmList.qml'
--- app/alarm/AlarmList.qml	2016-03-03 00:28:40 +0000
+++ app/alarm/AlarmList.qml	2016-12-14 23:09:45 +0000
@@ -69,11 +69,25 @@
             ]
         }
 
+        trailingActions: ListItemActions {
+            actions: [
+                Action {
+                    id: editAction
+                    objectName: "editAction"
+                    iconName: "edit"
+                    text: i18n.tr("Edit Alarm")
+                    onTriggered: {
+                         mainStack.push(Qt.resolvedUrl("EditAlarmPage.qml"), {isNewAlarm: false, tempAlarm: model, alarmModel: alarmModel})
+                    }
+                }
+            ]
+        }
+
         onClicked: {
             if (selectMode) {
                 selected = !selected
             } else {
-                mainStack.push(Qt.resolvedUrl("EditAlarmPage.qml"), {isNewAlarm: false, tempAlarm: model, alarmModel: alarmModel})
+                model.enabled = !model.enabled;
             }
         }
 


Follow ups