From bf66bbfd96e839293c4bb453a72056329ebc9cb4 Mon Sep 17 00:00:00 2001 From: Kevzlou7979 Date: Fri, 1 Jul 2016 12:36:29 +0800 Subject: [PATCH 1/4] Added missing changelog updates of 1.5.2 --- .../animations/core/CoreAnimationsView.java | 37 +++++++++++++- .../animations/core/CoreAnimationsView.ui.xml | 50 +++++++++++++++++++ .../components/forms/FormsView.java | 46 +++++++++++++++++ .../components/forms/FormsView.ui.xml | 13 +++++ .../gettingstarted/GettingStartedView.ui.xml | 23 ++++++++- .../client/application/menu/MenuView.ui.xml | 2 +- .../application/roadmap/RoadMapView.ui.xml | 14 +++++- .../resources/MaterialConstants.properties | 2 +- 8 files changed, 182 insertions(+), 5 deletions(-) diff --git a/src/main/java/gwt/material/design/demo/client/application/animations/core/CoreAnimationsView.java b/src/main/java/gwt/material/design/demo/client/application/animations/core/CoreAnimationsView.java index 3b7638153..bed45ffb3 100644 --- a/src/main/java/gwt/material/design/demo/client/application/animations/core/CoreAnimationsView.java +++ b/src/main/java/gwt/material/design/demo/client/application/animations/core/CoreAnimationsView.java @@ -28,8 +28,11 @@ import com.google.gwt.uibinder.client.UiHandler; import com.google.gwt.user.client.ui.Widget; import com.gwtplatform.mvp.client.ViewImpl; +import gwt.material.design.client.ui.MaterialButton; import gwt.material.design.client.ui.MaterialCard; import gwt.material.design.client.ui.MaterialListBox; +import gwt.material.design.client.ui.MaterialToast; +import gwt.material.design.client.ui.animate.MaterialAnimation; import gwt.material.design.client.ui.animate.MaterialAnimator; import gwt.material.design.client.ui.animate.Transition; @@ -43,6 +46,9 @@ interface Binder extends UiBinder { @UiField MaterialCard card; + @UiField + MaterialButton iconHeart, iconCallback, iconState; + @UiField MaterialListBox lstAnimations; @@ -147,4 +153,33 @@ private void animate(){ Transition transition = Transition.fromStyleName(value); MaterialAnimator.animate(transition, card, 1000); } -} + + @UiHandler("btnAnimateInfinite") + void onAnimateInfinite(ClickEvent e) { + MaterialAnimator.animate(Transition.PULSE, iconHeart, 1000, true); + } + + @UiHandler("btnStopAnimation") + void onStopAnimation(ClickEvent e) { + MaterialAnimator.stopAnimation(iconHeart); + } + + @UiHandler("btnAnimateCallback") + void onCallback(ClickEvent e) { + Runnable callback = new Runnable() { + @Override + public void run() { + MaterialToast.fireToast("Animation is finished"); + } + }; + MaterialAnimator.animate(Transition.FLIPINX, iconCallback, 200, callback); + } + + @UiHandler("btnAnimateStateful") + void onStateful(ClickEvent e) { + new MaterialAnimation().durationMillis(1000) + .delayMillis(100) + .transition(Transition.WOBBLE) + .animate(iconState); + } +} \ No newline at end of file diff --git a/src/main/java/gwt/material/design/demo/client/application/animations/core/CoreAnimationsView.ui.xml b/src/main/java/gwt/material/design/demo/client/application/animations/core/CoreAnimationsView.ui.xml index fe07ed0cb..fca188eca 100644 --- a/src/main/java/gwt/material/design/demo/client/application/animations/core/CoreAnimationsView.ui.xml +++ b/src/main/java/gwt/material/design/demo/client/application/animations/core/CoreAnimationsView.ui.xml @@ -28,6 +28,9 @@ .block{ display: block; } + .icon i{ + font-size: 4em; + } @@ -50,5 +53,52 @@ + + + + + + // Play Infinite Animation
+ MaterialAnimator.animate(Transition.PULSE, heart, 1000, true);
+ // Stop Infinite Animation
+ MaterialAnimator.stopAnimation(heart);
+ + + + + + + + + + + +  Runnable callback = new Runnable() {
+  @Override
+  public void run() {
+   MaterialToast.fireToast("Animation is finished");
+  }
+ };
+ MaterialAnimator.animate(Transition.FLIPINX, iconCallback, 200, callback); + + + + + + + + + + +  new MaterialAnimation().durationMillis(1000)
+  .delayMillis(100)
+  .transition(Transition.WOBBLE)
+  .animate(iconState); + + + + + + diff --git a/src/main/java/gwt/material/design/demo/client/application/components/forms/FormsView.java b/src/main/java/gwt/material/design/demo/client/application/components/forms/FormsView.java index f85433634..eef57e940 100644 --- a/src/main/java/gwt/material/design/demo/client/application/components/forms/FormsView.java +++ b/src/main/java/gwt/material/design/demo/client/application/components/forms/FormsView.java @@ -44,6 +44,9 @@ interface Binder extends UiBinder { @UiField MaterialLabel lblRange; @UiField MaterialRange range; + @UiField MaterialTextArea txtAreaAuto; + @UiField MaterialTextArea txtAreaFocus; + @UiField MaterialFloatBox txtFloatBox; @UiField MaterialIntegerBox txtIntegerBox; @UiField MaterialDoubleBox txtDoubleBox; @@ -56,6 +59,49 @@ interface Binder extends UiBinder { txtIntegerBox.setValue(10); txtDoubleBox.setValue(9999.90); txtLongBox.setValue((long) 1000.00); + txtAreaAuto.setValue("Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc quam mauris, accumsan placerat " + + "lectus ac, tincidunt mattis nisl. Ut efficitur massa in libero gravida tincidunt. Vestibulum eget massa " + + "eget ex auctor tempus. Aenean vitae augue euismod, lacinia lectus ut, rhoncus enim. Sed vitae laoreet " + + "felis, eget ullamcorper nunc. Vivamus elit urna, varius et arcu vel, euismod auctor augue. Praesent " + + "scelerisque scelerisque libero sit amet euismod. Mauris eu est at felis feugiat tincidunt eu vel lectus. " + + "Ut pretium magna vitae massa sollicitudin, eu tincidunt sapien scelerisque. Maecenas gravida lorem non dui " + + "pretium, id vestibulum mi imperdiet. Fusce facilisis, dui nec ultrices molestie, nisi metus bibendum lacus, " + + "eget posuere est odio vitae nulla. Mauris laoreet non justo fringilla tempus. Mauris ut risus risus. " + + "Vivamus auctor accumsan gravida. Nam venenatis sapien nisl, quis accumsan odio dignissim non. Vestibulum " + + "aliquam semper condimentum. Suspendisse a eros elementum, dapibus quam in, aliquet lorem. Morbi mi dui, " + + "convallis at luctus ultricies, malesuada at leo. Morbi et turpis a ex vehicula ullamcorper. Vestibulum " + + "lacinia, orci eget elementum fermentum, lectus velit interdum erat, sit amet pharetra justo elit in tortor. " + + "Suspendisse ac vestibulum nisi.\n" + + "\n" + + "Nunc euismod metus nec elit sollicitudin blandit. Proin eleifend ex bibendum sodales blandit. Vestibulum " + + "varius pharetra arcu, sit amet pellentesque odio hendrerit nec. Integer faucibus imperdiet tortor a tempus. " + + "Sed accumsan condimentum nisl. Cras interdum sapien quis maximus commodo. Nulla malesuada imperdiet enim, " + + "non ornare elit auctor in. Fusce at ipsum eget turpis tincidunt maximus. Nunc sodales tortor nec tincidunt " + + "fringilla. Quisque sollicitudin ipsum at dolor faucibus, ultricies convallis ipsum convallis. Donec " + + "consequat velit vel molestie tempus. Donec et accumsan lacus, non sollicitudin quam. Morbi arcu lacus, " + + "blandit eu lacus nec, finibus tempus ligula.", true); + + txtAreaFocus.setValue("Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc quam mauris, accumsan placerat " + + "lectus ac, tincidunt mattis nisl. Ut efficitur massa in libero gravida tincidunt. Vestibulum eget massa " + + "eget ex auctor tempus. Aenean vitae augue euismod, lacinia lectus ut, rhoncus enim. Sed vitae laoreet " + + "felis, eget ullamcorper nunc. Vivamus elit urna, varius et arcu vel, euismod auctor augue. Praesent " + + "scelerisque scelerisque libero sit amet euismod. Mauris eu est at felis feugiat tincidunt eu vel lectus. " + + "Ut pretium magna vitae massa sollicitudin, eu tincidunt sapien scelerisque. Maecenas gravida lorem non dui " + + "pretium, id vestibulum mi imperdiet. Fusce facilisis, dui nec ultrices molestie, nisi metus bibendum lacus, " + + "eget posuere est odio vitae nulla. Mauris laoreet non justo fringilla tempus. Mauris ut risus risus. " + + "Vivamus auctor accumsan gravida. Nam venenatis sapien nisl, quis accumsan odio dignissim non. Vestibulum " + + "aliquam semper condimentum. Suspendisse a eros elementum, dapibus quam in, aliquet lorem. Morbi mi dui, " + + "convallis at luctus ultricies, malesuada at leo. Morbi et turpis a ex vehicula ullamcorper. Vestibulum " + + "lacinia, orci eget elementum fermentum, lectus velit interdum erat, sit amet pharetra justo elit in tortor. " + + "Suspendisse ac vestibulum nisi.\n" + + "\n" + + "Nunc euismod metus nec elit sollicitudin blandit. Proin eleifend ex bibendum sodales blandit. Vestibulum " + + "varius pharetra arcu, sit amet pellentesque odio hendrerit nec. Integer faucibus imperdiet tortor a tempus. " + + "Sed accumsan condimentum nisl. Cras interdum sapien quis maximus commodo. Nulla malesuada imperdiet enim, " + + "non ornare elit auctor in. Fusce at ipsum eget turpis tincidunt maximus. Nunc sodales tortor nec tincidunt " + + "fringilla. Quisque sollicitudin ipsum at dolor faucibus, ultricies convallis ipsum convallis. Donec " + + "consequat velit vel molestie tempus. Donec et accumsan lacus, non sollicitudin quam. Morbi arcu lacus, " + + "blandit eu lacus nec, finibus tempus ligula.", true); } @UiHandler("lstOptions") diff --git a/src/main/java/gwt/material/design/demo/client/application/components/forms/FormsView.ui.xml b/src/main/java/gwt/material/design/demo/client/application/components/forms/FormsView.ui.xml index b71c035c2..540134b44 100644 --- a/src/main/java/gwt/material/design/demo/client/application/components/forms/FormsView.ui.xml +++ b/src/main/java/gwt/material/design/demo/client/application/components/forms/FormsView.ui.xml @@ -51,6 +51,19 @@ <m:MaterialTextArea ui:field="txtArea" placeholder="About" iconType="FACE"/>
+ + + + + <m:MaterialTextArea placeholder="Using AUTO" resizeRule="AUTO"/>
+ + + + + + <m:MaterialTextArea placeholder="Using FOCUS" resizeRule="FOCUS"/>
+ + diff --git a/src/main/java/gwt/material/design/demo/client/application/gettingstarted/GettingStartedView.ui.xml b/src/main/java/gwt/material/design/demo/client/application/gettingstarted/GettingStartedView.ui.xml index ff5722478..69ef5e558 100644 --- a/src/main/java/gwt/material/design/demo/client/application/gettingstarted/GettingStartedView.ui.xml +++ b/src/main/java/gwt/material/design/demo/client/application/gettingstarted/GettingStartedView.ui.xml @@ -28,10 +28,31 @@ +  <dependency>
 <groupId>com.github.gwtmaterialdesign</groupId>
 <artifactId>gwt-material</artifactId>
+  <version>1.5.3</version>
+ </dependency> + + + + + +  <dependency>
+  <groupId>com.github.gwtmaterialdesign</groupId>
+  <artifactId>gwt-material-addins</artifactId>
+  <version>1.5.2</version>
+ </dependency> + + + + + +  <dependency>
+  <groupId>com.github.gwtmaterialdesign</groupId>
+  <artifactId>gwt-material-themes</artifactId>
 <version>1.5.2</version>
</dependency> @@ -39,7 +60,7 @@ - + diff --git a/src/main/java/gwt/material/design/demo/client/application/menu/MenuView.ui.xml b/src/main/java/gwt/material/design/demo/client/application/menu/MenuView.ui.xml index 4a68f0d56..d50f707af 100644 --- a/src/main/java/gwt/material/design/demo/client/application/menu/MenuView.ui.xml +++ b/src/main/java/gwt/material/design/demo/client/application/menu/MenuView.ui.xml @@ -92,7 +92,7 @@ - + diff --git a/src/main/java/gwt/material/design/demo/client/application/roadmap/RoadMapView.ui.xml b/src/main/java/gwt/material/design/demo/client/application/roadmap/RoadMapView.ui.xml index 0af5e4471..04fe55da8 100644 --- a/src/main/java/gwt/material/design/demo/client/application/roadmap/RoadMapView.ui.xml +++ b/src/main/java/gwt/material/design/demo/client/application/roadmap/RoadMapView.ui.xml @@ -32,7 +32,7 @@ - + @@ -42,6 +42,18 @@ + + + + + + + + + + + + diff --git a/src/main/resources/gwt/material/design/demo/client/resources/MaterialConstants.properties b/src/main/resources/gwt/material/design/demo/client/resources/MaterialConstants.properties index 1c16f8acf..78f182d37 100644 --- a/src/main/resources/gwt/material/design/demo/client/resources/MaterialConstants.properties +++ b/src/main/resources/gwt/material/design/demo/client/resources/MaterialConstants.properties @@ -1,6 +1,6 @@ apkUrl=http://gwt-material.appspot.com/bin/gwtmaterial.apk rawSourceUrl=http://gwt-material.appspot.com/bin/materialize-v0.96.5.zip -sourceUrl=http://central.maven.org/maven2/com/github/gwtmaterialdesign/gwt-material/1.5.2/gwt-material-1.5.2.jar +sourceUrl=http://central.maven.org/maven2/com/github/gwtmaterialdesign/gwt-material/1.5.3/gwt-material-1.5.3.jar gitterUrl=https://gitter.im/GwtMaterialDesign/gwt-material weatherIconsUrl=http://gwt-material.appspot.com/bin/weather mavenUrl=http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material From a26976f0009d259f71078ad3994fe1519fbe706d Mon Sep 17 00:00:00 2001 From: Kevzlou7979 Date: Fri, 1 Jul 2016 12:39:56 +0800 Subject: [PATCH 2/4] Iteration for 1.5.3 release (Emergency release for MaterialSwitch component) --- .travis.yml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 47f0f5d27..81ac2df25 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ cache: - $HOME/.m2 before_install: # install the gwt-material library before we build the demo -- git clone -b release_1.5.2 https://github.com/GwtMaterialDesign/gwt-material.git +- git clone -b release_1.5.3 https://github.com/GwtMaterialDesign/gwt-material.git - cd gwt-material - mvn install -DskipTests=true -DdryRun=true - cd .. diff --git a/pom.xml b/pom.xml index 5392cddb3..3b774e512 100644 --- a/pom.xml +++ b/pom.xml @@ -188,7 +188,7 @@ com.github.gwtmaterialdesign gwt-material - ${gwt-material.version} + 1.5.3 com.github.gwtmaterialdesign From 87805bb60ec1be4ef50aaaf4d2fa0152d09c47e3 Mon Sep 17 00:00:00 2001 From: Kevzlou7979 Date: Fri, 1 Jul 2016 16:24:36 +0800 Subject: [PATCH 3/4] Added version 1.5.3 --- .../material/design/demo/client/application/dto/DataHelper.java | 1 + .../gwt/material/design/demo/client/application/dto/Version.java | 1 + 2 files changed, 2 insertions(+) diff --git a/src/main/java/gwt/material/design/demo/client/application/dto/DataHelper.java b/src/main/java/gwt/material/design/demo/client/application/dto/DataHelper.java index 011537d77..5283cf01e 100644 --- a/src/main/java/gwt/material/design/demo/client/application/dto/DataHelper.java +++ b/src/main/java/gwt/material/design/demo/client/application/dto/DataHelper.java @@ -50,6 +50,7 @@ public static List getAllHeroes(){ public static List getAllVersions() { List versions = new ArrayList<>(); + versions.add(new Version("1.5.3", "June 2016", Version.VersionLink.CORE_1_5_3.getName(), null, null, "orange")); versions.add(new Version("1.5.2", "June 2016", Version.VersionLink.CORE_1_5_2.getName(), Version.VersionLink.ADDINS_1_5_2.getName(), Version.VersionLink.THEME_1_5_2.getName(), "orange")); versions.add(new Version("1.5.1", "June 2016", Version.VersionLink.CORE_1_5_1.getName(), Version.VersionLink.ADDINS_1_5_1.getName(), Version.VersionLink.THEME_1_5_1.getName(), "teal")); versions.add(new Version("1.5.0", "April 2016", Version.VersionLink.CORE_1_5_0.getName(), Version.VersionLink.ADDINS_1_5_0.getName(), Version.VersionLink.THEME_1_5_0.getName(), "deep-orange")); diff --git a/src/main/java/gwt/material/design/demo/client/application/dto/Version.java b/src/main/java/gwt/material/design/demo/client/application/dto/Version.java index c5fb1c116..d938fe9f0 100644 --- a/src/main/java/gwt/material/design/demo/client/application/dto/Version.java +++ b/src/main/java/gwt/material/design/demo/client/application/dto/Version.java @@ -32,6 +32,7 @@ public class Version implements Serializable { public enum VersionLink{ // FOR gwt-material Core + CORE_1_5_3("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material/1.5.3"), CORE_1_5_2("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material/1.5.2"), CORE_1_5_1("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material/1.5.1"), CORE_1_5_0("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material/1.5.0"), From 6a4ddf1b9f9ea908b0fac81a03c54a2d756c1578 Mon Sep 17 00:00:00 2001 From: Kevzlou7979 Date: Fri, 1 Jul 2016 16:29:07 +0800 Subject: [PATCH 4/4] Added version 1.5.3 to getting started --- .../material/design/demo/client/application/dto/DataHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/gwt/material/design/demo/client/application/dto/DataHelper.java b/src/main/java/gwt/material/design/demo/client/application/dto/DataHelper.java index 5283cf01e..2c32944ed 100644 --- a/src/main/java/gwt/material/design/demo/client/application/dto/DataHelper.java +++ b/src/main/java/gwt/material/design/demo/client/application/dto/DataHelper.java @@ -50,7 +50,7 @@ public static List getAllHeroes(){ public static List getAllVersions() { List versions = new ArrayList<>(); - versions.add(new Version("1.5.3", "June 2016", Version.VersionLink.CORE_1_5_3.getName(), null, null, "orange")); + versions.add(new Version("1.5.3", "June 2016", Version.VersionLink.CORE_1_5_3.getName(), null, null, "red")); versions.add(new Version("1.5.2", "June 2016", Version.VersionLink.CORE_1_5_2.getName(), Version.VersionLink.ADDINS_1_5_2.getName(), Version.VersionLink.THEME_1_5_2.getName(), "orange")); versions.add(new Version("1.5.1", "June 2016", Version.VersionLink.CORE_1_5_1.getName(), Version.VersionLink.ADDINS_1_5_1.getName(), Version.VersionLink.THEME_1_5_1.getName(), "teal")); versions.add(new Version("1.5.0", "April 2016", Version.VersionLink.CORE_1_5_0.getName(), Version.VersionLink.ADDINS_1_5_0.getName(), Version.VersionLink.THEME_1_5_0.getName(), "deep-orange"));