Skip to content

Commit 4959bd8

Browse files
kevzlou7979kevzlou7979
authored
Merge pull request #20 from GwtMaterialDesign/release_1.5.2
Release 1.5.2
2 parents 07ce83f + 47a271c commit 4959bd8

File tree

11 files changed

+70
-13
lines changed

11 files changed

+70
-13
lines changed

‎.travis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ cache:
77
- $HOME/.m2
88
before_install:
99
# install the gwt-material library before we build the demo
10-
- git clone -b release_1.5.1 https://github.com/GwtMaterialDesign/gwt-material.git
10+
- git clone -b release_1.5.2 https://github.com/GwtMaterialDesign/gwt-material.git
1111
- cd gwt-material
1212
- mvn install -DskipTests=true -DdryRun=true
1313
- cd ..
@@ -17,7 +17,7 @@ before_install:
1717
- mvn install -DskipTests=true -DdryRun=true
1818
- cd ..
1919
# install the gwt-material-addins library
20-
- git clone -b release_1.5.1 https://github.com/GwtMaterialDesign/gwt-material-addins.git
20+
- git clone -b release_1.5.2 https://github.com/GwtMaterialDesign/gwt-material-addins.git
2121
- cd gwt-material-addins
2222
- mvn install -DskipTests=true -DdryRun=true
2323
- cd ..

‎.utility/update_demo_site.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
set -ev
3-
if [ "$TRAVIS_JDK_VERSION" == "oraclejdk7" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "master" ]; then
3+
if [ "$TRAVIS_JDK_VERSION" == "oraclejdk7" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "release_1.5.2" ]; then
44

55
if [[ -z "$GH_TOKEN" ]]; then
66
echo -e "GH_TOKEN is not set"

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
#gwt-material-demo [![Build Status](https://travis-ci.org/GwtMaterialDesign/gwt-material-demo.svg?branch=master)](https://travis-ci.org/GwtMaterialDesign/gwt-material-demo)
33
Demo application to show the features of the [gwt-material](https://github.com/GwtMaterialDesign/gwt-material) library.
44

5-
### Release 1.5.1 Demo
5+
### Release 1.5.2 Demo
66
[http://gwtmaterialdesign.github.io/gwt-material-demo](http://gwtmaterialdesign.github.io/gwt-material-demo)
77
```xml
88
<dependency>
99
<groupId>com.github.gwtmaterialdesign</groupId>
1010
<artifactId>gwt-material-demo</artifactId>
11-
<version>1.5.1</version>
11+
<version>1.5.2</version>
1212
</dependency>
1313
```
1414

‎pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
<parent>
55
<artifactId>gwt-material-parent</artifactId>
66
<groupId>com.github.gwtmaterialdesign</groupId>
7-
<version>1.5.1</version>
7+
<version>1.5.2</version>
88
</parent>
99

1010
<modelVersion>4.0.0</modelVersion>
1111

1212
<artifactId>gwt-material-demo</artifactId>
1313
<packaging>war</packaging>
14-
<version>1.5.1</version>
14+
<version>1.5.2</version>
1515
<name>Gwt Material Demo</name>
1616
<description>Showcase for gwt-material</description>
1717

@@ -34,7 +34,7 @@
3434
<gwt.version>2.7.0</gwt.version>
3535
<gwtp.version>1.5.3</gwtp.version>
3636
<gin.version>2.1.2</gin.version>
37-
<gwt-material.version>1.5.1</gwt-material.version>
37+
<gwt-material.version>1.5.2</gwt-material.version>
3838

3939
<gwt.style>PRETTY</gwt.style>
4040

‎src/main/java/gwt/material/design/demo/client/application/dto/DataHelper.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ public static List<Hero> getAllHeroes(){
5050

5151
public static List<Version> getAllVersions() {
5252
List<Version> versions = new ArrayList<>();
53+
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"));
5354
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"));
5455
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"));
5556
versions.add(new Version("1.4.1", "January 2016", Version.VersionLink.CORE_1_4_1.getName(), null, Version.VersionLink.THEME_1_4.getName(), "red"));

‎src/main/java/gwt/material/design/demo/client/application/dto/Version.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ public class Version implements Serializable {
3232
public enum VersionLink{
3333

3434
// FOR gwt-material Core
35+
CORE_1_5_2("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material/1.5.2"),
3536
CORE_1_5_1("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material/1.5.1"),
3637
CORE_1_5_0("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material/1.5.0"),
3738
CORE_1_4_1("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material/1.4.1"),
@@ -47,10 +48,12 @@ public enum VersionLink{
4748
THEME_1_4("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-themes/1.4"),
4849
THEME_1_5_0("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-themes/1.5.0"),
4950
THEME_1_5_1("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-themes/1.5.1"),
51+
THEME_1_5_2("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-themes/1.5.2"),
5052

5153
// FOR gwt-material Addins
5254
ADDINS_1_5_0("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-addins/1.5.0"),
53-
ADDINS_1_5_1("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-addins/1.5.1");
55+
ADDINS_1_5_1("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-addins/1.5.1"),
56+
ADDINS_1_5_2("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-addins/1.5.2");
5457

5558
String name;
5659
VersionLink(String name) {

‎src/main/java/gwt/material/design/demo/client/application/gettingstarted/GettingStartedView.ui.xml‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@
3232
&emsp;&lt;dependency><br/>
3333
&emsp;&lt;groupId>com.github.gwtmaterialdesign&lt;/groupId><br/>
3434
&emsp;&lt;artifactId>gwt-material&lt;/artifactId><br/>
35-
&emsp;&lt;version>1.5.1&lt;/version><br/>
35+
&emsp;&lt;version>1.5.2&lt;/version><br/>
3636
&lt;/dependency>
3737
</demo:PrettyPre>
3838
</m:MaterialPanel>
3939
<m:MaterialPanel>
4040
<m:MaterialTitle title="Download the JAR (Alternative)"
4141
description="If you are not using maven you can download the latest Jar Release easily and add it in your classpath."/>
42-
<m:MaterialButton ui:field="btnDownloadGWTMaterial" backgroundColor="blue" waves="LIGHT" iconType="FILE_DOWNLOAD" iconPosition="RIGHT" text="Download 1.5.1"/>
42+
<m:MaterialButton ui:field="btnDownloadGWTMaterial" backgroundColor="blue" waves="LIGHT" iconType="FILE_DOWNLOAD" iconPosition="RIGHT" text="Download 1.5.2"/>
4343
</m:MaterialPanel>
4444

4545
<m:MaterialTitle title="Wiki" description="A brief information about gwt-material using Github Wikis" />
@@ -94,6 +94,20 @@
9494
&lt;inherits name="gwt.material.design.themes.GwtMaterialThemeBlue"/&gt;
9595
</demo:PrettyPre>
9696

97+
<m:MaterialTitle description="Other Options : We have 10 color themes implemented on GMD" />
98+
<demo:PrettyPre addStyleNames="lang-xml z-depth-1">
99+
&emsp;&lt;inherits name="gwt.material.design.themes.GwtMaterialThemeAmber"/&gt;<br/>
100+
&lt;inherits name="gwt.material.design.themes.GwtMaterialThemeBlue"/&gt;<br/>
101+
&lt;inherits name="gwt.material.design.themes.GwtMaterialThemeBrown"/&gt;<br/>
102+
&lt;inherits name="gwt.material.design.themes.GwtMaterialThemeGreen"/&gt;<br/>
103+
&lt;inherits name="gwt.material.design.themes.GwtMaterialThemeGrey"/&gt;<br/>
104+
&lt;inherits name="gwt.material.design.themes.GwtMaterialThemeOrange"/&gt;<br/>
105+
&lt;inherits name="gwt.material.design.themes.GwtMaterialThemePink"/&gt;<br/>
106+
&lt;inherits name="gwt.material.design.themes.GwtMaterialThemePurple"/&gt;<br/>
107+
&lt;inherits name="gwt.material.design.themes.GwtMaterialThemeRed"/&gt;<br/>
108+
&lt;inherits name="gwt.material.design.themes.GwtMaterialThemeYellow"/&gt;<br/>
109+
</demo:PrettyPre>
110+
97111
<m:MaterialPanel>
98112
<m:MaterialTitle title="Responsive Design" description="Add meta tag for responsive design on Mobile devices in your gwt-app.html" />
99113
<demo:PrettyPre addStyleNames="lang-xml z-depth-1">

‎src/main/java/gwt/material/design/demo/client/application/menu/MenuView.ui.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
</m.html:ListItem>
9393
<m.html:ListItem waves="DEFAULT">
9494
<m:MaterialLink targetHistoryToken="{tokens.getGettingstarted}" iconPosition="LEFT" iconType="CLOUD_DOWNLOAD" text="Getting Started" textColor="blue">
95-
<m:MaterialBadge text="1.5.1" backgroundColor="blue" textColor="white"/>
95+
<m:MaterialBadge text="1.5.2" backgroundColor="blue" textColor="white"/>
9696
</m:MaterialLink>
9797
</m.html:ListItem>
9898
<m:MaterialCollapsible>

‎src/main/java/gwt/material/design/demo/client/application/roadmap/RoadMapView.ui.xml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,31 @@
2929
}
3030
</ui:style>
3131
<m:MaterialRow>
32+
<!-- 1.6.0 -->
33+
<m:MaterialCard grid="s12 l8" offset="l2" >
34+
<m:MaterialCardContent grid="s12 l3">
35+
<m:MaterialCardTitle text="1.5.2" textColor="black"/>
36+
<m:MaterialLabel textColor="grey" text="Ongoing"/>
37+
</m:MaterialCardContent>
38+
<m:MaterialCardAction grid="s12 l9" padding="12" backgroundColor="grey lighten-3" addStyleNames="{style.horizontalCard}">
39+
<m:MaterialPanel>
40+
<m:MaterialChip letter="A" letterColor="white" letterBackgroundColor="grey" text="Avatar" margin="4"/>
41+
<m:MaterialChip letter="R" letterColor="white" letterBackgroundColor="grey" text="Rating" margin="4"/>
42+
</m:MaterialPanel>
43+
</m:MaterialCardAction>
44+
</m:MaterialCard>
45+
<!-- 1.5.2 -->
46+
<m:MaterialCard grid="s12 l8" offset="l2" >
47+
<m:MaterialCardContent grid="s12 l3">
48+
<m:MaterialCardTitle text="1.5.2" textColor="black"/>
49+
<m:MaterialLabel textColor="grey" text="June 2016"/>
50+
</m:MaterialCardContent>
51+
<m:MaterialCardAction grid="s12 l9" padding="12" backgroundColor="grey lighten-3" addStyleNames="{style.horizontalCard}">
52+
<m:MaterialPanel>
53+
<m:MaterialChip letter="B" letterColor="white" letterBackgroundColor="red" text="1.5.1 Bug Fixes" margin="4"/>
54+
</m:MaterialPanel>
55+
</m:MaterialCardAction>
56+
</m:MaterialCard>
3257
<!-- 1.5.1 -->
3358
<m:MaterialCard grid="s12 l8" offset="l2" >
3459
<m:MaterialCardContent grid="s12 l3">

‎src/main/java/gwt/material/design/demo/client/application/style/themes/ThemesView.ui.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,19 @@
3737
<demo:PrettyPre addStyleNames="lang-xml z-depth-1">
3838
&lt;inherits name="gwt.material.design.themes.GwtMaterialThemeBlue"/&gt;
3939
</demo:PrettyPre>
40+
41+
<m:MaterialTitle description="Other Options : We have 10 color themes implemented on GMD" />
42+
<demo:PrettyPre addStyleNames="lang-xml z-depth-1">
43+
&emsp;&lt;inherits name="gwt.material.design.themes.GwtMaterialThemeAmber"/&gt;<br/>
44+
&lt;inherits name="gwt.material.design.themes.GwtMaterialThemeBlue"/&gt;<br/>
45+
&lt;inherits name="gwt.material.design.themes.GwtMaterialThemeBrown"/&gt;<br/>
46+
&lt;inherits name="gwt.material.design.themes.GwtMaterialThemeGreen"/&gt;<br/>
47+
&lt;inherits name="gwt.material.design.themes.GwtMaterialThemeGrey"/&gt;<br/>
48+
&lt;inherits name="gwt.material.design.themes.GwtMaterialThemeOrange"/&gt;<br/>
49+
&lt;inherits name="gwt.material.design.themes.GwtMaterialThemePink"/&gt;<br/>
50+
&lt;inherits name="gwt.material.design.themes.GwtMaterialThemePurple"/&gt;<br/>
51+
&lt;inherits name="gwt.material.design.themes.GwtMaterialThemeRed"/&gt;<br/>
52+
&lt;inherits name="gwt.material.design.themes.GwtMaterialThemeYellow"/&gt;<br/>
53+
</demo:PrettyPre>
4054
</g:HTMLPanel>
4155
</ui:UiBinder>

0 commit comments

Comments
 (0)