Skip to content

Commit 65697ad

Browse files
kevzlou7979kevzlou7979
committed
Preparation for 2.0-rc2 release
1 parent 0af0c42 commit 65697ad

File tree

15 files changed

+48
-24
lines changed

15 files changed

+48
-24
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-rc1 Demo
5+
### Release 2.0-rc2 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-rc1</version>
11+
<version>2.0-rc2</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-rc2</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-rc2</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-rc2</gwt-material.version>
38+
<gwt-material-table.version>1.0-rc2</gwt-material-table.version>
3939

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

‎src/main/java/gwt/material/design/demo/client/application/addins/fileuploader/FileUploaderView.ui.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@
123123
<p><b>Drag End</b> - Dragging has ended.</p>
124124
<p><b>Drag Enter</b> - The user dragged a file onto the Dropzone.</p>
125125
<p><b>Drag Over</b> - The user is dragging a file over the Dropzone.</p>
126-
<p><b>Drag Leave</b> - The user is dragging a file over the Dropzone.</p>
126+
<p><b>Drag Leave</b> - The user dragged a file out of the Dropzone.</p>
127127
<p><b>Added File &lt;UploadFile></b> - When a file is added to the list.</p>
128128
<p><b>Removed File &lt;UploadFile></b> - Called whenever a file is removed from the list. You can listen to this and delete the file from your server if you want to.</p>
129129
<p><b>Error &lt;UploadFile></b> - An error occured. Receives the errorMessage as second parameter and if the error was due to the XMLHttpRequest the xhr object as third.</p>

‎src/main/java/gwt/material/design/demo/client/application/addins/masonry/MasonryView.ui.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898

9999
<m:MaterialRow addStyleNames="code">
100100
<m:MaterialTitle title="Origin Left" description="By default originLeft is set to true, you can rearrange the blocks into right by setting it to false." />
101-
<ma:masonry.MaterialMasonry grid="l6 s12 m12" originLeft="false">
101+
<ma:masonry.MaterialMasonry grid="l12 s12 m12" originLeft="false">
102102
<m:MaterialColumn grid="l2 s12 m6" backgroundColor="BLUE_LIGHTEN_1" height="200px" waves="DEFAULT" padding="0"/>
103103
<m:MaterialColumn grid="l3 s12 m6" backgroundColor="GREY_LIGHTEN_2" height="400px" waves="DEFAULT" padding="0"/>
104104
<m:MaterialColumn grid="l3 s12 m6" backgroundColor="YELLOW_LIGHTEN_3" height="200px" waves="DEFAULT" padding="0"/>
@@ -118,7 +118,7 @@
118118

119119
<m:MaterialRow addStyleNames="code">
120120
<m:MaterialTitle title="Origin Top" description="By default originLeft is set to false, you can rearrange the blocks into bottom by setting it to false." />
121-
<ma:masonry.MaterialMasonry grid="l6 s12 m12" originTop="false">
121+
<ma:masonry.MaterialMasonry grid="l12 s12 m12" originTop="false">
122122
<m:MaterialColumn grid="l2 s12 m6" backgroundColor="BLUE_LIGHTEN_1" height="200px" waves="DEFAULT" padding="0"/>
123123
<m:MaterialColumn grid="l3 s12 m6" backgroundColor="GREY_LIGHTEN_2" height="400px" waves="DEFAULT" padding="0"/>
124124
<m:MaterialColumn grid="l3 s12 m6" backgroundColor="YELLOW_LIGHTEN_3" height="200px" waves="DEFAULT" padding="0"/>
@@ -138,7 +138,7 @@
138138

139139
<m:MaterialRow addStyleNames="code">
140140
<m:MaterialTitle title="Transition Duration" description="You can set how fast the transition of masonry by settung it's duration, if set to 0 then no transition will be applied." />
141-
<ma:masonry.MaterialMasonry grid="l6 s12 m12" transitionDuration="0">
141+
<ma:masonry.MaterialMasonry grid="l12 s12 m12" transitionDuration="0">
142142
<m:MaterialColumn grid="l2 s12 m6" backgroundColor="BLUE_LIGHTEN_1" height="200px" waves="DEFAULT" padding="0"/>
143143
<m:MaterialColumn grid="l3 s12 m6" backgroundColor="GREY_LIGHTEN_2" height="400px" waves="DEFAULT" padding="0"/>
144144
<m:MaterialColumn grid="l3 s12 m6" backgroundColor="YELLOW_LIGHTEN_3" height="200px" waves="DEFAULT" padding="0"/>

‎src/main/java/gwt/material/design/demo/client/application/addins/overlay/OverlayView.ui.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<g:HTMLPanel>
3030
<m:MaterialRow addStyleNames="code">
3131
<m:MaterialTitle title="Basic" description="Requires a source component when opening the overlay to transform it to overlay panel." />
32-
<ma:overlay.MaterialOverlay ui:field="overlay" textAlign="CENTER" textColor="WHITE">
32+
<ma:overlay.MaterialOverlay ui:field="overlay" backgroundColor="BLUE" textAlign="CENTER" textColor="WHITE">
3333
<m:MaterialLabel textAlign="CENTER" text="This is an overlay" marginTop="120" fontWeight="LIGHTER" fontSize="2em" />
3434
<m:MaterialLabel textAlign="CENTER" text="Some content goes here" marginBottom="40" />
3535
<m:MaterialButton ui:field="btnCloseOverlay" text="Close Overlay" />
@@ -51,7 +51,7 @@
5151

5252
<m:MaterialRow addStyleNames="code">
5353
<m:MaterialTitle title="Events" description="We have provided open and close events"/>
54-
<ma:overlay.MaterialOverlay ui:field="overlayEvents" textAlign="CENTER" textColor="WHITE">
54+
<ma:overlay.MaterialOverlay ui:field="overlayEvents" backgroundColor="BLUE" textAlign="CENTER" textColor="WHITE">
5555
<m:MaterialLabel textAlign="CENTER" text="This is an overlay" marginTop="120" fontWeight="LIGHTER" fontSize="2em" />
5656
<m:MaterialLabel textAlign="CENTER" text="Some content goes here" marginBottom="40" />
5757
<m:MaterialButton ui:field="btnCloseOverlayEvents" text="Close Overlay" />

‎src/main/java/gwt/material/design/demo/client/application/components/pushpin/PushPinView.ui.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<m:MaterialRow addStyleNames="code" height="1000px">
2727
<m:MaterialTitle title="Basic" description="A pushpinned element has 3 states. One above (TOP) and below (BELOW) the scrolling threshold, and the pinned state where the element becomes fixed (OFFSET)."/>
2828
<m:MaterialRow>
29-
<m:MaterialPanel ui:field="source" grid="s12 m12 l12" paddingTop="50" shadow="1" height="200px" width="200px">
29+
<m:MaterialPanel ui:field="source" grid="s12 m12 l12" backgroundColor="BLUE" paddingTop="50" shadow="1" height="200px" width="200px">
3030
<m:MaterialLabel textColor="WHITE" text="Pinned Options top at 300, offset at 64 (navbar's height)" />
3131
</m:MaterialPanel>
3232
</m:MaterialRow>

‎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-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));
5657
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));
5758
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));
5859
versions.add(new Version("1.6.1", "August 2016", Version.VersionLink.CORE_1_6_1.getName(), null, null, null, null, Color.DEEP_ORANGE_ACCENT_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_RC2("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material/2.0-rc2"),
3738
CORE_2_0_RC1("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material/2.0-rc1"),
3839
CORE_1_6_2("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material/1.6.2"),
3940
CORE_1_6_1("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material/1.6.1"),
@@ -58,6 +59,7 @@ public enum VersionLink{
5859
THEME_1_5_2("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-themes/1.5.2"),
5960
THEME_1_6_0("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-themes/1.6.0"),
6061
THEME_2_0_RC1("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-themes/2.0-rc1"),
62+
THEME_2_0_RC2("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-themes/2.0-rc2"),
6163

6264
// FOR gwt-material Addins
6365
ADDINS_1_5_0("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-addins/1.5.0"),
@@ -66,12 +68,15 @@ public enum VersionLink{
6668
ADDINS_1_6_0("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-addins/1.6.0"),
6769
ADDINS_1_6_2("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-addins/1.6.2"),
6870
ADDINS_2_0_RC1("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-addins/2.0-rc1"),
71+
ADDINS_2_0_RC2("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-addins/2.0-rc2"),
6972

7073
// FOR gwt-material JQuery
7174
JQUERY_1_0_RC1("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-jquery/1.0-rc1"),
75+
JQUERY_1_0_RC2("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-jquery/1.0-rc2"),
7276

7377
// FOR gwt-material Table
74-
TABLE_1_0_RC1("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-table/1.0-rc1");
78+
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");
7580

7681
String name;
7782
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-rc1
33+
&emsp;mvn archetype:generate -DarchetypeGroupId=com.github.gwtmaterialdesign -DarchetypeArtifactId=gwt-material-archetype -DarchetypeVersion=2.0-rc2
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-rc1&lt;/version><br/>
45+
&emsp;&lt;version>2.0-rc2&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-rc1&lt;/version><br/>
55+
&emsp;&lt;version>2.0-rc2&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-rc1&lt;/version><br/>
65+
&emsp;&lt;version>2.0-rc2&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-rc1&lt;/version><br/>
76+
&emsp;&lt;version>1.0-rc2&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-rc1&lt;/version><br/>
87+
&emsp;&lt;version>1.0-rc2&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-rc1" textColor="WHITE"/>
102+
<m:MaterialBadge text="2.0-rc2" textColor="WHITE"/>
103103
</m:MaterialLink>
104104
</m.html:ListItem>
105105
<m:MaterialCollapsible>

0 commit comments

Comments
 (0)