Skip to content

Commit e4ffa03

Browse files
kevzlou7979kevzlou7979
committed
Preparation for 2.0-rc7 release.
1 parent 073b7a2 commit e4ffa03

File tree

7 files changed

+52
-13
lines changed

7 files changed

+52
-13
lines changed

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66

77
Demo application to show the features of the [gwt-material](https://github.com/GwtMaterialDesign/gwt-material) library.
88

9-
### Release 2.0-rc6 Demo
9+
### Release 2.0-rc7 Demo
1010
[http://gwtmaterialdesign.github.io/gwt-material-demo](http://gwtmaterialdesign.github.io/gwt-material-demo)
1111
```xml
1212
<dependency>
1313
<groupId>com.github.gwtmaterialdesign</groupId>
1414
<artifactId>gwt-material-demo</artifactId>
15-
<version>2.0-rc6</version>
15+
<version>2.0-rc7</version>
1616
</dependency>
1717
```
1818

‎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-rc7</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-rc7</version>
1515
<name>Gwt Material Demo</name>
1616
<description>Showcase for gwt-material</description>
1717

@@ -34,7 +34,7 @@
3434
<gwt.version>2.8.1</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-rc7</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
@@ -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-rc7", "October 2017", Version.VersionLink.CORE_2_0_RC7.getName(), Version.VersionLink.ADDINS_2_0_RC7.getName(), Version.VersionLink.THEME_2_0_RC7.getName(), Version.VersionLink.JQUERY_2_0_RC7.getName(), Version.VersionLink.TABLE_2_0_RC7.getName(), Color.GREEN));
5657
versions.add(new Version("2.0-rc6", "July 2017", Version.VersionLink.CORE_2_0_RC6.getName(), Version.VersionLink.ADDINS_2_0_RC6.getName(), Version.VersionLink.THEME_2_0_RC6.getName(), Version.VersionLink.JQUERY_2_0_RC6.getName(), Version.VersionLink.TABLE_2_0_RC6.getName(), Color.GREEN));
5758
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));
5859
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));

‎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_RC7("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material/2.0-rc7"),
3738
CORE_2_0_RC6("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material/2.0-rc6"),
3839
CORE_2_0_RC5("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material/2.0-rc5"),
3940
CORE_2_0_RC4("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material/2.0-rc4"),
@@ -68,6 +69,7 @@ public enum VersionLink{
6869
THEME_2_0_RC4("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-themes/2.0-rc4"),
6970
THEME_2_0_RC5("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-themes/2.0-rc5"),
7071
THEME_2_0_RC6("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-themes/2.0-rc6"),
72+
THEME_2_0_RC7("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-themes/2.0-rc7"),
7173

7274
// FOR gwt-material Addins
7375
ADDINS_1_5_0("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-addins/1.5.0"),
@@ -81,6 +83,7 @@ public enum VersionLink{
8183
ADDINS_2_0_RC4("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-addins/2.0-rc4"),
8284
ADDINS_2_0_RC5("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-addins/2.0-rc5"),
8385
ADDINS_2_0_RC6("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-addins/2.0-rc6"),
86+
ADDINS_2_0_RC7("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-addins/2.0-rc7"),
8487

8588
// FOR gwt-material JQuery
8689
JQUERY_1_0_RC1("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-jquery/1.0-rc1"),
@@ -89,14 +92,16 @@ public enum VersionLink{
8992
JQUERY_1_0_RC4("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-jquery/1.0-rc4"),
9093
JQUERY_2_0_RC5("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-jquery/2.0-rc5"),
9194
JQUERY_2_0_RC6("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-jquery/2.0-rc6"),
95+
JQUERY_2_0_RC7("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-jquery/2.0-rc7"),
9296

9397
// FOR gwt-material Table
9498
TABLE_1_0_RC1("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-table/1.0-rc1"),
9599
TABLE_1_0_RC2("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-table/1.0-rc2"),
96100
TABLE_1_0_RC3("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-table/1.0-rc3"),
97101
TABLE_1_0_RC4("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-table/1.0-rc4"),
98102
TABLE_2_0_RC5("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-table/2.0-rc5"),
99-
TABLE_2_0_RC6("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-table/2.0-rc6");
103+
TABLE_2_0_RC6("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-table/2.0-rc6"),
104+
TABLE_2_0_RC7("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-table/2.0-rc7");
100105

101106
String name;
102107
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-rc6
33+
&emsp;mvn archetype:generate -DarchetypeGroupId=com.github.gwtmaterialdesign -DarchetypeArtifactId=gwt-material-archetype -DarchetypeVersion=2.0-rc7
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-rc6&lt;/version><br/>
45+
&emsp;&lt;version>2.0-rc7&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-rc6&lt;/version><br/>
55+
&emsp;&lt;version>2.0-rc7&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-rc6&lt;/version><br/>
65+
&emsp;&lt;version>2.0-rc7&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>2.0-rc6&lt;/version><br/>
76+
&emsp;&lt;version>2.0-rc7&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>2.0-rc6&lt;/version><br/>
87+
&emsp;&lt;version>2.0-rc7&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-Rework" textColor="WHITE"/>
85+
<m:MaterialBadge text="2.0-rc7" textColor="WHITE"/>
8686
</m:MaterialLink>
8787
</m.html:ListItem>
8888
<m:MaterialCollapsible>

‎src/main/java/gwt/material/design/demo/client/application/style/helper/HelperView.ui.xml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,40 @@
178178
<m:MaterialTitle title="ViewPort" description="Easily detects the browser size viewport on Resize Event. Try it yourself, resize the browser to see it's use."/>
179179
<m:MaterialLink ui:field="lblViewPort" />
180180
<demo:PrettyPre addStyleNames="lang-java" marginTop="40">
181+
ViewPort.when(Resolution.MOBILE_SMALL).then(viewPortChange -> { <br/>
182+
&emsp;lblViewPort.setText("ViewPort : Mobile Small");<br/>
183+
&emsp;lblViewPort.setIconType(IconType.PHONE_ANDROID);<br/>
184+
});<br/><br/>
181185

186+
ViewPort.when(Resolution.MOBILE_MEDIUM).then(viewPortChange -> {<br/>
187+
&emsp;lblViewPort.setText("ViewPort : Mobile Medium");<br/>
188+
&emsp;lblViewPort.setIconType(IconType.PHONE_ANDROID);<br/>
189+
});<br/><br/>
190+
191+
ViewPort.when(Resolution.MOBILE_LARGE).then(viewPortChange -> {<br/>
192+
&emsp;lblViewPort.setText("ViewPort : Mobile Large");<br/>
193+
&emsp;lblViewPort.setIconType(IconType.PHONE_ANDROID);<br/>
194+
});<br/><br/>
195+
196+
ViewPort.when(Resolution.TABLET).then(viewPortChange -> {<br/>
197+
&emsp;lblViewPort.setText("ViewPort : Tablet");<br/>
198+
&emsp;lblViewPort.setIconType(IconType.TABLET_ANDROID);<br/>
199+
});<br/><br/>
200+
201+
ViewPort.when(Resolution.LAPTOP).then(viewPortChange -> {<br/>
202+
&emsp;lblViewPort.setText("ViewPort : Laptop");<br/>
203+
&emsp;lblViewPort.setIconType(IconType.LAPTOP);<br/>
204+
});<br/><br/>
205+
206+
ViewPort.when(Resolution.LAPTOP_LARGE).then(viewPortChange -> {<br/>
207+
&emsp;lblViewPort.setText("ViewPort : Laptop Large");<br/>
208+
&emsp;lblViewPort.setIconType(IconType.LAPTOP);<br/>
209+
});<br/><br/>
210+
211+
ViewPort.when(Resolution.LAPTOP_4K).then(viewPortChange -> {<br/>
212+
&emsp;lblViewPort.setText("ViewPort : Laptop 4K");<br/>
213+
&emsp;lblViewPort.setIconType(IconType.LAPTOP);<br/>
214+
});<br/><br/>
182215
</demo:PrettyPre>
183216
</m:MaterialRow>
184217

0 commit comments

Comments
 (0)