Merge pull request #942 from GwtMaterialDesign/release_2.3

Release 2.3

Author: kevzlou7979

.travis.yml

@@ -1,4 +1,5 @@
 sudo: false
+dist: trusty
 language: java
 jdk:
 - oraclejdk8
@@ -7,7 +8,7 @@ cache:
   - $HOME/.m2
 before_install:
 # install the gwt-material-jquery because it will depends on built in jquery
-- git clone -b release_2.2 https://github.com/GwtMaterialDesign/gwt-material-jquery.git
+- git clone -b release_2.3 https://github.com/GwtMaterialDesign/gwt-material-jquery.git
 - cd gwt-material-jquery
 - mvn install -DskipTests=true -DdryRun=true
 - cd ..

.utility/deploy.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 set -ev
-if [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "release_2.2" ]; then
+if [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "release_2.3" ]; 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 -DskipTests --settings ~/settings.xml
 fi

README.md

@@ -19,12 +19,12 @@ We created <a href="http://gwtmaterialdesign.github.io/gwt-material-demo/apidocs
 
 
 ## Maven
-### Current Version 2.2
+### Current Version 2.3
 ```xml
 <dependency>
     <groupId>com.github.gwtmaterialdesign</groupId>
     <artifactId>gwt-material</artifactId>
-    <version>2.2</version>
+    <version>2.3</version>
 </dependency>
 ```
 ### Snapshot Version 2.3-SNAPSHOT

gwt-material/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>gwt-material-parent</artifactId>
         <groupId>com.github.gwtmaterialdesign</groupId>
-        <version>2.2</version>
+        <version>2.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

gwt-material/src/main/java/gwt/material/design/client/adaptive/AdaptiveWidget.java

@@ -0,0 +1,106 @@
+/*
+ * #%L
+ * GwtMaterial
+ * %%
+ * Copyright (C) 2015 - 2019 GwtMaterialDesign
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+package gwt.material.design.client.adaptive;
+
+import com.google.gwt.dom.client.Document;
+import com.google.gwt.user.client.ui.Widget;
+import gwt.material.design.client.base.MaterialWidget;
+import gwt.material.design.client.base.viewport.Resolution;
+import gwt.material.design.client.base.viewport.ViewPort;
+import gwt.material.design.client.base.viewport.WidthBoundary;
+import gwt.material.design.client.js.Window;
+
+//TODO: More usecase implementation
+public class AdaptiveWidget<T extends Widget> extends MaterialWidget {
+
+    private T widget;
+    protected AdaptiveWidgetMap<T> widgetMap;
+
+    public AdaptiveWidget() {
+        super(Document.get().createDivElement());
+    }
+
+    @Override
+    protected void onLoad() {
+        super.onLoad();
+
+        load();
+    }
+
+    public void load() {
+        ViewPort.when(Resolution.ALL_DEVICES).then(viewPortChange -> loadViewPort());
+    }
+
+    protected void loadViewPort() {
+        for (WidthBoundary widthBoundary : getWidgetMap().keySet()) {
+            if (Window.matchMedia(widthBoundary.asMediaQuery())) {
+                T currentWidget = getWidgetMap().get(widthBoundary);
+                setWidget(currentWidget);
+            }
+        }
+    }
+
+    public AdaptiveWidget register(Resolution resolution, T widget) {
+        if (widgetMap == null) {
+            widgetMap = new AdaptiveWidgetMap<>();
+        }
+
+        widgetMap.put(resolution, widget);
+        return this;
+    }
+
+    public AdaptiveWidget unregister(Resolution resolution) {
+        if (widgetMap != null) {
+            widgetMap.remove(resolution);
+        }
+        return this;
+    }
+
+    public void setWidget(T widget) {
+        this.widget = widget;
+
+        clear();
+        add(widget);
+    }
+
+
+    @Override
+    protected void onUnload() {
+        super.onUnload();
+
+        unload();
+    }
+
+    public void unload() {
+        widgetMap.clear();
+    }
+
+    public AdaptiveWidgetMap<T> getWidgetMap() {
+        return widgetMap;
+    }
+
+    public void setWidgetMap(AdaptiveWidgetMap<T> widgetMap) {
+        this.widgetMap = widgetMap;
+    }
+
+    public Widget getWidget() {
+        return widget;
+    }
+}

gwt-material/src/main/java/gwt/material/design/client/adaptive/AdaptiveWidgetMap.java

@@ -0,0 +1,33 @@
+/*
+ * #%L
+ * GwtMaterial
+ * %%
+ * Copyright (C) 2015 - 2019 GwtMaterialDesign
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+package gwt.material.design.client.adaptive;
+
+import com.google.gwt.user.client.ui.Widget;
+import gwt.material.design.client.base.viewport.Resolution;
+import gwt.material.design.client.base.viewport.WidthBoundary;
+
+import java.util.HashMap;
+
+public class AdaptiveWidgetMap<T extends Widget> extends HashMap<WidthBoundary, T> {
+
+    public void put(Resolution resolution, T widget) {
+        put(resolution.getBoundary(), widget);
+    }
+}

gwt-material/src/main/java/gwt/material/design/client/async/mixin/AsyncWidgetMixin.java

@@ -42,16 +42,12 @@ public class AsyncWidgetMixin<W extends Widget, V> implements IsAsyncWidget<W, V
 
     public AsyncWidgetMixin(W widget) {
         this.widget = widget;
+        this.displayLoader = new DefaultDisplayLoader();
     }
 
     @Override
     public void load(AsyncWidgetCallback<W, V> asyncCallback) {
-        if (displayLoader == null) {
-            displayLoader = new DefaultDisplayLoader();
-            GWT.log("Will be using the default display loader for asynchronous feature.");
-        }
-
-        displayLoader.loading();
+        loading();
         getLoadingStyleMixin().setOn(true);
         asyncCallback.load(new AsyncCallback<V>() {
             @Override
@@ -70,6 +66,14 @@ public void onSuccess(V result) {
         }, widget);
     }
 
+    public void loading() {
+        displayLoader.loading();
+    }
+
+    public void finalize() {
+        displayLoader.finalize();
+    }
+
     @Override
     public void setLoaded(boolean loaded) {
         this.loaded = loaded;
@@ -107,6 +111,7 @@ public void setAsyncDisplayLoader(AsyncDisplayLoader displayLoader) {
 
     @Override
     public AsyncDisplayLoader getAsyncDisplayLoader() {
+
         return displayLoader;
     }
 

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

@@ -256,6 +256,7 @@ public void load() {
     @Override
     public void unload() {
         activator = null;
+        $(".drag-target").remove();
     }
 
     /**
@@ -342,8 +343,11 @@ protected void load(boolean strict) {
     @Override
     protected void onDetach() {
         super.onDetach();
-        getNavMenu().removeStyleName(ShowOn.SHOW_ON_LARGE.getCssName());
-        getNavMenu().removeStyleName(ShowOn.SHOW_ON_MED_DOWN.getCssName());
+        MaterialWidget navMenu = getNavMenu();
+        if (navMenu != null) {
+            navMenu.removeStyleName(ShowOn.SHOW_ON_LARGE.getCssName());
+            navMenu.removeStyleName(ShowOn.SHOW_ON_MED_DOWN.getCssName());
+        }
         pushElement(getHeader(), 0);
         pushElement(getMain(), 0);
         pushElementMargin(getFooter(), 0);

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

@@ -36,6 +36,7 @@
 import gwt.material.design.client.base.validator.HasValidators;
 import gwt.material.design.client.base.validator.ValidationChangedEvent;
 import gwt.material.design.client.base.validator.Validator;
+import gwt.material.design.client.constants.Position;
 import gwt.material.design.client.constants.StatusDisplayType;
 import gwt.material.design.client.ui.MaterialLabel;
 
@@ -328,6 +329,11 @@ public int getClearKeyCode() {
         return getClearOnKeyUpMixin().getClearKeyCode();
     }
 
+    @Override
+    public void setStatusDisplayPosition(Position position) {
+        getStatusTextMixin().setStatusDisplayPosition(position);
+    }
+
     @Override
     public HandlerRegistration addValidationChangedHandler(ValidationChangedEvent.ValidationChangedHandler handler) {
         return getValidatorMixin().addValidationChangedHandler(handler);

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

@@ -0,0 +1,31 @@
+/*
+ * #%L
+ * GwtMaterial
+ * %%
+ * Copyright (C) 2015 - 2019 GwtMaterialDesign
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+package gwt.material.design.client.base;
+
+import jsinterop.annotations.JsMethod;
+import jsinterop.annotations.JsPackage;
+import jsinterop.annotations.JsType;
+
+@JsType(isNative = true, name = "Object", namespace = JsPackage.GLOBAL)
+public class ClipboardDataTransfer {
+
+    @JsMethod
+    public native String getData(String format);
+}