280518_1116AM_addingChangeFromCn1

.travis/build.sh

@@ -109,5 +109,11 @@ elif [[ -n ${CN1_RUNTESTS_IOS_SIMULATOR} ]]; then
   trap stop_appium EXIT
   ant test-ios
 fi
-
+function killjobs () {
+    JOBS="$(jobs -p)";
+    if [ -n "${JOBS}" ]; then
+        kill -KILL ${JOBS};
+    fi
+}
+killjobs
 exit 0

CodenameOne/src/cn1-version-numbers

@@ -1 +1 @@
-d94dca87abfcfbb507f9705f03c4fd46f20a31c5
+dbec1c950b0372dd8b678f3325b50dba33769f92

CodenameOne/src/com/codename1/components/Accordion.java

@@ -65,16 +65,19 @@ public class Accordion extends Container {
 
     private Image closeIcon;
     private Image openIcon;
-    private boolean autoClose = true;
-    private final EventDispatcher listeners = new EventDispatcher();
+    private boolean autoClose                   = true;
+    private String uiidBackGroundItem           = "AccordionItem";
+    private String uiidHeader                   = "AccordionArrow";
+    private String uiidOpenCloseIcon            = "AccordionArrow";
+    private final EventDispatcher listeners     = new EventDispatcher();
 
     /**
      * Empty Constructor
      */ 
     public Accordion() {
         super.setLayout(BoxLayout.y());
-        this.closeIcon = FontImage.createMaterial(FontImage.MATERIAL_KEYBOARD_ARROW_RIGHT, UIManager.getInstance().getComponentStyle("AccordionArrow"));
-        this.openIcon = FontImage.createMaterial(FontImage.MATERIAL_KEYBOARD_ARROW_DOWN, UIManager.getInstance().getComponentStyle("AccordionArrow"));
+        this.closeIcon = FontImage.createMaterial(FontImage.MATERIAL_KEYBOARD_ARROW_RIGHT, UIManager.getInstance().getComponentStyle(uiidOpenCloseIcon));
+        this.openIcon = FontImage.createMaterial(FontImage.MATERIAL_KEYBOARD_ARROW_DOWN, UIManager.getInstance().getComponentStyle(uiidOpenCloseIcon));
         setScrollableY(true);
     }
 
@@ -97,8 +100,8 @@ public Accordion(Image openIcon, Image closeIcon) {
      */ 
     public Accordion(char openIcon, char closeIcon) {
         super.setLayout(BoxLayout.y());
-        this.closeIcon = FontImage.createMaterial(openIcon, UIManager.getInstance().getComponentStyle("AccordionArrow"));
-        this.openIcon = FontImage.createMaterial(closeIcon, UIManager.getInstance().getComponentStyle("AccordionArrow"));
+        this.closeIcon = FontImage.createMaterial(openIcon, UIManager.getInstance().getComponentStyle(uiidOpenCloseIcon));
+        this.openIcon = FontImage.createMaterial(closeIcon, UIManager.getInstance().getComponentStyle(uiidOpenCloseIcon));
         setScrollableY(true);
     }
 
@@ -110,6 +113,7 @@ public Accordion(char openIcon, char closeIcon) {
      */ 
     public Accordion(char openIcon, char closeIcon, String openCloseUIID) {
         super.setLayout(BoxLayout.y());
+        this.uiidOpenCloseIcon = openCloseUIID;
         this.closeIcon = FontImage.createMaterial(openIcon, UIManager.getInstance().getComponentStyle(openCloseUIID));
         this.openIcon = FontImage.createMaterial(closeIcon, UIManager.getInstance().getComponentStyle(openCloseUIID));
         setScrollableY(true);
@@ -122,7 +126,7 @@ public Accordion(char openIcon, char closeIcon, String openCloseUIID) {
      * @param body the item Component to hide/show
      */ 
     public void addContent(String header, Component body) {
-        addContent(new Label(header), body);
+        addContent(new Label(header, uiidHeader), body);
     }
 
     /**
@@ -234,15 +238,15 @@ public void setOpenIcon(Image openIcon) {
      * @param closeIcon the close icon (e.g. {@code FontImage.MATERIAL_KEYBOARD_ARROW_DOWN})
      */ 
     public void setCloseIcon(char closeIcon) {
-        this.closeIcon = FontImage.createMaterial(closeIcon, UIManager.getInstance().getComponentStyle("AccordionArrow"));
+        this.closeIcon = FontImage.createMaterial(closeIcon, UIManager.getInstance().getComponentStyle(uiidOpenCloseIcon));
     }
 
     /**
      * Sets the open icon using material image
      * @param openIcon the open icon (e.g. {@code FontImage.MATERIAL_KEYBOARD_ARROW_RIGHT})
      */ 
     public void setOpenIcon(char openIcon) {
-        this.openIcon = FontImage.createMaterial(openIcon, UIManager.getInstance().getComponentStyle("AccordionArrow"));
+        this.openIcon = FontImage.createMaterial(openIcon, UIManager.getInstance().getComponentStyle(uiidOpenCloseIcon));
     }
 
     /**
@@ -251,7 +255,7 @@ public void setOpenIcon(char openIcon) {
      * @param size the size in millimeters for the arrow
      */ 
     public void setCloseIcon(char closeIcon, float size) {
-        this.closeIcon = FontImage.createMaterial(closeIcon, UIManager.getInstance().getComponentStyle("AccordionArrow"), size);
+        this.closeIcon = FontImage.createMaterial(closeIcon, UIManager.getInstance().getComponentStyle(uiidOpenCloseIcon), size);
     }
 
     /**
@@ -260,7 +264,7 @@ public void setCloseIcon(char closeIcon, float size) {
      * @param size the size in millimeters for the arrow
      */ 
     public void setOpenIcon(char openIcon, float size) {
-        this.openIcon = FontImage.createMaterial(openIcon, UIManager.getInstance().getComponentStyle("AccordionArrow"), size);
+        this.openIcon = FontImage.createMaterial(openIcon, UIManager.getInstance().getComponentStyle(uiidOpenCloseIcon), size);
     }
 
     /**
@@ -294,23 +298,21 @@ public void setAutoClose(boolean autoClose) {
     class AccordionContent extends Container {
 
         private boolean closed = true;
-
         private final Button arrow = new Button();
-
         private Component body;
-        Component header;
+        private Component header;
 
         public AccordionContent(Component header, final Component body) {
-            setUIID("AccordionItem");
+            setUIID(uiidBackGroundItem);
             setLayout(new BorderLayout());
             this.body = body;
             this.header = header;
             header.setSelectedStyle(header.getUnselectedStyle());
             header.setPressedStyle(header.getUnselectedStyle());
             Container top = new Container(new BorderLayout());
             top.add(BorderLayout.CENTER, header);
-            top.setUIID("AccordionHeader");
-            arrow.setUIID("AccordionArrow");
+            top.setUIID(uiidHeader);
+            arrow.setUIID(uiidOpenCloseIcon);
             arrow.setIcon(closeIcon);
             arrow.addActionListener(new ActionListener() {
 
@@ -336,7 +338,7 @@ public void actionPerformed(ActionEvent evt) {
             body.setHidden(true);
             add(BorderLayout.CENTER, body);
         }
-
+        
         public boolean isClosed() {
             return closed;
         }
@@ -372,5 +374,58 @@ public void removeOnClickItemListener(ActionListener a) {
     private void fireEvent(ActionEvent ev) {
         listeners.fireActionEvent(ev);
     }
+
+    /**
+     * Default UIID for the content item within the accordion 
+     * 
+     * @param uiidBackGroundItem to custom the background in the accordion component
+     */
+    public void setBackgroundItemUIID(String uiidBackGroundItem) {
+        this.uiidBackGroundItem = uiidBackGroundItem;
+    }
 
+    /**
+     * Default UIID for the content item within the accordion 
+     * 
+     * @return the uiid
+     */
+    public String getBackgroundItemUIID() {
+        return uiidBackGroundItem;
+    }
+
+    /**
+     * UIID for the header component
+     * 
+     * @param uiidHeader to custom the header in the accordion component
+     */
+    public void setHeaderUIID(String uiidHeader) {
+        this.uiidHeader = uiidHeader;
+    }
+
+    /**
+     * UIID for the header component
+     * 
+     * @retrun the uiid
+     */
+    public String getHeaderUIID() {
+        return uiidHeader;
+    }
+
+    /**
+     * UIID for the arrow icon for expanding/collapsing
+     * 
+     * @param uiidOpenCloseIcon to custom the background of the Open/Close icon
+     */
+    public void setOpenCloseIconUIID(String uiidOpenCloseIcon) {
+        this.uiidOpenCloseIcon = uiidOpenCloseIcon;
+    }
+
+    /**
+     * UIID for the arrow icon for expanding/collapsing
+     * 
+     * @return the UIID
+     */
+    public String getOpenCloseIconUIID() {
+        return uiidOpenCloseIcon;
+    }
 }

CodenameOne/src/com/codename1/components/FloatingActionButton.java

@@ -30,7 +30,6 @@
 import com.codename1.ui.Display;
 import com.codename1.ui.FontImage;
 import com.codename1.ui.Form;
-import com.codename1.ui.Graphics;
 import com.codename1.ui.Label;
 import com.codename1.ui.animations.CommonTransitions;
 import com.codename1.ui.events.ActionEvent;
@@ -112,11 +111,13 @@ protected FloatingActionButton(char icon, String text, float size) {
      *
      * @param icon one of the FontImage.MATERIAL_* constants
      * @param text the text of the sub FloatingActionButton
-     * @string uiid the uiid of the FAB
+     * @param uiid the uiid of the FAB
      * @param size the size in millimeters
      */
     protected FloatingActionButton(char icon, String text, String uiid, float size) {
         FontImage image = FontImage.createMaterial(icon, uiid, size);
+        setGap(0);
+        image.setBgTransparency(0);
         sizeMm = size;
         setIcon(image);
         setText("");
@@ -140,6 +141,7 @@ public void setUIID(String id) {
             all.setAlignment(CENTER);
             updateBorder();
             FontImage image = FontImage.createMaterial(i.getText().charAt(0), id, sizeMm);
+            image.setBgTransparency(0);
             setIcon(image);
         }
     }
@@ -181,6 +183,7 @@ public void styleChanged(String propertyName, Style source) {
         if(getIcon() instanceof FontImage && propertyName.equals(Style.FG_COLOR)) {
             FontImage i = (FontImage)getIcon();
             FontImage image = FontImage.createMaterial(i.getText().charAt(0), "FloatingActionButton", sizeMm);
+            image.setBgTransparency(0);
             setIcon(image);
         }
     }