Skip to content

Commit 7adee7b

Browse files
kevzlou7979kevzlou7979
committed
Preparation for 2.0-rc5 release.
1 parent 09bc424 commit 7adee7b

File tree

8 files changed

+48
-21
lines changed

8 files changed

+48
-21
lines changed

‎README.md‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
11
<img src="http://i.imgur.com/EL4vCgx.png"/>
2-
#gwt-material-demo [![Build Status](https://travis-ci.org/GwtMaterialDesign/gwt-material-demo.svg?branch=master)](https://travis-ci.org/GwtMaterialDesign/gwt-material-demo)
2+
3+
#gwt-material-demo
4+
5+
[![Build Status](https://travis-ci.org/GwtMaterialDesign/gwt-material-demo.svg?branch=master)](https://travis-ci.org/GwtMaterialDesign/gwt-material-demo)
6+
37
Demo application to show the features of the [gwt-material](https://github.com/GwtMaterialDesign/gwt-material) library.
48

5-
### Release 2.0-rc4 Demo
9+
### Release 2.0-rc5 Demo
610
[http://gwtmaterialdesign.github.io/gwt-material-demo](http://gwtmaterialdesign.github.io/gwt-material-demo)
711
```xml
812
<dependency>
913
<groupId>com.github.gwtmaterialdesign</groupId>
1014
<artifactId>gwt-material-demo</artifactId>
11-
<version>2.0-rc4</version>
15+
<version>2.0-rc5</version>
1216
</dependency>
1317
```
1418

‎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>2.0-SNAPSHOT</version>
7+
<version>2.0-rc5</version>
88
</parent>
99

1010
<modelVersion>4.0.0</modelVersion>
1111

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

@@ -34,7 +34,7 @@
3434
<gwt.version>2.8.0</gwt.version>
3535
<gwtp.version>1.5.3</gwtp.version>
3636
<gin.version>2.1.2</gin.version>
37-
<gwt-material.version>2.0-SNAPSHOT</gwt-material.version>
37+
<gwt-material.version>2.0-rc5</gwt-material.version>
3838

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

‎src/main/java/gwt/material/design/demo/client/application/animations/core/CoreAnimationsView.ui.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
<demo:PrettyPre addStyleNames="lang-java">
4141
&emsp;MaterialAnimation animation = new MaterialAnimation();<br/>
4242
animation.setTransition(transition);<br/>
43-
animation.setDelayMillis(0);<br/>
44-
animation.setDurationMillis(1000);<br/>
43+
animation.setDelay(0);<br/>
44+
animation.setDuration(1000);<br/>
4545
animation.setInfinite(false);<br/>
4646
animation.animate(card);
4747
</demo:PrettyPre>
@@ -68,8 +68,8 @@
6868
<demo:PrettyPre addStyleNames="lang-java">
6969
&emsp;MaterialAnimation infiniteAnimation = new MaterialAnimation();<br/>
7070
infiniteAnimation.setTransition(Transition.PULSE);<br/>
71-
infiniteAnimation.setDelayMillis(0);<br/>
72-
infiniteAnimation.setDurationMillis(1000);<br/>
71+
infiniteAnimation.setDelay(0);<br/>
72+
infiniteAnimation.setDuration(1000);<br/>
7373
infiniteAnimation.setInfinite(true);<br/>
7474
infiniteAnimation.animate(iconHeart);<br/><br/>
7575
// To stop the infinite animation <br/>
@@ -88,8 +88,8 @@
8888
<m:MaterialColumn>
8989
<demo:PrettyPre addStyleNames="lang-java">
9090
&emsp;MaterialAnimation animation = new MaterialAnimation();<br/>
91-
animation.setDelayMillis(0);<br/>
92-
animation.setDurationMillis(1000);<br/>
91+
animation.setDelay(0);<br/>
92+
animation.setDuration(1000);<br/>
9393
animation.transition(Transition.FLIPINX);<br/>
9494
animation.animate(iconCallback, () -> {<br/>
9595
&emsp;MaterialToast.fireToast("Animation is finished");<br/>

‎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
@@ -53,6 +53,7 @@ public static List<Hero> getAllHeroes(){
5353

5454
public static List<Version> getAllVersions() {
5555
List<Version> versions = new ArrayList<>();
56+
versions.add(new Version("2.0-rc5", "May 2017", Version.VersionLink.CORE_2_0_RC5.getName(), Version.VersionLink.ADDINS_2_0_RC5.getName(), Version.VersionLink.THEME_2_0_RC5.getName(), Version.VersionLink.JQUERY_2_0_RC5.getName(), Version.VersionLink.TABLE_2_0_RC5.getName(), Color.GREEN));
5657
versions.add(new Version("2.0-rc4", "March 2017", Version.VersionLink.CORE_2_0_RC4.getName(), Version.VersionLink.ADDINS_2_0_RC4.getName(), Version.VersionLink.THEME_2_0_RC4.getName(), Version.VersionLink.JQUERY_1_0_RC4.getName(), Version.VersionLink.TABLE_1_0_RC4.getName(), Color.GREEN));
5758
versions.add(new Version("2.0-rc3", "November 2016", Version.VersionLink.CORE_2_0_RC3.getName(), Version.VersionLink.ADDINS_2_0_RC3.getName(), Version.VersionLink.THEME_2_0_RC3.getName(), Version.VersionLink.JQUERY_1_0_RC3.getName(), Version.VersionLink.TABLE_1_0_RC3.getName(), Color.GREEN));
5859
versions.add(new Version("2.0-rc3", "November 2016", Version.VersionLink.CORE_2_0_RC3.getName(), Version.VersionLink.ADDINS_2_0_RC3.getName(), Version.VersionLink.THEME_2_0_RC3.getName(), Version.VersionLink.JQUERY_1_0_RC3.getName(), Version.VersionLink.TABLE_1_0_RC3.getName(), Color.GREEN));

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ public class Version implements Serializable {
3434
public enum VersionLink{
3535

3636
// FOR gwt-material Core
37+
CORE_2_0_RC5("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material/2.0-rc5"),
3738
CORE_2_0_RC4("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material/2.0-rc4"),
3839
CORE_2_0_RC3("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material/2.0-rc3"),
3940
CORE_2_0_RC2("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material/2.0-rc2"),
@@ -64,6 +65,7 @@ public enum VersionLink{
6465
THEME_2_0_RC2("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-themes/2.0-rc2"),
6566
THEME_2_0_RC3("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-themes/2.0-rc3"),
6667
THEME_2_0_RC4("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-themes/2.0-rc4"),
68+
THEME_2_0_RC5("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-themes/2.0-rc5"),
6769

6870
// FOR gwt-material Addins
6971
ADDINS_1_5_0("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-addins/1.5.0"),
@@ -75,18 +77,21 @@ public enum VersionLink{
7577
ADDINS_2_0_RC2("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-addins/2.0-rc2"),
7678
ADDINS_2_0_RC3("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-addins/2.0-rc3"),
7779
ADDINS_2_0_RC4("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-addins/2.0-rc4"),
80+
ADDINS_2_0_RC5("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-addins/2.0-rc5"),
7881

7982
// FOR gwt-material JQuery
8083
JQUERY_1_0_RC1("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-jquery/1.0-rc1"),
8184
JQUERY_1_0_RC2("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-jquery/1.0-rc2"),
8285
JQUERY_1_0_RC3("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-jquery/1.0-rc3"),
8386
JQUERY_1_0_RC4("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-jquery/1.0-rc4"),
87+
JQUERY_2_0_RC5("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-jquery/2.0-rc5"),
8488

8589
// FOR gwt-material Table
8690
TABLE_1_0_RC1("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-table/1.0-rc1"),
8791
TABLE_1_0_RC2("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-table/1.0-rc2"),
8892
TABLE_1_0_RC3("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-table/1.0-rc3"),
89-
TABLE_1_0_RC4("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-table/1.0-rc4");
93+
TABLE_1_0_RC4("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-table/1.0-rc4"),
94+
TABLE_2_0_RC5("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-table/2.0-rc5");
9095

9196
String name;
9297
VersionLink(String name) {

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<m:MaterialPanel addStyleNames="code">
3131
<m:MaterialTitle title="Setup using Maven Archetype" description="Run this project into cmd / terminal, just follow the prompts. Then once you're done open your project on Eclipse / Intelij IDEA.Gwt-material-archetype provides a faster way to create a GMD Project. You can also watch at the very bottom of this page about the real time procedure."/>
3232
<demo:PrettyPre addStyleNames="lang-xml-1">
33-
&emsp;mvn archetype:generate -DarchetypeGroupId=com.github.gwtmaterialdesign -DarchetypeArtifactId=gwt-material-archetype -DarchetypeVersion=2.0-rc4
33+
&emsp;mvn archetype:generate -DarchetypeGroupId=com.github.gwtmaterialdesign -DarchetypeArtifactId=gwt-material-archetype -DarchetypeVersion=2.0-rc5
3434
</demo:PrettyPre>
3535
</m:MaterialPanel>
3636
<m:MaterialPanel addStyleNames="code">
@@ -42,7 +42,7 @@
4242
&emsp;&lt;dependency><br/>
4343
&emsp;&lt;groupId>com.github.gwtmaterialdesign&lt;/groupId><br/>
4444
&emsp;&lt;artifactId>gwt-material&lt;/artifactId><br/>
45-
&emsp;&lt;version>2.0-rc4&lt;/version><br/>
45+
&emsp;&lt;version>2.0-rc5&lt;/version><br/>
4646
&lt;/dependency>
4747
</demo:PrettyPre>
4848
<m:MaterialRow>
@@ -52,7 +52,7 @@
5252
&emsp;&lt;dependency><br/>
5353
&emsp;&lt;groupId>com.github.gwtmaterialdesign&lt;/groupId><br/>
5454
&emsp;&lt;artifactId>gwt-material-addins&lt;/artifactId><br/>
55-
&emsp;&lt;version>2.0-rc4&lt;/version><br/>
55+
&emsp;&lt;version>2.0-rc5&lt;/version><br/>
5656
&lt;/dependency>
5757
</demo:PrettyPre>
5858
<m:MaterialRow>
@@ -62,7 +62,7 @@
6262
&emsp;&lt;dependency><br/>
6363
&emsp;&lt;groupId>com.github.gwtmaterialdesign&lt;/groupId><br/>
6464
&emsp;&lt;artifactId>gwt-material-themes&lt;/artifactId><br/>
65-
&emsp;&lt;version>2.0-rc4&lt;/version><br/>
65+
&emsp;&lt;version>2.0-rc5&lt;/version><br/>
6666
&lt;/dependency>
6767
</demo:PrettyPre>
6868

@@ -73,7 +73,7 @@
7373
&emsp;&lt;dependency><br/>
7474
&emsp;&lt;groupId>com.github.gwtmaterialdesign&lt;/groupId><br/>
7575
&emsp;&lt;artifactId>gwt-material-jquery&lt;/artifactId><br/>
76-
&emsp;&lt;version>1.0-rc4&lt;/version><br/>
76+
&emsp;&lt;version>1.0-rc5&lt;/version><br/>
7777
&lt;/dependency>
7878
</demo:PrettyPre>
7979

@@ -84,7 +84,7 @@
8484
&emsp;&lt;dependency><br/>
8585
&emsp;&lt;groupId>com.github.gwtmaterialdesign&lt;/groupId><br/>
8686
&emsp;&lt;artifactId>gwt-material-table&lt;/artifactId><br/>
87-
&emsp;&lt;version>1.0-rc4&lt;/version><br/>
87+
&emsp;&lt;version>1.0-rc5&lt;/version><br/>
8888
&lt;/dependency>
8989
</demo:PrettyPre>
9090
</m:MaterialPanel>

‎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
@@ -82,7 +82,7 @@
8282
</m.html:ListItem>
8383
<m.html:ListItem waves="DEFAULT">
8484
<m:MaterialLink targetHistoryToken="{tokens.getGettingstarted}" iconPosition="LEFT" iconType="CLOUD_DOWNLOAD" text="Getting Started">
85-
<m:MaterialBadge text="2.0-rc4" textColor="WHITE"/>
85+
<m:MaterialBadge text="2.0-rc5" textColor="WHITE"/>
8686
</m:MaterialLink>
8787
</m.html:ListItem>
8888
<m:MaterialCollapsible>

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

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,24 @@
2929
}
3030
</ui:style>
3131
<m:MaterialRow marginTop="60">
32-
<!-- 2.0-rc3 -->
32+
<!-- 2.0-rc5 -->
33+
<m:MaterialCard grid="s12 l8" offset="l2" >
34+
<m:MaterialCardContent grid="s12 l3">
35+
<m:MaterialCardTitle text="2.0-rc5" textColor="BLACK"/>
36+
<m:MaterialLabel textColor="GREY" text="May 2017"/>
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="B" letterColor="WHITE" letterBackgroundColor="RED" text="Bug Fixes" margin="4"/>
41+
<m:MaterialChip letter="T" letterColor="WHITE" letterBackgroundColor="GREEN" text="Transition Duration" margin="4"/>
42+
<m:MaterialChip letter="M" letterColor="WHITE" letterBackgroundColor="GREEN" text="MD Spec" margin="4"/>
43+
<m:MaterialChip letter="B" letterColor="WHITE" letterBackgroundColor="GREEN" text="BluePrint" margin="4"/>
44+
<m:MaterialChip letter="S" letterColor="WHITE" letterBackgroundColor="GREEN" text="SideNav 2.0" margin="4"/>
45+
<m:MaterialChip letter="N" letterColor="WHITE" letterBackgroundColor="GREEN" text="NavBar 2.0" margin="4"/>
46+
</m:MaterialPanel>
47+
</m:MaterialCardAction>
48+
</m:MaterialCard>
49+
<!-- 2.0-rc4 -->
3350
<m:MaterialCard grid="s12 l8" offset="l2" >
3451
<m:MaterialCardContent grid="s12 l3">
3552
<m:MaterialCardTitle text="2.0-rc4" textColor="BLACK"/>

0 commit comments

Comments
 (0)