Merge pull request #489 from GwtMaterialDesign/release_2.0

Release 2.0-RC2

Author: kevzlou7979

gwt-material/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>gwt-material-parent</artifactId>
         <groupId>com.github.gwtmaterialdesign</groupId>
-        <version>2.0-rc1</version>
+        <version>2.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -17,7 +17,7 @@
         <dependency>
             <groupId>com.github.gwtmaterialdesign</groupId>
             <artifactId>gwt-material-jquery</artifactId>
-            <version>1.0-rc1</version>
+            <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.google.gwt</groupId>

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

@@ -23,6 +23,7 @@
 import com.google.gwt.editor.client.IsEditor;
 import com.google.gwt.editor.client.LeafValueEditor;
 import com.google.gwt.editor.ui.client.adapters.HasTextEditor;
+import com.google.gwt.safehtml.shared.SafeHtmlUtils;
 import com.google.gwt.user.client.ui.HasHTML;
 
 /**
@@ -65,7 +66,7 @@ public String getHTML() {
 
     @Override
     public void setHTML(final String html) {
-        getElement().setInnerHTML(html);
+        getElement().setInnerSafeHtml(SafeHtmlUtils.fromString(html));
     }
 
     @Override

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

@@ -146,16 +146,16 @@ protected void onLoad() {
         super.onLoad();
 
         if (initialClasses != null) {
-            for (String intial : initialClasses) {
-                if (!intial.isEmpty()) {
-                    removeStyleName(intial);
-                    addStyleName(intial);
+            for (String initial : initialClasses) {
+                if (!initial.isEmpty()) {
+                    removeStyleName(initial);
+                    addStyleName(initial);
                 }
             }
         }
 
         if (isFeatureEnabled(Feature.ONLOAD_ADD_QUEUE) && onLoadAdd != null) {
-            // Check the on-load-add items.
+            // Check the onLoadAdd items.
             for (Appender item : onLoadAdd) {
                 if (item.index == -1) {
                     add(item.widget, (Element) getElement());

gwt-material/src/main/java/gwt/material/design/client/base/mixin/TooltipMixin.java

@@ -93,11 +93,11 @@ public void setTooltipDelayMs(int delayMs) {
     @Override
     public void setTooltipHTML(String html) {
         initializeTooltip();
-        tooltip.setTooltipHTML(html);
+        tooltip.setHtml(html);
     }
 
     @Override
     public String getTooltipHTML() {
-        return tooltip.getTooltipHTML();
+        return tooltip.getHtml();
     }
 }

gwt-material/src/main/java/gwt/material/design/client/base/mixin/ValidatorMixin.java

@@ -161,7 +161,7 @@ public boolean validate(boolean show) {
         Boolean oldValid = valid;
         valid = true;
         if (errorHandler != null && !validators.isEmpty()) {
-            List<EditorError> errors = new ArrayList<EditorError>();
+            List<EditorError> errors = new ArrayList<>();
             for (ValidatorWrapper<V> wrapper : validators) {
                 Validator<V> validator = wrapper.getValidator();
                 List<EditorError> result = validator.validate(inputWidget, inputWidget.getValue());

gwt-material/src/main/java/gwt/material/design/client/constants/ShowOn.java

@@ -27,9 +27,9 @@
 public enum ShowOn implements CssType {
     SHOW_ON_SMALL("show-on-small"),
     SHOW_ON_LARGE("show-on-large"),
-    SHOW_ON_MED("show-on-med"),
+    SHOW_ON_MED("show-on-medium"),
     SHOW_ON_MED_UP("show-on-medium-and-up"),
-    SHOW_ON_MED_DOWN("hide-on-med-and-up"),
+    SHOW_ON_MED_DOWN("hide-on-medium-and-up"),
     NONE("");
 
     private final String cssClass;

gwt-material/src/main/java/gwt/material/design/client/js/JsMaterialElement.java

@@ -175,6 +175,9 @@ public class JsMaterialElement extends JQueryElement {
     @JsMethod
     public native JsMaterialElement get(String key);
 
+    @JsProperty(name = "$root")
+    public JsMaterialElement root;
+
     @JsProperty
     public JsDate obj;
 

gwt-material/src/main/java/gwt/material/design/client/js/JsPushpinOptions.java

@@ -27,12 +27,12 @@
 public class JsPushpinOptions {
 
     @JsProperty
-    public double top;
+    public Object top;
 
     @JsProperty
-    public double offset;
+    public Object offset;
 
     @JsProperty
-    public double bottom;
+    public Object bottom;
 
 }

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

@@ -20,6 +20,7 @@
 package gwt.material.design.client.ui;
 
 import com.google.gwt.dom.client.Document;
+import com.google.gwt.safehtml.shared.SafeHtmlUtils;
 import gwt.material.design.client.constants.Color;
 import gwt.material.design.client.constants.CssName;
 import gwt.material.design.client.ui.html.Span;
@@ -88,6 +89,6 @@ public String getText() {
 
     @Override
     public void setText(String text) {
-        getElement().setInnerHTML(text);
+        getElement().setInnerSafeHtml(SafeHtmlUtils.fromString(text));
     }
 }

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

@@ -20,11 +20,13 @@
 package gwt.material.design.client.ui;
 
 import com.google.gwt.dom.client.Document;
+import com.google.gwt.event.shared.HandlerRegistration;
 import gwt.material.design.client.base.HasAxis;
 import gwt.material.design.client.base.MaterialWidget;
 import gwt.material.design.client.base.mixin.CssNameMixin;
 import gwt.material.design.client.constants.Axis;
 import gwt.material.design.client.constants.CssName;
+import gwt.material.design.client.js.Window;
 
 //@formatter:off
 
@@ -35,7 +37,7 @@
  * length.
  * <h3>UiBinder Usage:</h3>
  * <pre>
- * {@code<!-- Basic Card -->
+ * {@code <!-- Basic Card -->
  * <m:MaterialCard backgroundColor="blue-grey darken-1" grid="l3">
  *   <m:MaterialCardContent textColor="white">
  *     <m:MaterialCardTitle text="Sample" iconType="POLYMER" iconPosition="RIGHT"/>
@@ -94,6 +96,8 @@
 public class MaterialCard extends MaterialWidget implements HasAxis {
 
     private final CssNameMixin<MaterialCard, Axis> axisMixin = new CssNameMixin<>(this);
+    private boolean detectOrientation = false;
+    protected HandlerRegistration orientationHandler;
 
     /**
      * Creates and empty card.
@@ -117,4 +121,32 @@ public void setAxis(Axis axis) {
     public Axis getAxis() {
         return axisMixin.getCssName();
     }
-}
+
+    public void setDetectOrientation(boolean detectOrientation) {
+        this.detectOrientation = detectOrientation;
+
+        if(orientationHandler != null) {
+            orientationHandler.removeHandler();
+            orientationHandler = null;
+        }
+
+        if(detectOrientation) {
+            orientationHandler = com.google.gwt.user.client.Window.addResizeHandler(resizeEvent -> {
+                detectAndApplyOrientation();
+            });
+            detectAndApplyOrientation();
+        }
+    }
+
+    protected void detectAndApplyOrientation() {
+        if (Window.matchMedia("(orientation: portrait)")) {
+            setAxis(Axis.VERTICAL);
+        } else {
+            setAxis(Axis.HORIZONTAL);
+        }
+    }
+
+    public boolean isDetectOrientation() {
+        return detectOrientation;
+    }
+}