Merge pull request #1014 from GwtMaterialDesign/release_2.5.0

Release 2.5.0

Author: kevzlou7979

README.md

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

gwt-material/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>gwt-material-parent</artifactId>
         <groupId>com.github.gwtmaterialdesign</groupId>
-        <version>2.5.0-rc1</version>
+        <version>2.5.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -137,7 +137,6 @@
                                 <exclude>**/ui/**.java</exclude>
                             </excludes>
                             <includes>
-                                <!--<include>**/MixinTestSuite.java</include>-->
                                 <include>**/MaterialWidgetTestSuite.java</include>
                             </includes>
                             <!-- disable JVM asserts, but enable JS asserts for tests -->

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

@@ -47,6 +47,7 @@
 public abstract class AbstractValueWidget<V> extends MaterialWidget implements HasValue<V>, LeafValueEditor<V>,
     HasEditorErrors<V>, HasErrorHandler, HasStatusText, HasValidators<V>, HasRequiredField, HasClearOnKeyUp, HasCopyCommand {
 
+    private V initialValue;
     private boolean allowBlank = true;
     private boolean autoValidate;
     private BlankValidator<V> blankValidator;
@@ -69,6 +70,10 @@ public AbstractValueWidget(Element element, String... initialClass) {
     @Override
     public void setValue(V value) {
         setValue(value, false);
+
+        if (initialValue == null) {
+            initialValue = value;
+        }
     }
 
     @Override
@@ -88,6 +93,14 @@ public void setValue(V value, boolean fireEvents, boolean reload) {
         }
     }
 
+    public V getInitialValue() {
+        return initialValue;
+    }
+
+    public void setInitialValue(V initialValue) {
+        this.initialValue = initialValue;
+    }
+
     @Override
     public void setErrorText(String errorText) {
         getStatusTextMixin().setErrorText(errorText);

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

@@ -19,9 +19,7 @@
  */
 package gwt.material.design.client.base;
 
-import gwt.material.design.client.ui.MaterialLink;
-
 public interface DropdownItemRenderer<T> {
 
-    MaterialLink render(T object);
+    MaterialWidget render(T object);
 }

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

@@ -0,0 +1,38 @@
+/*
+ * #%L
+ * GwtMaterial
+ * %%
+ * Copyright (C) 2015 - 2021 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;
+
+public enum ToastPosition {
+    DEFAULT(""),
+    TOP_LEFT("top-left"),
+    TOP_RIGHT("top-right"),
+    BOTTOM_LEFT("bottom-left"),
+    BOTTOM_RIGHT("bottom-right");
+
+    private String name;
+
+    ToastPosition(String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+}

gwt-material/src/main/java/gwt/material/design/client/base/helper/UiSortHelper.java

@@ -0,0 +1,45 @@
+/*
+ * #%L
+ * GwtMaterial
+ * %%
+ * Copyright (C) 2015 - 2021 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.helper;
+
+import static gwt.material.design.jquery.client.api.JQuery.$;
+
+public class UiSortHelper {
+
+    /**
+     * Calls a Jquery sort api
+     *
+     * @param containerSelector - The container Id i.e UnorderedList - (ul)
+     * @param childSelector     - The child element selector (i.e List - li)
+     * @param dataAttribute     - The data attribute that indicate the order of each children (i.e order -> data-attribute='order')
+     */
+    public static void sort(String containerSelector, String childSelector, String dataAttribute) {
+        if (containerSelector != null && !containerSelector.isEmpty() && childSelector != null && !childSelector.isEmpty() && dataAttribute != null && !dataAttribute.isEmpty()) {
+            $(containerSelector + " " + childSelector + "[data-order]").sort((elem1, elem2) -> {
+                Object elem1Order = $(elem1).data(dataAttribute);
+                Object elem2Order = $(elem2).data(dataAttribute);
+                if (elem1Order != null && elem2Order != null) {
+                    return Integer.parseInt(elem2Order.toString()) < Integer.parseInt(elem1Order.toString()) ? 1 : -1;
+                }
+                return -1;
+            }).appendTo(containerSelector);
+        }
+    }
+}

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

@@ -38,13 +38,15 @@ public ToggleStyleMixin(final H widget, String style) {
     }
 
     public void setOn(boolean on) {
-        uiObject.removeStyleName(style);
-        if (on) {
-            uiObject.addStyleName(style);
+        if (uiObject != null) {
+            uiObject.removeStyleName(style);
+            if (on) {
+                uiObject.addStyleName(style);
+            }
         }
     }
 
     public boolean isOn() {
-        return StyleHelper.containsStyle(uiObject.getStyleName(), style);
+        return uiObject != null && StyleHelper.containsStyle(uiObject.getStyleName(), style);
     }
 }

gwt-material/src/main/java/gwt/material/design/client/base/validator/DefaultDirtyValidator.java

@@ -28,10 +28,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * //TODO: Leaving/Abandoning validator (Name)
- * @author kevzlou7979@gmail.com
- */
 public class DefaultDirtyValidator<C extends Widget> implements DirtyValidator, IsPropagateToChildren {
 
     private List<HandlerRegistration> registrations;

gwt-material/src/main/java/gwt/material/design/client/base/validator/DirtyCheck.java

@@ -0,0 +1,33 @@
+/*
+ * #%L
+ * GwtMaterial
+ * %%
+ * Copyright (C) 2015 - 2021 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.validator;
+
+public interface DirtyCheck {
+
+    /**
+     * Will check whether there are dirty fields found
+     */
+    boolean isDirty();
+
+    /**
+     * Sets the widget dirty value
+     */
+    void setDirty(boolean dirty);
+}

gwt-material/src/main/java/gwt/material/design/client/base/validator/DirtyValidator.java

@@ -19,7 +19,7 @@
  */
 package gwt.material.design.client.base.validator;
 
-public interface DirtyValidator {
+public interface DirtyValidator extends DirtyCheck {
 
     /**
      * Detect whether we support dirty field checking
@@ -31,15 +31,5 @@ public interface DirtyValidator {
      */
     void setAllowDirtyValidation(boolean allowDirty);
 
-    /**
-     * Will check whether there are dirty fields found
-     */
-    boolean isDirty();
-
-    /**
-     * Sets the widget dirty value
-     */
-    void setDirty(boolean dirty);
-
     String getDirtyMessage();
 }