Merge pull request #20 from GwtMaterialDesign/release_1.5.2

Release 1.5.2
GwtMaterialDesign · Jun 30, 2016 · 4959bd8 · 4959bd8
2 parents 07ce83f + 47a271c
commit 4959bd8
Show file tree

Hide file tree

Showing 11 changed files with 70 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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
 <dependency>
     <groupId>com.github.gwtmaterialdesign</groupId>
     <artifactId>gwt-material-demo</artifactId>
-    <version>1.5.1</version>
+    <version>1.5.2</version>
 </dependency>
 ```
 

diff --git a/pom.xml b/pom.xml
@@ -4,14 +4,14 @@
     <parent>
         <artifactId>gwt-material-parent</artifactId>
         <groupId>com.github.gwtmaterialdesign</groupId>
-        <version>1.5.1</version>
+        <version>1.5.2</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>gwt-material-demo</artifactId>
     <packaging>war</packaging>
-    <version>1.5.1</version>
+    <version>1.5.2</version>
     <name>Gwt Material Demo</name>
     <description>Showcase for gwt-material</description>
 
@@ -34,7 +34,7 @@
         <gwt.version>2.7.0</gwt.version>
         <gwtp.version>1.5.3</gwtp.version>
         <gin.version>2.1.2</gin.version>
-        <gwt-material.version>1.5.1</gwt-material.version>
+        <gwt-material.version>1.5.2</gwt-material.version>
 
         <gwt.style>PRETTY</gwt.style>
 

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
@@ -50,6 +50,7 @@ public static List<Hero> getAllHeroes(){
 
     public static List<Version> getAllVersions() {
         List<Version> 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
@@ -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/...java/gwt/material/design/demo/client/application/gettingstarted/GettingStartedView.ui.xml b/...java/gwt/material/design/demo/client/application/gettingstarted/GettingStartedView.ui.xml
@@ -32,14 +32,14 @@
         &emsp;&lt;dependency><br/>
         &emsp;&lt;groupId>com.github.gwtmaterialdesign&lt;/groupId><br/>
         &emsp;&lt;artifactId>gwt-material&lt;/artifactId><br/>
-        &emsp;&lt;version>1.5.1&lt;/version><br/>
+        &emsp;&lt;version>1.5.2&lt;/version><br/>
         &lt;/dependency>
       </demo:PrettyPre>
     </m:MaterialPanel>
     <m:MaterialPanel>
       <m:MaterialTitle title="Download the JAR (Alternative)"
                        description="If you are not using maven you can download the latest Jar Release easily and add it in your classpath."/>
-      <m:MaterialButton ui:field="btnDownloadGWTMaterial" backgroundColor="blue" waves="LIGHT" iconType="FILE_DOWNLOAD" iconPosition="RIGHT" text="Download 1.5.1"/>
+      <m:MaterialButton ui:field="btnDownloadGWTMaterial" backgroundColor="blue" waves="LIGHT" iconType="FILE_DOWNLOAD" iconPosition="RIGHT" text="Download 1.5.2"/>
     </m:MaterialPanel>
 
     <m:MaterialTitle title="Wiki" description="A brief information about gwt-material using Github Wikis" />
@@ -94,6 +94,20 @@
       &lt;inherits name="gwt.material.design.themes.GwtMaterialThemeBlue"/&gt;
     </demo:PrettyPre>
 
+    <m:MaterialTitle description="Other Options : We have 10 color themes implemented on GMD" />
+    <demo:PrettyPre addStyleNames="lang-xml z-depth-1">
+      &emsp;&lt;inherits name="gwt.material.design.themes.GwtMaterialThemeAmber"/&gt;<br/>
+      &lt;inherits name="gwt.material.design.themes.GwtMaterialThemeBlue"/&gt;<br/>
+      &lt;inherits name="gwt.material.design.themes.GwtMaterialThemeBrown"/&gt;<br/>
+      &lt;inherits name="gwt.material.design.themes.GwtMaterialThemeGreen"/&gt;<br/>
+      &lt;inherits name="gwt.material.design.themes.GwtMaterialThemeGrey"/&gt;<br/>
+      &lt;inherits name="gwt.material.design.themes.GwtMaterialThemeOrange"/&gt;<br/>
+      &lt;inherits name="gwt.material.design.themes.GwtMaterialThemePink"/&gt;<br/>
+      &lt;inherits name="gwt.material.design.themes.GwtMaterialThemePurple"/&gt;<br/>
+      &lt;inherits name="gwt.material.design.themes.GwtMaterialThemeRed"/&gt;<br/>
+      &lt;inherits name="gwt.material.design.themes.GwtMaterialThemeYellow"/&gt;<br/>
+    </demo:PrettyPre>
+
     <m:MaterialPanel>
       <m:MaterialTitle title="Responsive Design" description="Add meta tag for responsive design on Mobile devices in your gwt-app.html" />
       <demo:PrettyPre addStyleNames="lang-xml z-depth-1">

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
@@ -92,7 +92,7 @@
 			</m.html:ListItem>
 			<m.html:ListItem waves="DEFAULT">
 				<m:MaterialLink targetHistoryToken="{tokens.getGettingstarted}" iconPosition="LEFT" iconType="CLOUD_DOWNLOAD" text="Getting Started" textColor="blue">
-					<m:MaterialBadge text="1.5.1" backgroundColor="blue" textColor="white"/>
+					<m:MaterialBadge text="1.5.2" backgroundColor="blue" textColor="white"/>
 				</m:MaterialLink>
 			</m.html:ListItem>
 			<m:MaterialCollapsible>

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
@@ -29,6 +29,31 @@
         }
     </ui:style>
     <m:MaterialRow>
+        <!-- 1.6.0 -->
+        <m:MaterialCard grid="s12 l8" offset="l2" >
+            <m:MaterialCardContent grid="s12 l3">
+                <m:MaterialCardTitle text="1.5.2" textColor="black"/>
+                <m:MaterialLabel textColor="grey" text="Ongoing"/>
+            </m:MaterialCardContent>
+            <m:MaterialCardAction grid="s12 l9" padding="12"  backgroundColor="grey lighten-3" addStyleNames="{style.horizontalCard}">
+                <m:MaterialPanel>
+                    <m:MaterialChip letter="A" letterColor="white" letterBackgroundColor="grey" text="Avatar" margin="4"/>
+                    <m:MaterialChip letter="R" letterColor="white" letterBackgroundColor="grey" text="Rating" margin="4"/>
+                </m:MaterialPanel>
+            </m:MaterialCardAction>
+        </m:MaterialCard>
+        <!-- 1.5.2 -->
+        <m:MaterialCard grid="s12 l8" offset="l2" >
+            <m:MaterialCardContent grid="s12 l3">
+                <m:MaterialCardTitle text="1.5.2" textColor="black"/>
+                <m:MaterialLabel textColor="grey" text="June 2016"/>
+            </m:MaterialCardContent>
+            <m:MaterialCardAction grid="s12 l9" padding="12"  backgroundColor="grey lighten-3" addStyleNames="{style.horizontalCard}">
+                <m:MaterialPanel>
+                    <m:MaterialChip letter="B" letterColor="white" letterBackgroundColor="red" text="1.5.1 Bug Fixes" margin="4"/>
+                </m:MaterialPanel>
+            </m:MaterialCardAction>
+        </m:MaterialCard>
         <!-- 1.5.1 -->
         <m:MaterialCard grid="s12 l8" offset="l2" >
             <m:MaterialCardContent grid="s12 l3">

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
@@ -37,5 +37,19 @@
     <demo:PrettyPre addStyleNames="lang-xml z-depth-1">
       &lt;inherits name="gwt.material.design.themes.GwtMaterialThemeBlue"/&gt;
     </demo:PrettyPre>
+
+    <m:MaterialTitle description="Other Options : We have 10 color themes implemented on GMD" />
+    <demo:PrettyPre addStyleNames="lang-xml z-depth-1">
+      &emsp;&lt;inherits name="gwt.material.design.themes.GwtMaterialThemeAmber"/&gt;<br/>
+      &lt;inherits name="gwt.material.design.themes.GwtMaterialThemeBlue"/&gt;<br/>
+      &lt;inherits name="gwt.material.design.themes.GwtMaterialThemeBrown"/&gt;<br/>
+      &lt;inherits name="gwt.material.design.themes.GwtMaterialThemeGreen"/&gt;<br/>
+      &lt;inherits name="gwt.material.design.themes.GwtMaterialThemeGrey"/&gt;<br/>
+      &lt;inherits name="gwt.material.design.themes.GwtMaterialThemeOrange"/&gt;<br/>
+      &lt;inherits name="gwt.material.design.themes.GwtMaterialThemePink"/&gt;<br/>
+      &lt;inherits name="gwt.material.design.themes.GwtMaterialThemePurple"/&gt;<br/>
+      &lt;inherits name="gwt.material.design.themes.GwtMaterialThemeRed"/&gt;<br/>
+      &lt;inherits name="gwt.material.design.themes.GwtMaterialThemeYellow"/&gt;<br/>
+    </demo:PrettyPre>
   </g:HTMLPanel>
 </ui:UiBinder>
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
@@ -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