Changeset 278 for trunk

Timestamp:

07/23/06 08:33:15 (18 years ago)

Author:

Nicholas Riley

Message:

Display message on empty list (no longer need to add/remove border). Don't let alarms go off while you're deciding whether to discard them. First, untested attempt at handling hard resets (waiting on advice from Danger). Very ugly rewrite of alarm alert; needs much fixing.

Location:

trunk/hiptop/pester

Files:

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

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

@@ -49 +49 @@
                 title = "Discard"
                 shortcut = deleteKey
-                event = EVENT_CONFIRM_DISCARD_ALARM
+                event = EVENT_DISCARD_ALARM
 endMenu
 screen ID_ALARM_LIST_SCREEN
@@ -197 +197 @@
                 event = EVENT_DISCARD_ALARM
                 position = buttonTop2
-                title = "Discard"
+                title = discardButton
 
         button
@@ -214 +214 @@
         text = "Alarm!"
         button
+                event = EVENT_SNOOZE_ALARM
+                title = "Snooze"
+                position = buttonTop1
+                shortcut = cancelButton
+        button
+                event = EVENT_SET_ALARM
+                title = "Edit..."
+                position = buttonBottom2
+        button
                 event = EVENT_DISMISS_ALARM
                 title = okButton
@@ -226 +235 @@
         text = "Permanently discard this alarm?"
         button
-                event = EVENT_DISCARD_ALARM
+                event = EVENT_CONFIRM_DISCARD
                 title = discardButton
                 position = buttonBottom2
         button
+                event = EVENT_CANCEL_DISCARD
                 title = backButton
                 position = buttonBottom1

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

@@ -5 +5 @@
 import danger.ui.AlertWindow;
 import danger.ui.ActiveListView;
+import danger.ui.Font;
+import danger.ui.Pen;
 import danger.ui.Rect;
+import danger.ui.Style;
 import danger.ui.ToolTipWindow;
 import danger.util.ActiveList;
@@ -25 +28 @@
         setAutoResize(true);
         setList(Alarms.getList());
-        if (alarmsSet() == 0)
-            setHasBorder(false); // this doesn't work in the rsrc file
         Application.registerForEvent(this, Event.EVENT_TIME_CHANGED);
         super.onDecoded();
@@ -53 +54 @@
             alarmSetDialog().editAlarm(new Alarm(), true);
             return true;
-        case EVENT_CONFIRM_DISCARD_ALARM:
+        case EVENT_DISCARD_ALARM:
+            mToolTipAlarm.deactivate();
+            Alarm alarm = (Alarm)getFocusedItem();
+            alarm.beginEditing();
             AlertWindow alert =
                 Application.getCurrentApp().getAlert(ID_DISCARD_ALERT, this);
-            // XXX localize
             alert.setMessage("Permanently discard \u201c" +
-                             ((Alarm)getFocusedItem()).getMessage() + 
-                             "\u201d?");
+                             alarm.getMessage() + "\u201d?"); // XXX localize
             alert.show();
             return true;
-        case EVENT_DISCARD_ALARM:
+        case EVENT_CONFIRM_DISCARD:
             Alarms.removeAlarm((Alarm)getFocusedItem());
             return true;
-        case Event.EVENT_TIME_CHANGED: // XXX EVENT_TIME_FORMAT_CHANGED too
+        case EVENT_CANCEL_DISCARD:
+            ((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_CHANGED:
             if (mToolTipWindow == null || !mToolTipWindow.isVisible())
                 return true;
@@ -110 +117 @@
     }
 
+    protected void paintEmptyList(Pen p, int width, int height) {
+        Style style = getStyle();
+        Font font = style.getFont(Style.DISABLED_LABEL_FONT);
+        int y = (height / 4) - (font.getAscent() / 2);
+        if (y < 0) {
+            setHeight(sAlarmListWindow.getHeight());
+            return;
+        }
+        // XXX localize
+        String emptyMessage =
+            "Press " + Font.GLYPH_MENU + " to set an alarm.";
+        int x = (width / 2) - (font.getWidth(emptyMessage) / 2);
+        p.setFont(font);
+        p.setColor(style.getColor(Style.DISABLED_LABEL_COLOR));
+        p.drawText(x, y, emptyMessage);
+    }
+
     public int alarmsSet() {
         return getListSize();
@@ -119 +143 @@
         // which is admirable in general, but not what we want
         setFocus(index);
-        setHasBorder(true);
     }
     public void onItemRemoved(ActiveList list, Object item, int index) {
@@ -125 +148 @@
         sAlarmListWindow.updateAlarmCount();
         super.onItemRemoved(list, item, index);
-        if (alarmsSet() == 0)
-            setHasBorder(false);
     }
 }

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

@@ -23 +23 @@
     private Alarms() {
         mDataStore = DataStore.createDataStore("alarms", true /* auto sync */);
+        // register us for Event.EVENT_DATASTORE_RESTORED, which only
+        // seems to be documented at:
+        // <http://developer.danger.com/forum/index.php?t=msg&th=27>
+        mDataStore.setAutoSyncNotifyee(sListener);
+        refreshFromDataStore(false);
+    }
+
+    void refreshFromDataStore(boolean datastoreRestored) {
+        sAlarmList = null;
+        removeAllItems();
+        if (datastoreRestored)
+            mDataStore.doneResolvingConflict(); // resolves UID conflicts
         byte[][] alarmsData = mDataStore.getRecords();
         int i;
@@ -32 +44 @@
             alarm.resume();
         }
+        sAlarmList = this;
     }
 
@@ -39 +52 @@
             sSettingsDB = new SettingsDB("settings", true /* auto sync */);
             sListener = new Listener();
-            sAlarmList = new Alarms();
+            new Alarms();
         }
         return sAlarmList;
@@ -51 +64 @@
     }
 
-    // XXX handle EVENT_DATASTORE_RESTORED: note that in the event of
-    // a hard reset, items may come back out of order, so we need to
-    // implement an in-place sort, then insert the current alarm list.
-    // Aiee.  Also, what on earth happens when UIDs aren't synchronized?
-    
     protected void onItemAdded(Object item, int index) {
         if (sAlarmList == null) // restoring from service
@@ -62 +70 @@
         DEBUG.p("adding: " + alarm +
                 " next UID: " + mDataStore.getAutoSyncNextUID());
-        index = mDataStore.addRecord(alarm.toByteArray(), index);
+        index = mDataStore.addRecord(alarm.toByteArray());
         alarm.setUID(mDataStore.getRecordUID(index));
         DEBUG.p("added UID " + alarm.getUID() + " @ " + index);
@@ -68 +76 @@
 
     protected void onItemRemoved(Object item, int index) {
+        if (sAlarmList == null) // restoring from service (after hard reset)
+            return;
         Alarm alarm = (Alarm)item;
-        // XXX make sure +/- UIDs are OK
         int uid = alarm.getUID();
         if (uid == 0)
             return;
-        DEBUG.p("removing; " + alarm + " UID " + uid);
         mDataStore.removeRecordByUID(uid);
     }
@@ -81 +89 @@
             return;
         Alarm alarm = (Alarm)item;
-        // XXX check that updating a + UID by a - one is OK
         mDataStore.setRecordDataByUID(alarm.getUID(), alarm.toByteArray(), true);
         DEBUG.p("updated: " + alarm + " UID " + alarm.getUID());
@@ -114 +121 @@
                 Alarms.getList().forEach(this);
                 return true;
+            } else if (e.type == Event.EVENT_DATASTORE_RESTORED) {
+                String dbName = (String)e.argument;
+                DEBUG.p("DATASTORE_RESTORED: " + dbName);
+                if (!dbName.endsWith("alarms")) {
+                    // because we only get/set the default alarm on demand
+                    // there's no need to handle conflicts with the settings...
+                    // XXX but what happens if we set a (default) alarm, then
+                    // the SettingsDB restores?
+                    Alarms.getList().refreshFromDataStore(true);
+                }
             }
             return super.receiveEvent(e);

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

@@ -23 +23 @@
             Alarm alarm = (Alarm)e.argument;
             AlertWindow alert = getAlert(ID_ALARM_ALERT, this);
-            alert.setTitle(alert.getTitle() + ": " + alarm.getDateTimeString());
+            alert.setTitle(alarm.getDateTimeString());
             alert.setMessage(alarm.getMessage());
             alert.setShowTone(alarm.getAlert());