Changeset 295 for trunk/hiptop

Timestamp:

07/28/06 08:33:38 (18 years ago)

Author:

Nicholas Riley

Message:

Move discard alert text to resource. Fix listener for
EVENT_TIME_CHANGED I broke a few days ago. Only use
Alarm.mAbsoluteFireTime to measure real time if the alarm was
scheduled/rescheduled (through user action, not restoration from a
datastore) since boot. Don't display dates in the past as if they're
in the following week.

Location:

trunk/hiptop/pester

Files:

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

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

@@ -276 +276 @@
         title = "Discard Alarm?"
         icon = stopIcon
-        text = "Permanently discard this alarm?"
+        text = "Permanently discard \u201c^0\u201d?"
         button
                 event = EVENT_CONFIRM_DISCARD

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

@@ -31 +31 @@
     // transient
     private int mState;
-    private int mAbsoluteFireTime; // only valid if periodic
+    private int mAbsoluteFireTime; // valid if periodic and modified since reboot
     private danger.app.Alarm mAlarm;
     private int mUID;
@@ -39 +39 @@
         mAlarm = new danger.app.Alarm(0, Application.getCurrentApp(), this);
         mUID = 0;
+        mAbsoluteFireTime = -1;
     }
 
@@ -83 +84 @@
         mDate = new Date();
         mDate.addMinutes(minutes);
+        mAbsoluteFireTime = Hardware.getAbsoluteTime() + (minutes * 60);
         resume();
     }
@@ -121 +123 @@
             int alertID = dataStream.readInt();
             mAlert = (alertID == 0 ? null : new RingToneObject(alertID));
+            mAbsoluteFireTime = -1; // just in case
         } catch (Exception e) {
             // XXX do something
@@ -152 +155 @@
         if (mState != STATE_SCHEDULED)
             return;
-        if (getUsesPeriod()) {
+        if (getUsesPeriod() && mAbsoluteFireTime != -1) {
             int realSecondsLeft = mAbsoluteFireTime - Hardware.getAbsoluteTime();
             mDate = new Date();
@@ -230 +233 @@
             else if (daysFromToday == 1)
                 dateString = "Tomorrow"; // XXX localize
-            else if (daysFromToday < 7)
+            else if (daysFromToday > 1 && daysFromToday < 7)
                 dateString = date.getDayString();
             else

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

@@ -69 +69 @@
             AlertWindow alert =
                 Application.getCurrentApp().getAlert(ID_DISCARD_ALERT, this);
-            alert.setMessage("Permanently discard \u201c" +
-                             alarm.getMessage() + "\u201d?"); // XXX localize
+            alert.setMessage(StringFormat.withFormat(alert.getMessage(),
+                                                     alarm.getMessage()));
             alert.show();
             return true;
@@ -79 +79 @@
             ((Alarm)getFocusedItem()).resume();
             return true;
-        // XXX for EVENT_TIME_FORMAT_CHANGED, we also need to force a
-        // full redraw (in addition to invalidating the tooltip)
+        case Event.EVENT_TIME_FORMAT_CHANGED:
+            invalidate();
         case Event.EVENT_TIME_CHANGED:
             if (mToolTipWindow == null || !mToolTipWindow.isVisible())

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

@@ -54 +54 @@
     public static Alarms getList() {
         if (sAlarmList == null) {
-            Application.registerForEvent(sListener, Event.EVENT_TIME_CHANGED);
             sSettingsDB = new SettingsDB("settings", true /* auto sync */);
             sListener = new Listener();
             new Alarms();
+            Application.registerForEvent(sListener, Event.EVENT_TIME_CHANGED);
         }
         return sAlarmList;