Merge pull request #30 from codenameone/master

Update

Author: ThomasH99

CodenameOne/src/com/codename1/impl/CodenameOneImplementation.java

@@ -58,6 +58,7 @@
 import com.codename1.ui.animations.Transition;
 import com.codename1.ui.events.ActionEvent;
 import com.codename1.ui.events.ActionListener;
+import com.codename1.ui.events.MessageEvent;
 import com.codename1.ui.geom.Dimension;
 import com.codename1.ui.geom.Rectangle;
 import com.codename1.ui.geom.Shape;
@@ -8432,5 +8433,14 @@ public void onCanInstallOnHomescreen(Runnable r) {
     public boolean supportsNativeTextAreaVerticalAlignment() {
         return false;
     }
+    
+    /**
+     * Posts a message to the native platform.
+     * @param message The message.
+     * @since 7.0
+     */
+    public void postMessage(MessageEvent message) {
+        
+    }
 
 }

CodenameOne/src/com/codename1/ui/CN.java

@@ -31,6 +31,7 @@
 import com.codename1.io.Storage;
 import com.codename1.messaging.Message;
 import com.codename1.ui.events.ActionListener;
+import com.codename1.ui.events.MessageEvent;
 import com.codename1.ui.geom.Rectangle;
 import com.codename1.util.RunnableWithResultSync;
 import java.io.IOException;
@@ -760,7 +761,7 @@ public static void openGallery(ActionListener response, int type){
     /**
      * Returns a 2-3 letter code representing the platform name for the platform override
      * 
-     * @return the name of the platform e.g. ios, rim, win, and, me
+     * @return the name of the platform e.g. ios, rim, win, and, me, HTML5
      */
     public static String getPlatformName() {
         return Display.impl.getPlatformName();
@@ -1455,5 +1456,51 @@ public static void onCanInstallOnHomescreen(Runnable r) {
     public static Image captureScreen() {
         return Display.impl.captureScreen();
     }
+    
+    /**
+     * Adds a listener to receive messages from the native platform.  This is a mechanism to communicate
+     * between the app and the native platform.  Currently the Javascript port is the only port to use
+     * this mechanism.
+     * 
+     * <p>In the Javascript port, javascript can send messages to the CN1 app by calling
+     * 
+     * {@code
+     * window.dispatchEvent(new CustomEvent('cn1inbox', {detail:'The message', code: SOMEINTEGER}));
+     * }
+     * 
+     * @param l The listener.
+     * @since 7.0
+     */
+    public static void addMessageListener(ActionListener<MessageEvent> l) {
+        Display.INSTANCE.addMessageListener(l);
+    }
+    
+    /**
+     * Removes a listener from receiving messages from the native platform.  This is a mechanism to communicate
+     * between the app and the native platform.  Currently the Javascript port is the only port to use
+     * this mechanism.
+     * @param l The listener.
+     * @since 7.0
+     */
+    public static void removeMessageListener(ActionListener<MessageEvent> l) {
+        Display.INSTANCE.removeMessageListener(l);
+    }
+    
+    /**
+     * Posts a message to the native platform.  This is a mechanism to communicate
+     * between the app and the native platform.  Currently the Javascript port is the only port to use
+     * this mechanism.
+     * 
+     * <p>In the Javascript port these messages can be received in Javascript by adding an event listener
+     * for 'cn1outbox' events to the 'window' object.  The message is contained in the event data "detail" key. And the 
+     * code in the 'code' key.</p>
+     * @param message The message to send to the native platform.
+     * @since 7.0
+     */
+    public static void postMessage(MessageEvent message) {
+        Display.INSTANCE.postMessage(message);
+    }
+    
+    
 
 }

CodenameOne/src/com/codename1/ui/Display.java

@@ -49,6 +49,7 @@
 import com.codename1.notifications.LocalNotification;
 import com.codename1.payment.Purchase;
 import com.codename1.system.CrashReport;
+import com.codename1.ui.events.MessageEvent;
 import com.codename1.ui.geom.Rectangle;
 import com.codename1.ui.plaf.UIManager;
 import com.codename1.ui.util.EventDispatcher;
@@ -90,6 +91,8 @@ public final class Display extends CN1Constants {
     boolean codenameOneExited;
     private boolean inNativeUI;
 
+    private EventDispatcher messageListeners;
+    
     /**
      * A common sound type that can be used with playBuiltinSound
      */
@@ -3203,7 +3206,62 @@ public void setAutoFoldVKBOnFormSwitch(boolean autoFoldVKBOnFormSwitch) {
     public int getCommandBehavior() {
         return impl.getCommandBehavior();
     }
-
+    
+    /**
+     * Posts a message to the native platform.  Different platforms may handle messages posted this
+     * way differently.  
+     * <p>The Javascript port will dispatch the message on the {@literal window} object
+     * as a custom DOM event named 'cn1outbox', with the event data containing a 'detail' key with the 
+     * message, and a 'code' key with the code.</p>
+     * @param message The message.
+     * @since 7.0
+     */
+    public void postMessage(MessageEvent message) {
+        impl.postMessage(message);
+    }
+    
+    /**
+     * Adds a listener to receive messages from the native platform.  This is one mechanism for the native
+     * platform to communicate with the Codename one app.  
+     * 
+     * <p>In the JavaScript port, listeners will be notified when DOM events named 'cn1inbox' are received on the 
+     * window object.  The event data 'detail' key will be the source of the message, and the 'code' key will be the
+     * source of the code.
+     * @param l The listener.
+     * @since 7.0
+     */
+    public void addMessageListener(ActionListener<MessageEvent> l) {
+        if (messageListeners == null) {
+            messageListeners = new EventDispatcher();
+        }
+        messageListeners.addListener(l);
+    }
+    
+    /**
+     * Removes a listener from receiving messages from the native platform.
+     * 
+     * @param l The listener.
+     * @since 7.0
+     */
+    public void removeMessageListener(ActionListener<MessageEvent> l) {
+        if (messageListeners != null) {
+            messageListeners.removeListener(l);
+        }
+    }
+    
+    /**
+     * Dispatches a message to all of the registered listeners.
+     * @param evt 
+     * @see #addMessageListener(com.codename1.ui.events.ActionListener) 
+     * @see #removeMessageListener(com.codename1.ui.events.ActionListener) 
+     * @since 7.0
+     */
+    public void dispatchMessage(MessageEvent evt) {
+        if (messageListeners != null && messageListeners.hasListeners()) {
+            messageListeners.fireActionEvent(evt);
+        }
+    }
+    
     /**
      * Indicates the way commands should be added to a form as one of the ocmmand constants defined
      * in this class
@@ -3803,7 +3861,7 @@ public boolean isGalleryTypeSupported(int type) {
     /**
      * Returns a 2-3 letter code representing the platform name for the platform override
      * 
-     * @return the name of the platform e.g. ios, rim, win, and, me
+     * @return the name of the platform e.g. ios, rim, win, and, me, HTML5
      */
     public String getPlatformName() {
         return impl.getPlatformName();

CodenameOne/src/com/codename1/ui/SwipeableContainer.java

@@ -44,6 +44,7 @@ public class SwipeableContainer extends Container {
     private Container bottomLeftWrapper;
     private Container bottomRightWrapper;
     private Container topWrapper;
+    private SwipeableContainer previouslyOpenSwípeable; 
 
     private boolean open = false;
     private boolean openedToRight = false;
@@ -56,6 +57,7 @@ public class SwipeableContainer extends Container {
     private int initialY = -1;
     private int topX = -1;
     private boolean waitForRelease;
+    private SwipeableContainer previouslyOpened;
 
     private final EventDispatcher dispatcher = new EventDispatcher();
     /**
@@ -382,6 +384,9 @@ public void actionPerformed(ActionEvent evt) {
                     }
 
                     if (initialX != -1) {
+                        if (getPreviouslyOpened() != null && getPreviouslyOpened() != SwipeableContainer.this && getPreviouslyOpened().isOpen()) {
+                            getPreviouslyOpened().close();
+                        }
                         int diff = x - initialX;
                         int val = 0;
                         if(!isOpen()){
@@ -442,5 +447,33 @@ public void actionPerformed(ActionEvent evt) {
             }
         }
     }
+    
+        /**
+     * returns a previously opened SwipeableContainer that should be
+     * automatically closed when starting to open this one. Called as soon as
+     * this Swipeable starts opening. One approach is to override this method to
+     * return a previously opened SwipeableContainer Can be overridden to return
+     * a SwipeableContainer stored outside this container.
+     *
+     * @return an already open SwipeableContainer that will be closed when
+     * opening this one, or null if none
+     */
+    public SwipeableContainer getPreviouslyOpened() {
+        return previouslyOpened;
+    }
+
+    /**
+     * set a previously open SwipeableContainer, it will be closed as soon as
+     * the user starts swiping this one. Be aware that with a long list of
+     * Swipeable containers it may be a better approach to store the previously
+     * opened outside the list and simply override getPreviouslyOpened to return
+     * it
+     *
+     * @param previouslyOpened an already open SwipeableContainer that will be
+     * closed if this one is opened
+     */
+    public void setPreviouslyOpened(SwipeableContainer previouslyOpened) {
+        this.previouslyOpened = previouslyOpened;
+    }
 
 }

CodenameOne/src/com/codename1/ui/events/MessageEvent.java

@@ -0,0 +1,52 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.codename1.ui.events;
+import com.codename1.ui.Display;
+
+/**
+ * Encapsulates an event that either originates outside the App (e.g. from the webpage that 
+ * contains the app if it is published using the Javascript port); or whose destination is
+ * outside the app.
+ * 
+ * @author shannah
+ * @since 7.0
+ * @see Display#postMessage(com.codename1.ui.events.MessageEvent) 
+ * @see Display#dispatchMessage(com.codename1.ui.events.MessageEvent) 
+ * @see Display#addMessageListener(com.codename1.ui.events.ActionListener) 
+ * @see Display#removeMessageListener(com.codename1.ui.events.ActionListener) 
+ */
+public class MessageEvent extends ActionEvent {
+    private final String message;
+    private final int code;
+    
+    /**
+     * Creates a new message.
+     * @param source The source of the message.
+     * @param message The message content.
+     * @param code A code for the message.
+     */
+    public MessageEvent(Object source, String message, int code) {
+        super(source);
+        this.message = message;
+        this.code = code;
+    }
+    
+    /**
+     * Gets the message content.
+     * @return The message
+     */
+    public String getMessage() {
+        return message;
+    }
+    
+    /**
+     * Gets the message code.
+     * @return 
+     */
+    public int getCode() {
+        return code;
+    }
+}

Ports/iOSPort/nativeSources/DrawPath.m

@@ -59,7 +59,9 @@ -(void)execute
 
     if ( width < 0 ) width = -width;
     if ( height < 0 ) height = -height;
-    
+    if (width == 0 || height == 0) {
+        return;
+    }
     GLfloat vertexes[] = {
           (GLfloat)x, (GLfloat)y,
           (GLfloat)(x+width), (GLfloat)y,

Ports/iOSPort/nativeSources/IOSNative.m

@@ -7669,23 +7669,18 @@ JAVA_LONG com_codename1_impl_ios_IOSNative_nativePathRendererCreateTexture___lon
 
         if ( width < 0 ) width = -width;
         if ( height < 0 ) height = -height;
-        
+        if (width == 0 || height == 0) {
+            POOL_END();
+            return;
+        }
         AlphaConsumer *ac = malloc(sizeof(AlphaConsumer));
         ac->originX = x;
         ac->originY = y;
         ac->width = width;
         ac->height = height;
-        
-        
-        //CN1Log(@"AC Width %d", ac.width);
-        
-        //jbyte maskArray[ac.width*ac.height];
+
         jbyte* maskArray = malloc(sizeof(jbyte)*ac->width*ac->height);
-        
-        //CN1Log(@"Mask width %d height %d",
-        //      ac.width,
-        //      ac.height
-        //      );
+
         ac->alphas = maskArray;
         Renderer_produceAlphas(renderer, ac);
 
@@ -7742,6 +7737,7 @@ JAVA_LONG com_codename1_impl_ios_IOSNative_nativePathRendererCreateTexture___lon
 }
 
 
+
 float clamp_float_to_int(float val){
     JAVA_FLOAT absVal = abs(val);
     JAVA_INT absIntVal = round(absVal);