diff --git a/.travis.yml b/.travis.yml index cacf21fba..47f0f5d27 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.1 https://github.com/GwtMaterialDesign/gwt-material.git +- git clone -b release_1.5.2 https://github.com/GwtMaterialDesign/gwt-material.git - cd gwt-material - mvn install -DskipTests=true -DdryRun=true - cd .. @@ -17,7 +17,7 @@ before_install: - mvn install -DskipTests=true -DdryRun=true - cd .. # install the gwt-material-addins library -- git clone -b release_1.5.1 https://github.com/GwtMaterialDesign/gwt-material-addins.git +- git clone -b release_1.5.2 https://github.com/GwtMaterialDesign/gwt-material-addins.git - cd gwt-material-addins - mvn install -DskipTests=true -DdryRun=true - cd .. diff --git a/.utility/update_demo_site.sh b/.utility/update_demo_site.sh index 006d9cb49..96acdf98a 100644 --- a/.utility/update_demo_site.sh +++ b/.utility/update_demo_site.sh @@ -1,6 +1,6 @@ #!/bin/bash set -ev -if [ "$TRAVIS_JDK_VERSION" == "oraclejdk7" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "master" ]; then +if [ "$TRAVIS_JDK_VERSION" == "oraclejdk7" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "release_1.5.2" ]; then if [[ -z "$GH_TOKEN" ]]; then echo -e "GH_TOKEN is not set" diff --git a/README.md b/README.md index adcb6872a..c33232c40 100644 --- a/README.md +++ b/README.md @@ -2,13 +2,13 @@ #gwt-material-demo [![Build Status](https://travis-ci.org/GwtMaterialDesign/gwt-material-demo.svg?branch=master)](https://travis-ci.org/GwtMaterialDesign/gwt-material-demo) Demo application to show the features of the [gwt-material](https://github.com/GwtMaterialDesign/gwt-material) library. -### Release 1.5.1 Demo +### Release 1.5.2 Demo [http://gwtmaterialdesign.github.io/gwt-material-demo](http://gwtmaterialdesign.github.io/gwt-material-demo) ```xml com.github.gwtmaterialdesign gwt-material-demo - 1.5.1 + 1.5.2 ``` diff --git a/pom.xml b/pom.xml index 8f83a02f1..5392cddb3 100644 --- a/pom.xml +++ b/pom.xml @@ -4,14 +4,14 @@ gwt-material-parent com.github.gwtmaterialdesign - 1.5.1 + 1.5.2 4.0.0 gwt-material-demo war - 1.5.1 + 1.5.2 Gwt Material Demo Showcase for gwt-material @@ -34,7 +34,7 @@ 2.7.0 1.5.3 2.1.2 - 1.5.1 + 1.5.2 PRETTY 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 f05841d5d..011537d77 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.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")); versions.add(new Version("1.4.1", "January 2016", Version.VersionLink.CORE_1_4_1.getName(), null, Version.VersionLink.THEME_1_4.getName(), "red")); 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 da9702f4f..c5fb1c116 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_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"), CORE_1_4_1("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material/1.4.1"), @@ -47,10 +48,12 @@ public enum VersionLink{ THEME_1_4("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-themes/1.4"), THEME_1_5_0("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-themes/1.5.0"), THEME_1_5_1("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-themes/1.5.1"), + THEME_1_5_2("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-themes/1.5.2"), // FOR gwt-material Addins ADDINS_1_5_0("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-addins/1.5.0"), - ADDINS_1_5_1("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-addins/1.5.1"); + ADDINS_1_5_1("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-addins/1.5.1"), + ADDINS_1_5_2("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-addins/1.5.2"); String name; VersionLink(String name) { 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 1e788799d..ff5722478 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 @@ -32,14 +32,14 @@  <dependency>
 <groupId>com.github.gwtmaterialdesign</groupId>
 <artifactId>gwt-material</artifactId>
-  <version>1.5.1</version>
+  <version>1.5.2</version>
</dependency> - + @@ -94,6 +94,20 @@ <inherits name="gwt.material.design.themes.GwtMaterialThemeBlue"/> + + +  <inherits name="gwt.material.design.themes.GwtMaterialThemeAmber"/>
+ <inherits name="gwt.material.design.themes.GwtMaterialThemeBlue"/>
+ <inherits name="gwt.material.design.themes.GwtMaterialThemeBrown"/>
+ <inherits name="gwt.material.design.themes.GwtMaterialThemeGreen"/>
+ <inherits name="gwt.material.design.themes.GwtMaterialThemeGrey"/>
+ <inherits name="gwt.material.design.themes.GwtMaterialThemeOrange"/>
+ <inherits name="gwt.material.design.themes.GwtMaterialThemePink"/>
+ <inherits name="gwt.material.design.themes.GwtMaterialThemePurple"/>
+ <inherits name="gwt.material.design.themes.GwtMaterialThemeRed"/>
+ <inherits name="gwt.material.design.themes.GwtMaterialThemeYellow"/>
+
+ 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 7d27989cf..4a68f0d56 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 3fd443471..0af5e4471 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 @@ -29,6 +29,31 @@ } + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/gwt/material/design/demo/client/application/style/themes/ThemesView.ui.xml b/src/main/java/gwt/material/design/demo/client/application/style/themes/ThemesView.ui.xml index a420edf8a..aa51e7f96 100644 --- a/src/main/java/gwt/material/design/demo/client/application/style/themes/ThemesView.ui.xml +++ b/src/main/java/gwt/material/design/demo/client/application/style/themes/ThemesView.ui.xml @@ -37,5 +37,19 @@ <inherits name="gwt.material.design.themes.GwtMaterialThemeBlue"/> + + + +  <inherits name="gwt.material.design.themes.GwtMaterialThemeAmber"/>
+ <inherits name="gwt.material.design.themes.GwtMaterialThemeBlue"/>
+ <inherits name="gwt.material.design.themes.GwtMaterialThemeBrown"/>
+ <inherits name="gwt.material.design.themes.GwtMaterialThemeGreen"/>
+ <inherits name="gwt.material.design.themes.GwtMaterialThemeGrey"/>
+ <inherits name="gwt.material.design.themes.GwtMaterialThemeOrange"/>
+ <inherits name="gwt.material.design.themes.GwtMaterialThemePink"/>
+ <inherits name="gwt.material.design.themes.GwtMaterialThemePurple"/>
+ <inherits name="gwt.material.design.themes.GwtMaterialThemeRed"/>
+ <inherits name="gwt.material.design.themes.GwtMaterialThemeYellow"/>
+
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 4f684496c..1c16f8acf 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.1/gwt-material-1.5.1.jar +sourceUrl=http://central.maven.org/maven2/com/github/gwtmaterialdesign/gwt-material/1.5.2/gwt-material-1.5.2.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