Changeset 576

Timestamp:

12/29/09 17:56:17 (2 years ago)

Author:

octorian

Message:

UI updates with unloaded icons

Location:

trunk

Files:

• LogicMail/res/icons/mail_deleted_unloaded.png (added)
• LogicMail/res/icons/mail_draft_unloaded.png (added)
• LogicMail/res/icons/mail_flagged_unloaded.png (added)
• LogicMail/res/icons/mail_forwarded_unloaded.png (added)
• LogicMail/res/icons/mail_junk_unloaded.png (added)
• LogicMail/res/icons/mail_opened_unloaded.png (added)
• LogicMail/res/icons/mail_replied_unloaded.png (added)
• LogicMail/res/icons/mail_unknown_unloaded.png (added)
• LogicMail/res/icons/mail_unopened_unloaded.png (added)
• LogicMail/src/org/logicprobe/LogicMail/ui/BorderedFieldManager.java (modified) (2 diffs)
• LogicMail/src/org/logicprobe/LogicMail/ui/CompositionScreen.java (modified) (2 diffs)
• LogicMail/src/org/logicprobe/LogicMail/ui/FieldFactory.java (modified) (2 diffs)
• LogicMail/src/org/logicprobe/LogicMail/ui/FieldFactoryBB42.java (modified) (1 diff)
• LogicMail/src/org/logicprobe/LogicMail/ui/MailboxMessageField.java (modified) (1 diff)
• LogicMail/src/org/logicprobe/LogicMail/ui/MessageScreen.java (modified) (1 diff)
• LogicMail/src/org/logicprobe/LogicMail/ui/NodeIcons.java (modified) (3 diffs)
• LogicMail_BB46/src/org/logicprobe/LogicMail/ui (added)
• LogicMail_BB46/src/org/logicprobe/LogicMail/ui/FieldFactoryBB46.java (added)
• LogicMail_BB47T/src/org/logicprobe/LogicMail/ui/FieldFactoryBB47T.java (modified) (1 diff)

trunk/LogicMail/src/org/logicprobe/LogicMail/ui/BorderedFieldManager.java

@@ -95 +95 @@
         int backgroundColor = graphics.getBackgroundColor();
 
+        paintBorder(graphics, width, height, backgroundColor);
+
+        paintSeparator(graphics, width, height);
+        
+        // Resume normal painting of the contents
+        graphics.setColor(foregroundColor);
+        super.paint(graphics);
+    }
+
+    protected void paintBorder(Graphics graphics, int width, int height, int backgroundColor) {
         // Paint the fill for the field
         graphics.setColor(Color.LIGHTGREY);
@@ -106 +116 @@
         graphics.setColor(Color.DARKGRAY);
         graphics.drawRoundRect(borderWidth, borderWidth, width - (borderWidth * 2), height - (bottomBorderNone ? borderWidth : (borderWidth * 2)), 10, 10);
-
+    }
+    
+    protected void paintSeparator(Graphics graphics, int width, int height) {
         if(bottomBorderLine) {
-                graphics.drawLine(0, height - 1, width - 1, height - 1);
+            graphics.drawLine(0, height - 1, width - 1, height - 1);
         }
-        
-        // Resume normal painting of the contents
-        graphics.setColor(foregroundColor);
-        super.paint(graphics);
     }
     

trunk/LogicMail/src/org/logicprobe/LogicMail/ui/CompositionScreen.java

@@ -244 +244 @@
     
     public void initFields(Screen screen) {
-        recipientsFieldManager = new BorderedFieldManager(
+        FieldFactory fieldFactory = FieldFactory.getInstance();
+        recipientsFieldManager = fieldFactory.getBorderedFieldManager(
                         Manager.NO_HORIZONTAL_SCROLL
                         | Manager.NO_VERTICAL_SCROLL
@@ -253 +254 @@
                 EmailAddressBookEditField.ADDRESS_CC, ""));
 
-        subjectFieldManager = new BorderedFieldManager(
+        subjectFieldManager = fieldFactory.getBorderedFieldManager(
                         Manager.NO_HORIZONTAL_SCROLL
                         | Manager.NO_VERTICAL_SCROLL

trunk/LogicMail/src/org/logicprobe/LogicMail/ui/FieldFactory.java

@@ -47 +47 @@
         "org.logicprobe.LogicMail.ui.FieldFactoryBB50",
         "org.logicprobe.LogicMail.ui.FieldFactoryBB47",
+        "org.logicprobe.LogicMail.ui.FieldFactoryBB46",
         "org.logicprobe.LogicMail.ui.FieldFactoryBB42"
     };
@@ -72 +73 @@
 
     public abstract TreeField getScreenTreeField(TreeFieldCallback callback, long style);
+    
+    public abstract BorderedFieldManager getBorderedFieldManager();
+    
+    public abstract BorderedFieldManager getBorderedFieldManager(long style);
 }

trunk/LogicMail/src/org/logicprobe/LogicMail/ui/FieldFactoryBB42.java

@@ -45 +45 @@
                 return treeField;
         }
+
+    public BorderedFieldManager getBorderedFieldManager() {
+        return new BorderedFieldManager();
+    }
+
+    public BorderedFieldManager getBorderedFieldManager(long style) {
+        return new BorderedFieldManager(style);
+    }
 }

trunk/LogicMail/src/org/logicprobe/LogicMail/ui/MailboxMessageField.java

@@ -155 +155 @@
         // Draw the message icon
         Bitmap messageIcon = NodeIcons.getIcon(messageNode);
-        int messageIconY = (lineHeight / 2) - (messageIcon.getHeight() / 2);
-        int messageIconW = messageIcon.getWidth();
-        int messageIconH = messageIcon.getHeight();
-        graphics.drawBitmap(1, messageIconY, messageIconW, messageIconH, messageIcon, 0, 0);
-        
-        if(!messageNode.hasCachedContent() && !messageNode.hasMessageContent()) {
-            graphics.setColor(graphics.getBackgroundColor());
-            graphics.drawFilledPath(
-                    new int[] { 1, 11, 1 },
-                    new int[] { 1, 1, messageIconY + messageIconH },
-                    null,
-                    null);
-            graphics.setColor(originalColor);
-        }
+        graphics.drawBitmap(
+                1,
+                (lineHeight / 2) - (messageIcon.getHeight() / 2),
+                messageIcon.getWidth(),
+                messageIcon.getHeight(),
+                messageIcon, 0, 0);
         
         if(attachmentIcon != null) {

trunk/LogicMail/src/org/logicprobe/LogicMail/ui/MessageScreen.java

@@ -123 +123 @@
     public void initFields(Screen screen) {
         // Create screen elements
-        addressFieldManager = new BorderedFieldManager(
+        FieldFactory fieldFactory = FieldFactory.getInstance();
+        addressFieldManager = fieldFactory.getBorderedFieldManager(
                         Manager.NO_HORIZONTAL_SCROLL
                         | Manager.NO_VERTICAL_SCROLL
                         | BorderedFieldManager.BOTTOM_BORDER_NONE);
-        subjectFieldManager = new BorderedFieldManager(
+        subjectFieldManager = fieldFactory.getBorderedFieldManager(
                         Manager.NO_HORIZONTAL_SCROLL
                         | Manager.NO_VERTICAL_SCROLL

trunk/LogicMail/src/org/logicprobe/LogicMail/ui/NodeIcons.java

@@ -68 +68 @@
     private Bitmap unknownMessageIcon;
     private Bitmap junkMessageIcon;
+    private Bitmap openedUnloadedMessageIcon;
+    private Bitmap unopenedUnloadedMessageIcon;
+    private Bitmap repliedUnloadedMessageIcon;
+    private Bitmap flaggedUnloadedMessageIcon;
+    private Bitmap draftUnloadedMessageIcon;
+    private Bitmap deletedUnloadedMessageIcon;
+    private Bitmap unknownUnloadedMessageIcon;
+    private Bitmap junkUnloadedMessageIcon;
         
     public final static int ICON_FOLDER = 0;
@@ -97 +105 @@
                 unknownMessageIcon  = Bitmap.getBitmapResource("mail_unknown.png");
                 junkMessageIcon     = Bitmap.getBitmapResource("mail_junk.png");
+        openedUnloadedMessageIcon   = Bitmap.getBitmapResource("mail_opened_unloaded.png");
+        unopenedUnloadedMessageIcon = Bitmap.getBitmapResource("mail_unopened_unloaded.png");
+        repliedUnloadedMessageIcon  = Bitmap.getBitmapResource("mail_replied_unloaded.png");
+        flaggedUnloadedMessageIcon  = Bitmap.getBitmapResource("mail_flagged_unloaded.png");
+        draftUnloadedMessageIcon    = Bitmap.getBitmapResource("mail_draft_unloaded.png");
+        deletedUnloadedMessageIcon  = Bitmap.getBitmapResource("mail_deleted_unloaded.png");
+        unknownUnloadedMessageIcon  = Bitmap.getBitmapResource("mail_unknown_unloaded.png");
+        junkUnloadedMessageIcon     = Bitmap.getBitmapResource("mail_junk_unloaded.png");
         }
         
@@ -184 +200 @@
 
                 public void visit(MessageNode node) {
+                    boolean unloaded = !node.hasCachedContent() && !node.hasMessageContent();
                         int flags = node.getFlags();
                 if((flags & MessageNode.Flag.DELETED) != 0)
-                    this.icon = deletedMessageIcon;
+                    this.icon = unloaded ? deletedUnloadedMessageIcon : deletedMessageIcon;
                 else if((flags & MessageNode.Flag.JUNK) != 0)
-                        this.icon = junkMessageIcon;
+                        this.icon = unloaded ? junkUnloadedMessageIcon : junkMessageIcon;
                 else if((flags & MessageNode.Flag.ANSWERED) != 0)
-                        this.icon = repliedMessageIcon;
+                        this.icon = unloaded ? repliedUnloadedMessageIcon: repliedMessageIcon;
                 else if((flags & MessageNode.Flag.FLAGGED) != 0)
-                        this.icon = flaggedMessageIcon;
+                        this.icon = unloaded ? flaggedUnloadedMessageIcon : flaggedMessageIcon;
                 else if((flags & MessageNode.Flag.DRAFT) != 0)
-                        this.icon = draftMessageIcon;
+                        this.icon = unloaded ? draftUnloadedMessageIcon: draftMessageIcon;
                 else if((flags & MessageNode.Flag.RECENT) != 0)
-                        this.icon = unopenedMessageIcon;
+                        this.icon = unloaded ? unopenedUnloadedMessageIcon: unopenedMessageIcon;
                 else if((flags & MessageNode.Flag.SEEN) != 0)
-                        this.icon = openedMessageIcon;
+                        this.icon = unloaded ? openedUnloadedMessageIcon : openedMessageIcon;
                 else
-                        this.icon = unknownMessageIcon;
+                        this.icon = unloaded ? unknownUnloadedMessageIcon: unknownMessageIcon;
                 }
                 

trunk/LogicMail_BB47T/src/org/logicprobe/LogicMail/ui/FieldFactoryBB47T.java

@@ -35 +35 @@
 import net.rim.device.api.ui.component.TreeFieldCallback;
 
-public class FieldFactoryBB47T extends FieldFactory {
+public class FieldFactoryBB47T extends FieldFactoryBB46 {
         private boolean hasTouchscreen;
         private FieldFactory oldFieldFactory;