Skip to content

Commit b2a8942

Browse files
kevzlou7979kevzlou7979
committed
Preparation for 2.0-rc3
1 parent 6fef5b5 commit b2a8942

File tree

8 files changed

+34
-15
lines changed

8 files changed

+34
-15
lines changed

‎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 2.0-rc2 Demo
5+
### Release 2.0-rc3 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>2.0-rc2</version>
11+
<version>2.0-rc3</version>
1212
</dependency>
1313
```
1414

‎pom.xml‎

Lines changed: 4 additions & 4 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-rc3</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-rc3</version>
1515
<name>Gwt Material Demo</name>
1616
<description>Showcase for gwt-material</description>
1717

@@ -34,8 +34,8 @@
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>
38-
<gwt-material-table.version>1.0-SNAPSHOT</gwt-material-table.version>
37+
<gwt-material.version>2.0-rc3</gwt-material.version>
38+
<gwt-material-table.version>1.0-rc3</gwt-material-table.version>
3939

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

‎src/main/java/gwt/material/design/demo/client/application/components/loader/LoaderView.ui.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
<m:MaterialTitle title="NavBar Integration" description="Using the progress we can attach it below the nav for better UI / UX when displaying important content on your app."/>
104104
<m:MaterialButton text="Show Progress" ui:field="btnShowNavBarProgress" addStyleNames="{style.btn}"/>
105105
<m:MaterialNavBar ui:field="navBar" addStyleNames="{style.navBar}" width="100%">
106-
<m:MaterialNavBrand href="#Test" float="LEFT">Title</m:MaterialNavBrand>
106+
<m:MaterialNavBrand marginLeft="60" href="#Test" float="LEFT">Title</m:MaterialNavBrand>
107107
<m:MaterialNavSection float="RIGHT">
108108
<m:MaterialLink iconType="ACCOUNT_CIRCLE" iconPosition="LEFT" text="Account" textColor="WHITE" waves="LIGHT"/>
109109
<m:MaterialLink iconType="AUTORENEW" iconPosition="LEFT" text="Refresh" textColor="WHITE" waves="LIGHT"/>

‎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-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));
5657
versions.add(new Version("2.0-rc2", "November 2016", Version.VersionLink.CORE_2_0_RC2.getName(), Version.VersionLink.ADDINS_2_0_RC2.getName(), Version.VersionLink.THEME_2_0_RC2.getName(), Version.VersionLink.JQUERY_1_0_RC2.getName(), Version.VersionLink.TABLE_1_0_RC2.getName(), Color.GREEN));
5758
versions.add(new Version("2.0-rc1", "October 2016", Version.VersionLink.CORE_2_0_RC1.getName(), Version.VersionLink.ADDINS_2_0_RC1.getName(), Version.VersionLink.THEME_2_0_RC1.getName(), Version.VersionLink.JQUERY_1_0_RC1.getName(), Version.VersionLink.TABLE_1_0_RC1.getName(), Color.GREEN));
5859
versions.add(new Version("1.6.2", "September 2016", Version.VersionLink.CORE_1_6_2.getName(), Version.VersionLink.ADDINS_1_6_2.getName(), null, null, null, Color.AMBER_DARKEN_2));

‎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_RC3("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material/2.0-rc3"),
3738
CORE_2_0_RC2("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material/2.0-rc2"),
3839
CORE_2_0_RC1("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material/2.0-rc1"),
3940
CORE_1_6_2("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material/1.6.2"),
@@ -60,6 +61,7 @@ public enum VersionLink{
6061
THEME_1_6_0("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-themes/1.6.0"),
6162
THEME_2_0_RC1("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-themes/2.0-rc1"),
6263
THEME_2_0_RC2("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-themes/2.0-rc2"),
64+
THEME_2_0_RC3("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-themes/2.0-rc3"),
6365

6466
// FOR gwt-material Addins
6567
ADDINS_1_5_0("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-addins/1.5.0"),
@@ -69,14 +71,17 @@ public enum VersionLink{
6971
ADDINS_1_6_2("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-addins/1.6.2"),
7072
ADDINS_2_0_RC1("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-addins/2.0-rc1"),
7173
ADDINS_2_0_RC2("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-addins/2.0-rc2"),
74+
ADDINS_2_0_RC3("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-addins/2.0-rc3"),
7275

7376
// FOR gwt-material JQuery
7477
JQUERY_1_0_RC1("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-jquery/1.0-rc1"),
7578
JQUERY_1_0_RC2("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-jquery/1.0-rc2"),
79+
JQUERY_1_0_RC3("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-jquery/1.0-rc3"),
7680

7781
// FOR gwt-material Table
7882
TABLE_1_0_RC1("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-table/1.0-rc1"),
79-
TABLE_1_0_RC2("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-table/1.0-rc2");
83+
TABLE_1_0_RC2("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-table/1.0-rc2"),
84+
TABLE_1_0_RC3("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-table/1.0-rc3");
8085

8186
String name;
8287
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-rc2
33+
&emsp;mvn archetype:generate -DarchetypeGroupId=com.github.gwtmaterialdesign -DarchetypeArtifactId=gwt-material-archetype -DarchetypeVersion=2.0-rc3
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-rc2&lt;/version><br/>
45+
&emsp;&lt;version>2.0-rc3&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-rc2&lt;/version><br/>
55+
&emsp;&lt;version>2.0-rc3&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-rc2&lt;/version><br/>
65+
&emsp;&lt;version>2.0-rc3&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-rc2&lt;/version><br/>
76+
&emsp;&lt;version>1.0-rc3&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-rc2&lt;/version><br/>
87+
&emsp;&lt;version>1.0-rc3&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
@@ -99,7 +99,7 @@
9999
</m.html:ListItem>
100100
<m.html:ListItem waves="DEFAULT">
101101
<m:MaterialLink targetHistoryToken="{tokens.getGettingstarted}" iconPosition="LEFT" iconType="CLOUD_DOWNLOAD" text="Getting Started">
102-
<m:MaterialBadge text="2.0-rc2" textColor="WHITE"/>
102+
<m:MaterialBadge text="2.0-rc3" textColor="WHITE"/>
103103
</m:MaterialLink>
104104
</m.html:ListItem>
105105
<m:MaterialCollapsible>

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,19 @@
2929
}
3030
</ui:style>
3131
<m:MaterialRow marginTop="60">
32+
<!-- 2.0-rc3 -->
33+
<m:MaterialCard grid="s12 l8" offset="l2" >
34+
<m:MaterialCardContent grid="s12 l3">
35+
<m:MaterialCardTitle text="2.0-rc3" textColor="BLACK"/>
36+
<m:MaterialLabel textColor="GREY" text="November 2016"/>
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="P" letterColor="WHITE" letterBackgroundColor="RED" text="Performance Improvement on Addins" margin="4"/>
42+
</m:MaterialPanel>
43+
</m:MaterialCardAction>
44+
</m:MaterialCard>
3245
<!-- 2.0-rc2 -->
3346
<m:MaterialCard grid="s12 l8" offset="l2" >
3447
<m:MaterialCardContent grid="s12 l3">

0 commit comments

Comments
 (0)