Merge pull request #381 from GwtMaterialDesign/release_1.5.2

Release 1.5.2

Author: kevzlou7979

.utility/deploy.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 set -ev
-if [ "$TRAVIS_JDK_VERSION" == "oraclejdk7" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "release_1.5.1" ]; then
+if [ "$TRAVIS_JDK_VERSION" == "oraclejdk7" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "release_1.5.2" ]; then
   echo "<settings><servers><server><id>ossrh</id><username>\${env.OSSRH_USER}</username><password>\${env.OSSRH_PASS}</password></server></servers></settings>" > ~/settings.xml
   mvn deploy --settings ~/settings.xml
 fi

gwt-material/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>gwt-material-parent</artifactId>
     <groupId>com.github.gwtmaterialdesign</groupId>
-    <version>1.5.1</version>
+    <version>1.5.2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -25,6 +25,12 @@
       <version>4.11</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.maven.surefire</groupId>
+      <artifactId>surefire-junit4</artifactId>
+      <version>2.12.4</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

gwt-material/src/main/java/gwt/material/design/client/base/AbstractIconButton.java

@@ -38,6 +38,7 @@ public AbstractIconButton(ButtonType type, String text, MaterialIcon icon) {
         super(type, text);
 
         this.icon = icon;
+        ensureIconAttached();
     }
 
     public AbstractIconButton(ButtonType type, String text) {
@@ -74,7 +75,7 @@ public MaterialIcon getIcon() {
     @Override
     public void setIconType(IconType iconType) {
         icon.setIconType(iconType);
-        insert(icon, 0);
+        ensureIconAttached();
     }
 
     @Override
@@ -106,4 +107,10 @@ public void setIconPrefix(boolean prefix) {
     public boolean isIconPrefix() {
         return icon.isIconPrefix();
     }
+
+    public void ensureIconAttached() {
+        if(icon != null && !icon.isAttached()) {
+            insert(icon, 0);
+        }
+    }
 }

gwt-material/src/main/java/gwt/material/design/client/ui/MaterialFooter.java

@@ -35,9 +35,9 @@
 /**
 * Footers are a great way to organize a lot of site navigation and information at the end of a page. This is where the user will look once hes finished scrolling through the current page or is looking for additional information about your website.
 * <h3>UiBinder Usage:</h3>
-* 
+*
 * <pre>
-* {@code 
+* {@code
 <m:MaterialFooter backgroundColor="blue">
     <m:MaterialRow>
         <m:MaterialColumn grid="s12 m6 l6">
@@ -56,7 +56,7 @@
 </m:MaterialFooter> }
 * </pre>
 * </p>
-* 
+*
 * @author kevzlou7979
 * @author Ben Dol
 * @see <a href="http://gwt-material-demo.herokuapp.com/#footer">Material Footer</a>
@@ -75,7 +75,7 @@ public MaterialFooter() {
 
     @Override
     public void add(Widget child) {
-        if(child.getElement().getClassName().contains("footer-copyright")){
+        if(child instanceof MaterialFooterCopyright) {
             super.add(child);
         } else {
             container.add(child);

gwt-material/src/main/java/gwt/material/design/client/ui/MaterialListBox.java

@@ -162,6 +162,13 @@ protected native void initializeMaterial(Element element) /*-{
         $wnd.jQuery(element).material_select();
     }-*/;
 
+    /**
+     * Re initialize the material listbox component
+     */
+    public void reinitialize() {
+        initializeMaterial(getElement());
+    }
+
     /**
      * Sets whether this list allows multiple selections.
      *

gwt-material/src/main/java/gwt/material/design/client/ui/MaterialModal.java

@@ -220,12 +220,8 @@ public void setOpacity(double opacity) {
     }
 
     @Override
-    public HandlerRegistration addCloseHandler(final CloseHandler<MaterialModal> handler) {
-        return this.addHandler(new CloseHandler<MaterialModal>() {
-            @Override
-            public void onClose(CloseEvent<MaterialModal> event) {
-
-            }
-        }, CloseEvent.getType());
+    public HandlerRegistration addCloseHandler(CloseHandler<MaterialModal> handler) {
+        return this.addHandler(handler, CloseEvent.getType());
     }
+
 }

gwt-material/src/main/java/gwt/material/design/client/ui/MaterialNoResult.java

@@ -67,7 +67,6 @@ public MaterialNoResult() {
         div.add(title);
         icon.setIconSize(IconSize.LARGE);
         title.insert(icon, 0);
-        title.setMarginTop(-100);
     }
 
     public MaterialNoResult(String bgColor, String textColor, IconType iconType, String title, String description) {

gwt-material/src/main/java/gwt/material/design/client/ui/MaterialSideNav.java

@@ -34,14 +34,16 @@
 import com.google.gwt.user.client.ui.RootPanel;
 import com.google.gwt.user.client.ui.Widget;
 import com.google.web.bindery.event.shared.HandlerRegistration;
-import gwt.material.design.client.base.*;
+import gwt.material.design.client.base.HasSelectables;
+import gwt.material.design.client.base.HasType;
+import gwt.material.design.client.base.HasWaves;
+import gwt.material.design.client.base.MaterialWidget;
 import gwt.material.design.client.base.helper.DOMHelper;
 import gwt.material.design.client.base.mixin.CssTypeMixin;
 import gwt.material.design.client.base.mixin.ToggleStyleMixin;
 import gwt.material.design.client.constants.Edge;
 import gwt.material.design.client.constants.SideNavType;
 import gwt.material.design.client.events.*;
-import gwt.material.design.client.events.ClearActiveEvent.ClearActiveHandler;
 import gwt.material.design.client.events.SideNavClosedEvent.SideNavClosedHandler;
 import gwt.material.design.client.events.SideNavClosingEvent.SideNavClosingHandler;
 import gwt.material.design.client.events.SideNavOpenedEvent.SideNavOpenedHandler;
@@ -154,22 +156,24 @@ public HandlerRegistration addClosedHandler(SideNavClosedHandler handler) {
         return addHandler(handler, SideNavClosedEvent.TYPE);
     }
 
-    @Override
-    public void add(Widget child) {
+    public Widget wrap(Widget child) {
         if(child instanceof MaterialImage) {
             child.getElement().getStyle().setProperty("border", "1px solid #e9e9e9");
             child.getElement().getStyle().setProperty("textAlign", "center");
         }
 
-        boolean collapsible = child instanceof MaterialCollapsible;
-        if(collapsible) {
-            // Since the collapsible is separ
-            ((MaterialCollapsible)child).addClearActiveHandler(new ClearActiveHandler() {
-                @Override
-                public void onClearActive(ClearActiveEvent event) {
-                    clearActive();
+        // Check whether the widget is not selectable by default
+        boolean isNotSelectable = false;
+        if(child instanceof MaterialWidget) {
+            MaterialWidget widget = (MaterialWidget) child;
+            if (widget.getInitialClasses() != null) {
+                if (widget.getInitialClasses().length > 0) {
+                    String initialClass = widget.getInitialClasses()[0];
+                    if(initialClass.contains("side-profile") || initialClass.contains("collapsible")) {
+                        isNotSelectable = true;
+                    }
                 }
-            });
+            }
         }
 
         if(!(child instanceof ListItem)) {
@@ -187,9 +191,9 @@ public void onClearActive(ClearActiveEvent event) {
             child = listItem;
         }
 
-        // Collapsible's should not be selectable
+        // Collapsible and Side Porfile should not be selectable
         final Widget finalChild = child;
-        if(!collapsible) {
+        if(!isNotSelectable) {
             // Active click handler
             finalChild.addDomHandler(new ClickHandler() {
                 @Override
@@ -200,7 +204,17 @@ public void onClick(ClickEvent event) {
             }, ClickEvent.getType());
         }
         child.getElement().getStyle().setDisplay(Style.Display.BLOCK);
-        super.add(child);
+        return child;
+    }
+
+    @Override
+    public void add(Widget child) {
+        super.add(wrap(child));
+    }
+
+    @Override
+    protected void insert(Widget child, com.google.gwt.user.client.Element container, int beforeIndex, boolean domInsert) {
+        super.insert(wrap(child), container, beforeIndex, domInsert);
     }
 
     @Override

gwt-material/src/main/java/gwt/material/design/client/ui/MaterialSwitch.java

@@ -29,8 +29,8 @@
 import com.google.gwt.event.logical.shared.ValueChangeHandler;
 import com.google.gwt.event.shared.HandlerRegistration;
 import com.google.gwt.user.client.ui.HasValue;
-import gwt.material.design.client.base.MaterialWidget;
 import gwt.material.design.client.base.HasError;
+import gwt.material.design.client.base.MaterialWidget;
 import gwt.material.design.client.base.mixin.ErrorMixin;
 import gwt.material.design.client.constants.InputType;
 import gwt.material.design.client.ui.html.Label;
@@ -39,25 +39,27 @@
 //@formatter:off
 
 /**
-* Material Switch or other call it toggle - used for an alternative for checkbox
-*
-* <h3>UiBinder Usage:</h3>
-* <pre>
-*{@code<m:MaterialSwitch value="true"/>
-*<m:MaterialSwitch value="true" disabled="true"/>
-* }
-* </pre>
+ * Material Switch or other call it toggle - used for an alternative for checkbox
+ *
+ * <h3>UiBinder Usage:</h3>
+ * <pre>
+ *{@code<m:MaterialSwitch value="true"/>
+ *<m:MaterialSwitch value="true" disabled="true"/>
+ * }
+ * </pre>
  *
-* @author kevzlou7979
-* @see <a href="http://gwt-material-demo.herokuapp.com/#forms">Material Switch</a>
-*/
+ * @author kevzlou7979
+ * @see <a href="http://gwtmaterialdesign.github.io/gwt-material-demo/#!forms">Material Switch</a>
+ */
 //@formatter:on
 public class MaterialSwitch extends MaterialWidget implements HasValue<Boolean>, HasClickHandlers, HasError {
 
     private MaterialInput input = new MaterialInput();
     private Span span = new Span();
     private Label label = new Label();
     private MaterialLabel lblError = new MaterialLabel();
+    private Span onLabel = new Span();
+    private Span offLabel = new Span();
 
     private final ErrorMixin<MaterialSwitch, MaterialLabel> errorMixin = new ErrorMixin<>(this, lblError, null);
 
@@ -68,6 +70,22 @@ public MaterialSwitch() {
         super(Document.get().createDivElement(), "switch");
         span.setStyleName("lever");
         input.setType(InputType.CHECKBOX);
+    }
+
+    /**
+     * Creates a material switch with default value.
+     */
+    public MaterialSwitch(boolean value) {
+        this();
+        setValue(value);
+    }
+
+    @Override
+    protected void onLoad() {
+        super.onLoad();
+        if(!offLabel.getText().isEmpty()) {
+            label.add(offLabel);
+        }
         label.add(input);
         label.add(span);
         add(label);
@@ -84,14 +102,9 @@ public void onClick(ClickEvent event) {
                 event.stopPropagation();
             }
         });
-    }
-
-    /**
-     * Creates a material switch with default value.
-     */
-    public MaterialSwitch(boolean value) {
-        this();
-        setValue(value);
+        if(!onLabel.getText().isEmpty()) {
+            label.add(onLabel);
+        }
     }
 
     @Override
@@ -176,13 +189,15 @@ public void setSpan(Span span) {
     /**
      * @return the label
      */
+    @Deprecated
     public Label getLabel() {
         return label;
     }
 
     /**
      * @param label the label to set
      */
+    @Deprecated
     public void setLabel(Label label) {
         this.label = label;
     }
@@ -213,4 +228,18 @@ public void setSuccess(String success) {
     public void clearErrorOrSuccess() {
         errorMixin.clearErrorOrSuccess();
     }
-}
+
+    /**
+     * Set the On State Label of the switch component
+     */
+    public void setOnLabel(String label) {
+        onLabel.setText(label);
+    }
+
+    /**
+     * Set the Off State Label of the switch component
+     */
+    public void setOffLabel(String label) {
+        offLabel.setText(label);
+    }
+}