Changeset 253 for trunk

Timestamp:

07/18/06 06:02:30 (18 years ago)

Author:

Nicholas Riley

Message:

Add timer in alarm set dialog to update alarm time display. Send events on number picker accept (work around probable bug). Fixed cancel not cancelling if you're using a fixed-time alarm.

Location:

trunk/hiptop/pester

Files:

• locale/en_US/Pester.rsrc (modified) (1 diff)
• net/sabi/pester/Alarm.java (modified) (3 diffs)
• net/sabi/pester/AlarmSetDialog.java (modified) (7 diffs)
• net/sabi/pester/EventfulNumberEditor.java (added)

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

@@ -130 +130 @@
                         alignBaseline = ID_IN_BUTTON
                         positionToRight = ID_IN_BUTTON : 1
+                        className = "net.sabi.pester.EventfulNumberEditor"
         
                 popupMenu

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

@@ -78 +78 @@
             dataStream.writeInt(mDate.getUnixTimeGMT());
             dataStream.writeInt(mType);
+            dataStream.writeInt(mAlert == null ? 0 : mAlert.getID());
             dataStream.flush();
             return byteStream.toByteArray();
         } catch (Exception e) {
             // XXX do something
+            DEBUG.p("failed to write alarm:" + e);
         }
         return null;
@@ -97 +99 @@
             mMessage = dataStream.readUTF();
             mPeriod = dataStream.readInt();
+            mDate = new Date(dataStream.readInt());
             mType = dataStream.readInt();
+            int alertID = dataStream.readInt();
+            mAlert = (alertID == 0 ? null : new RingToneObject(alertID));
         } catch (Exception e) {
             // XXX do something
+            DEBUG.p("failed to read alarm:" + e);
         }
     }
@@ -116 +122 @@
     }
 
+    // XXX trigger on EVENT_TIME_CHANGED
     void resume() {
         mState = STATE_SCHEDULED;

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

@@ -42 +42 @@
     private Alarm mEditingAlarm;
     private boolean mAlarmIsNew;
-    private boolean haveShownWindow = false;
+    private boolean mHaveShownWindow = false;
+
+    private danger.app.Alarm mValidateAlarm;
 
     public static AlarmSetDialog getDialog() {
@@ -82 +84 @@
         mStatusBox.setAutoResize(false);
 
+        mValidateAlarm = new danger.app.Alarm(1, this);
+
         super.onDecoded();
     }
@@ -100 +104 @@
         }
 
-        Date date = alarm.getDate();
+        Date date = new Date(alarm.getDate());
         mTimeEditor.setDate(date);
         mDateEditor.setDate(date);
@@ -124 +128 @@
         validate();
         show();
-        if (!haveShownWindow) {
+        if (!mHaveShownWindow) {
             Rect alarmRect = mSetAlarmButton.getFrame();
             Rect contentRect = getContentRect();
@@ -131 +135 @@
             mStatusBox.show();
             addChild(mStatusBox);
-            haveShownWindow = true;
+            mHaveShownWindow = true;
             setAutoSize(false); // don't resize to contain it next time
         }
@@ -170 +174 @@
         mDateEditor.min(now);
         mDatePicker.min(now);
-        if (!isIn() && editingDate().compareTo(now) <= 0) {
-            mStatusBox.setText("Specify a future date.");
-            return false;
-        }
-        mStatusBox.setText(Alarm.dateTimeString(editingDate(), true));
-        // XXX invalidate @ alarm date if isIn()
-        // XXX invalidate in 1 sec if isAt()
+        Date editingDate = editingDate();
+        if (isIn()) {
+            mValidateAlarm.resetWake(60 - now.getSeconds());
+        } else {
+            int secondsUntilDate =
+                editingDate.getDangerTimeGMT() - now.getDangerTimeGMT();
+            if (secondsUntilDate <= 0) {
+                mStatusBox.setText("Specify a future date.");
+                return false;
+            }
+            mValidateAlarm.resetWake(secondsUntilDate);
+        }
+        mStatusBox.setText(Alarm.dateTimeString(editingDate, true));
         return true;
     }
 
+    // XXX make a timer-only version of this which doesn't try to extract
+    // XXX the editing date (it can cause odd behavior by forcing the 
+    // XXX NumberEditor to spit out a value)
     protected void validate() {
-        mSetAlarmButton.setEnabled(isValid());
+        boolean isValid = isValid();
+        mSetAlarmButton.setEnabled(isValid);
+        if (!isValid)
+            mValidateAlarm.deactivate();
+    }
+
+    protected void stopEditing() {
+        mEditingAlarm = null;
+        mValidateAlarm.deactivate();
     }
 
@@ -200 +221 @@
             mEditingAlarm.schedule();
             if (mAlarmIsNew) Alarms.addAlarm(mEditingAlarm);
-            mEditingAlarm = null;
+            stopEditing();
             return true;
         case EVENT_CANCEL_ALARM:
             if (!mAlarmIsNew) mEditingAlarm.resume();
-            mEditingAlarm = null;
+            stopEditing();
             return true;
         case EVENT_DISCARD_ALARM:
-            // XXX confirmation
-            Alarms.removeAlarm(mEditingAlarm);
-            mEditingAlarm = null;
-            return true;
+            // XXX prompt for confirmation
+            stopEditing();
+            return true;
+        case Event.EVENT_TIME_CHANGED:
+            // XXX this isn't being delivered on the simulator, why?
+            DEBUG.p("time changed");
+            validate();
+            return true;
+        case Event.EVENT_ALARM:
         case EVENT_VALIDATE: // something changed
             validate();