Changeset 287

Timestamp:

07/25/06 16:36:34 (18 years ago)

Author:

Nicholas Riley

Message:

First pass at alarm snooze/reschedule; still pretty ugly.

Location:

trunk/hiptop/pester

Files:

• locale/en_US/Pester.rsrc (modified) (3 diffs)
• net/sabi/pester/Alarm.java (modified) (1 diff)
• net/sabi/pester/Pester.java (modified) (2 diffs)

trunk/hiptop/pester/locale/en_US/Pester.rsrc

@@ -209 +209 @@
 endDialog
 
-alert ID_ALARM_ALERT
+textInputAlert ID_ALARM_ALERT
         systemDialog
         title = "Alarm"
@@ -216 +216 @@
         text = "Alarm!"
         button
+                id = ID_SNOOZE_BUTTON
                 event = EVENT_SNOOZE_ALARM
                 title = "Snooze"
-                position = buttonTop1
+                position = buttonBottom2
                 shortcut = cancelButton
         button
                 event = EVENT_SET_ALARM
                 title = "Reschedule..."
-                position = buttonBottom2
+                position = buttonBottom3
         button
                 event = EVENT_DISMISS_ALARM
@@ -229 +230 @@
                 position = buttonBottom1
                 shortcut = doneButton
-endAlert
+        textField
+                id = ID_SNOOZE_MINUTES
+                title = "Snooze for minutes:"
+                dontAcceptKeyRepeats
+                initiallySelectAll
+                numericOnly
+                justifyRight
+                maxLength = 2
+                position = top
+endTextInputAlert
 
 alert ID_DISCARD_ALERT

trunk/hiptop/pester/net/sabi/pester/Alarm.java

@@ -79 +79 @@
     public void setUID(int uid) {
         mUID = uid;
+    }
+    public void snoozeForMinutes(int minutes) {
+        mDate = new Date();
+        mDate.addMinutes(minutes);
+        resume();
     }
 

trunk/hiptop/pester/net/sabi/pester/Pester.java

@@ -3 +3 @@
 import danger.app.Application;
 import danger.app.Event;
-import danger.ui.AlertWindow;
+import danger.app.IPCMessage;
+import danger.ui.Layout;
+import danger.ui.TextField;
+import danger.ui.TextInputAlertWindow;
 import danger.ui.ScreenWindow;
+import danger.ui.StaticText;
 import danger.util.DEBUG;
 import java.util.Stack;
@@ -22 +26 @@
         case Event.EVENT_ALARM:
             Alarm alarm = (Alarm)e.argument;
-            AlertWindow alert = getAlert(ID_ALARM_ALERT, this);
+            TextInputAlertWindow alert = getTextInputAlert(ID_ALARM_ALERT, this);
             alert.setTitle(alarm.getDateTimeString());
             alert.setMessage(alarm.getMessage());
             alert.setShowTone(alarm.getAlert());
-            alert.show(AlertWindow.SYSTEM_ALERT_TYPE_ALARM);
+            alert.disableButtonOnEmptyField(ID_SNOOZE_BUTTON, ID_SNOOZE_MINUTES);
+            alert.setShowCancel(false);
+            alert.show(TextInputAlertWindow.SYSTEM_ALERT_TYPE_ALARM);
             sAlarmStack.push(alarm);
+            return true;
+        case EVENT_SET_ALARM:
+            AlarmSetDialog alarmSetDialog = AlarmSetDialog.getDialog();
+            alarmSetDialog.setWindowStyle(AlarmSetDialog.SYSTEM_DIALOG_STYLE);
+            alarmSetDialog.editAlarm((Alarm)sAlarmStack.pop(),false);
+            return true;
+        case EVENT_SNOOZE_ALARM:
+            String snoozeMinutesString =
+                TextInputAlertWindow.
+                getTextFieldValue((IPCMessage)e.argument,
+                                  ID_SNOOZE_MINUTES);
+            int snoozeMinutes = Integer.parseInt(snoozeMinutesString);
+            ((Alarm)sAlarmStack.pop()).snoozeForMinutes(snoozeMinutes);
             return true;
         case EVENT_DISMISS_ALARM: