Merge pull request #279 from GwtMaterialDesign/release_2.1

Release 2.1

Author: kevzlou7979

.travis.yml

@@ -7,19 +7,19 @@ cache:
   - $HOME/.m2
 before_install:
 # install the gwt-material-jquery library before we build the demo
-- git clone -b release_2.0.1 https://github.com/GwtMaterialDesign/gwt-material-jquery.git
+- git clone -b master https://github.com/GwtMaterialDesign/gwt-material-jquery.git
 - cd gwt-material-jquery
 - mvn install -DskipTests=true -DdryRun=true
 - cd ..
 # install the gwt-material library before we build the demo
-- git clone -b release_2.0.1 https://github.com/GwtMaterialDesign/gwt-material.git
+- git clone -b master https://github.com/GwtMaterialDesign/gwt-material.git
 - cd gwt-material
 - mvn install -DskipTests=true -DdryRun=true
 - cd ..
 install: true
 before_script:
  - chmod +x .utility/*
 script:
-- mvn clean install -DdryRun=true
+- mvn clean install -DdryRun=true -DskipTests=true
 after_success:
 - .utility/deploy.sh

.utility/deploy.sh

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

README.md

@@ -6,21 +6,21 @@
 
 Gwt Material Design Extra Components for https://github.com/GwtMaterialDesign/gwt-material <br>
 
-## Current Version
+## Current Version 2.1
 ```xml
 <dependency>
     <groupId>com.github.gwtmaterialdesign</groupId>
     <artifactId>gwt-material-addins</artifactId>
-    <version>2.0.1</version>
+    <version>2.1</version>
 </dependency>
 ```
 
-## Snapshot Version
+## Snapshot Version 2.2-SNAPSHOT
 ```xml
 <dependency>
     <groupId>com.github.gwtmaterialdesign</groupId>
     <artifactId>gwt-material-addins</artifactId>
-    <version>2.1-SNAPSHOT</version>
+    <version>2.2-SNAPSHOT</version>
 </dependency>
 ```
 
@@ -46,13 +46,19 @@ xmlns:ma="urn:import:gwt.material.design.addins.client"
 | Avatar | [JDenticon](https://github.com/dmester/jdenticon) | 1.3.2 |
 | Bubble | N/A | N/A |
 | Camera | N/A | N/A |
+| Carousel | [SlickJs](https://github.com/kenwheeler/slick) | 1.6.0 |
+| Circular Progress | [jquery-circle-progress](https://github.com/kottenator/jquery-circle-progress) | 1.2.2 |
 | ComboBox | [Select2](https://github.com/select2/select2) | 4.0.3 |
+| CountUp | [CountUpJs](https://github.com/inorganik/countUp.js) | 1.9.0 |
 | Cutout | N/A | N/A |
 | Document Viewer | N/A | N/A |
 | Dnd | [InteractJs](https://github.com/taye/interact.js) | 1.2.6 |
 | EmptyState | N/A | N/A |
 | File Uploader | [DropzoneJs](https://github.com/enyo/dropzone) | 4.3.0 |
 | Icon Morph | N/A | N/A |
+| Image Cropper | [CroppieJs](https://github.com/Foliotek/Croppie) | 2.5.0 |
+| Input Mask | [JQuery-Mask-Plugin](https://github.com/Foliotek/Croppie) | 1.14.10 |
+| Live Stamp | [LiveStamp](https://github.com/mattbradley/livestampjs) | 1.1.2 |
 | Masonry | [Masonry](https://github.com/desandro/masonry) | 4.0.0 |
 | Menubar | N/A | N/A |
 | Overlay | N/A | N/A |
@@ -61,6 +67,7 @@ xmlns:ma="urn:import:gwt.material.design.addins.client"
 | Rating | N/A | N/A |
 | Rich Editor | [Material Note](https://github.com/Cerealkillerway/materialNote) | 1.2.1 |
 | Scrollfire | N/A | N/A |
+| Signature Pad | [SignaturePad](https://github.com/szimek/signature_pad) | 2.3.0 |
 | SideProfile | N/A | N/A |
 | SplitPanel | [TouchSplitterJQuery](https://github.com/colelawrence/Touch-Splitter-jQuery) | 0.5.1 |
 | Steppers | N/A | N/A |
@@ -90,5 +97,19 @@ We created [Java Docs](http://gwtmaterialdesign.github.io/gwt-material-demo/apid
 ``` gwt.material.design.addins.client.addin_widget.resources.img ``` Image Resources of Addins module <br/>
 ``` gwt.material.design.addins.client.addin_widget.resources.js ``` Javascript Files of Addins module <br/>
 
+### (NEW) Incubator Widgets
+- These are beta widgets that still in incubation process (Subject for further API changes).
+  - Alert
+  - Async
+  - Language Selector
+  - Loading State
+  - Progress LinedBar
+  - Google
+    - Recaptcha
+    - Address Lookup
+  - Inline Search
+  - Timer (Infinite)
+  - Toggle
+
 ##Follow Us
 <a href="https://plus.google.com/u/0/communities/108005250093449814286"> Google Plus</a>

pom.xml

@@ -5,24 +5,25 @@
     <parent>
         <artifactId>gwt-material-parent</artifactId>
         <groupId>com.github.gwtmaterialdesign</groupId>
-        <version>2.0.1</version>
+        <version>2.1</version>
     </parent>
 
     <artifactId>gwt-material-addins</artifactId>
+    <packaging>gwt-lib</packaging>
 
     <name>Gwt Material Addins</name>
-    <version>2.0.1</version>
+    <version>2.1</version>
     <description>Extra Components of GWT Material Framework</description>
 
     <properties>
-        <gwt-material.version>2.0.1</gwt-material.version>
+        <gwt-material.version>2.1</gwt-material.version>
     </properties>
 
     <scm>
         <connection>scm:git:[email protected]:GwtMaterialDesign/gwt-material-addins.git</connection>
         <developerConnection>scm:git:[email protected]:GwtMaterialDesign/gwt-material-addins.git</developerConnection>
         <url>http://github.com/GwtMaterialDesign/gwt-material-addins</url>
-        <tag>v2.0.1</tag>
+        <tag>v2.1</tag>
     </scm>
 
     <licenses>
@@ -110,7 +111,7 @@
         <plugins>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.6</version>
+                <version>${surefire.version}</version>
                 <configuration>
                     <additionalClasspathElements>
                         <additionalClasspathElement>${project.build.sourceDirectory}</additionalClasspathElement>
@@ -120,15 +121,43 @@
                     <forkMode>always</forkMode>
                     <argLine>-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.NoOpLog</argLine>
                 </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>test</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
+                <groupId>net.ltgt.gwt.maven</groupId>
                 <artifactId>gwt-maven-plugin</artifactId>
-                <version>${gwt.version}</version>
+                <version>${tbroyer.version}</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <moduleName>gwt.material.design.addins.GwtMaterialAddins</moduleName>
+                    <style>OBFUSCATED</style>
+                    <logLevel>INFO</logLevel>
+                    <sourceLevel>1.8</sourceLevel>
+                    <jvmArgs>
+                        <jvmArg>-Xmx1g</jvmArg>
+                        <jvmArg>-Xms1g</jvmArg>
+                        <jvmArg>-XX:CompileThreshold=7000</jvmArg>
+                    </jvmArgs>
+                    <optimize>9</optimize>
+                    <compilerArgs>
+                        <compilerArg>-compileReport</compilerArg>
+                        <compilerArg>-XcompilerMetrics</compilerArg>
+                    </compilerArgs>
+                    <skipModule>true</skipModule>
+                    <classpathScope>compile+runtime</classpathScope>
+                    <failOnError>true</failOnError>
+                    <skipModule>true</skipModule>
+                </configuration>
                 <executions>
                     <execution>
                         <goals>
-                            <goal>test</goal>
+                            <goal>compile</goal>
                         </goals>
                     </execution>
                 </executions>

src/main/java/gwt/material/design/addins/client/autocomplete/MaterialAutoComplete.java

@@ -33,6 +33,7 @@
 import gwt.material.design.client.base.*;
 import gwt.material.design.client.base.mixin.*;
 import gwt.material.design.client.constants.CssName;
+import gwt.material.design.client.constants.FieldType;
 import gwt.material.design.client.constants.IconType;
 import gwt.material.design.client.constants.ProgressType;
 import gwt.material.design.client.ui.MaterialChip;
@@ -159,7 +160,7 @@
  */
 // @formatter:on
 public class MaterialAutoComplete extends AbstractValueWidget<List<? extends Suggestion>> implements HasPlaceholder,
-        HasProgress, HasType<AutocompleteType>, HasSelectionHandlers<Suggestion>, HasReadOnly {
+        HasProgress, HasType<AutocompleteType>, HasSelectionHandlers<Suggestion>, HasReadOnly, HasFieldTypes {
 
     static {
         if (MaterialAddins.isDebug()) {
@@ -183,11 +184,12 @@ public class MaterialAutoComplete extends AbstractValueWidget<List<? extends Sug
     private MaterialLabel errorLabel = new MaterialLabel();
     private MaterialChipProvider chipProvider = new DefaultMaterialChipProvider();
 
-    private ErrorMixin<AbstractValueWidget, MaterialLabel> errorMixin;
+    private StatusTextMixin<AbstractValueWidget, MaterialLabel> statusTextMixin;
     private ProgressMixin<MaterialAutoComplete> progressMixin;
     private FocusableMixin<MaterialWidget> focusableMixin;
     private ReadOnlyMixin<MaterialAutoComplete, TextBox> readOnlyMixin;
     private CssTypeMixin<AutocompleteType, MaterialAutoComplete> typeMixin;
+    private FieldTypeMixin<MaterialAutoComplete> fieldTypeMixin;
 
     /**
      * Use MaterialAutocomplete to search for matches from local or remote data
@@ -219,7 +221,7 @@ public MaterialAutoComplete(SuggestOracle suggestions) {
         setup(suggestions);
     }
 
-    private HandlerRegistration listHandler, itemBoxKeyDownHandler, itemBoxBlurHandler, itemBoxClickHandler;
+    private HandlerRegistration itemBoxKeyDownHandler, itemBoxBlurHandler, itemBoxClickHandler;
 
     @Override
     protected void onLoad() {
@@ -229,7 +231,6 @@ protected void onLoad() {
     }
 
     protected void loadHandlers() {
-        listHandler = list.addDomHandler(event -> suggestBox.showSuggestionList(), ClickEvent.getType());
 
         itemBoxBlurHandler = itemBox.addBlurHandler(blurEvent -> {
             if (getValue().size() > 0) {
@@ -238,8 +239,6 @@ protected void loadHandlers() {
         });
 
         itemBoxKeyDownHandler = itemBox.addKeyDownHandler(event -> {
-            boolean changed = false;
-
             switch (event.getNativeKeyCode()) {
                 case KeyCodes.KEY_ENTER:
                     if (directInputAllowed) {
@@ -248,7 +247,7 @@ protected void loadHandlers() {
                             gwt.material.design.client.base.Suggestion directInput = new gwt.material.design.client.base.Suggestion();
                             directInput.setDisplay(value);
                             directInput.setSuggestion(value);
-                            changed = addItem(directInput);
+                            addItem(directInput);
                             if (getType() == AutocompleteType.TEXT) {
                                 itemBox.setText(value);
                             } else {
@@ -266,17 +265,16 @@ protected void loadHandlers() {
 
                                 if (tryRemoveSuggestion(li.getWidget(0))) {
                                     li.removeFromParent();
-                                    changed = true;
                                 }
                             }
                         }
                     }
+                    break;
                 case KeyCodes.KEY_DELETE:
                     if (itemBox.getValue().trim().isEmpty()) {
                         for (ListItem li : itemsHighlighted) {
                             if (tryRemoveSuggestion(li.getWidget(0))) {
                                 li.removeFromParent();
-                                changed = true;
                             }
                         }
                         itemsHighlighted.clear();
@@ -297,7 +295,6 @@ protected void onUnload() {
     }
 
     protected void unloadHandlers() {
-        removeHandler(listHandler);
         removeHandler(itemBoxBlurHandler);
         removeHandler(itemBoxKeyDownHandler);
         removeHandler(itemBoxClickHandler);
@@ -417,6 +414,13 @@ protected boolean addItem(final Suggestion suggestion) {
         return true;
     }
 
+    @Override
+    public void reset() {
+        super.reset();
+
+        clear();
+    }
+
     /**
      * Clear the chip items on the autocomplete box
      */
@@ -433,7 +437,7 @@ public void clear() {
         }
         suggestionMap.clear();
 
-        clearErrorOrSuccess();
+        clearStatusText();
     }
 
     @Override
@@ -669,6 +673,26 @@ public boolean isToggleReadOnly() {
         return getReadOnlyMixin().isToggleReadOnly();
     }
 
+    @Override
+    public void setFieldType(FieldType type) {
+        getFieldTypeMixin().setFieldType(type);
+    }
+
+    @Override
+    public FieldType getFieldType() {
+        return getFieldTypeMixin().getFieldType();
+    }
+
+    @Override
+    public void setLabelWidth(double percentWidth) {
+        getFieldTypeMixin().setLabelWidth(percentWidth);
+    }
+
+    @Override
+    public void setFieldWidth(double percentWidth) {
+        getFieldTypeMixin().setFieldWidth(percentWidth);
+    }
+
     /**
      * Interface that defines how a {@link MaterialChip} is created, given a
      * {@link Suggestion}.
@@ -866,11 +890,11 @@ protected CssTypeMixin<AutocompleteType, MaterialAutoComplete> getTypeMixin() {
     }
 
     @Override
-    public ErrorMixin<AbstractValueWidget, MaterialLabel> getErrorMixin() {
-        if (errorMixin == null) {
-            errorMixin = new ErrorMixin<>(this, errorLabel, list, label);
+    public StatusTextMixin<AbstractValueWidget, MaterialLabel> getStatusTextMixin() {
+        if (statusTextMixin == null) {
+            statusTextMixin = new StatusTextMixin<>(this, errorLabel, list, label);
         }
-        return errorMixin;
+        return statusTextMixin;
     }
 
     protected ReadOnlyMixin<MaterialAutoComplete, TextBox> getReadOnlyMixin() {
@@ -887,4 +911,11 @@ protected FocusableMixin<MaterialWidget> getFocusableMixin() {
         }
         return focusableMixin;
     }
+
+    protected FieldTypeMixin<MaterialAutoComplete> getFieldTypeMixin() {
+        if (fieldTypeMixin == null) {
+            fieldTypeMixin = new FieldTypeMixin<>(this);
+        }
+        return fieldTypeMixin;
+    }
 }

src/main/java/gwt/material/design/addins/client/avatar/MaterialAvatar.java

@@ -96,6 +96,13 @@ public void reload() {
         load();
     }
 
+    @Override
+    public void reset() {
+        super.reset();
+
+        reload();
+    }
+
     /**
      * Replaced by {@link MaterialAvatar#getValue()}
      */
@@ -163,6 +170,4 @@ protected String generateHashCode(String value) {
         this.value = value;
         return JsAvatar.md5(value);
     }
-
-
 }