Skip to content

Commit ee1091b

Browse files
authored
Merge pull request #82 from GwtMaterialDesign/release_2.0
Release 2.0-rc7
2 parents 85493ae + e4ffa03 commit ee1091b

File tree

105 files changed

+1777
-1490
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+1777
-1490
lines changed

.DS_Store

6 KB
Binary file not shown.

.travis.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,29 +7,29 @@ cache:
77
- $HOME/.m2
88
before_install:
99
# install the gwt-material library before we build the demo
10-
- git clone https://github.com/GwtMaterialDesign/gwt-material.git
10+
- git clone -b release_2.0 https://github.com/GwtMaterialDesign/gwt-material.git
1111
- cd gwt-material
1212
- mvn install -DskipTests=true -DdryRun=true
1313
- cd ..
1414
# install the gwt-material-themes library
15-
- git clone https://github.com/GwtMaterialDesign/gwt-material-themes.git
15+
- git clone -b release_2.0 https://github.com/GwtMaterialDesign/gwt-material-themes.git
1616
- cd gwt-material-themes
1717
- mvn install -DskipTests=true -DdryRun=true
1818
- cd ..
1919
# install the gwt-material-addins library
20-
- git clone https://github.com/GwtMaterialDesign/gwt-material-addins.git
20+
- git clone -b release_2.0 https://github.com/GwtMaterialDesign/gwt-material-addins.git
2121
- cd gwt-material-addins
2222
- mvn install -DskipTests=true -DdryRun=true
2323
- cd ..
2424
# install the gwt-material-table library before we build the demo
25-
- git clone https://github.com/GwtMaterialDesign/gwt-material-table.git
25+
- git clone -b release_2.0 https://github.com/GwtMaterialDesign/gwt-material-table.git
2626
- cd gwt-material-table
2727
- mvn install -DskipTests=true -DdryRun=true
2828
- cd ..
2929
install: true
3030
before_script:
3131
- chmod +x .utility/*
3232
script:
33-
- mvn clean install -DdryRun=true -Dlicense.failOnMissingHeader=true -Dlicense.failOnNotUptodateHeader=true
33+
- mvn clean install -DdryRun=true -Dlicense.failOnMissingHeader=false -Dlicense.failOnNotUptodateHeader=false
3434
after_success:
3535
- .utility/update_demo_site.sh

.utility/update_demo_site.sh

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
set -ev
3-
if [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "master" ]; then
3+
if [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "release_2.0" ]; then
44

55
if [[ -z "$GH_TOKEN" ]]; then
66
echo -e "GH_TOKEN is not set"
@@ -24,23 +24,23 @@ git clone --quiet --branch=gh-pages https://[email protected]/GwtMaterialDesi
2424
cd gh-pages
2525

2626
# remove the GwtMaterialDemo directories from git.
27-
if [[ -d ./gwtmaterialdemo ]]; then
28-
git rm -rf ./gwtmaterialdemo
27+
if [[ -d ./snapshot/gwtmaterialdemo ]]; then
28+
git rm -rf ./snapshot/gwtmaterialdemo
2929
fi
30-
if [[ -f ./index.html ]]; then
31-
git rm -rf ./index.html
30+
if [[ -f ./snapshot/index.html ]]; then
31+
git rm -rf ./snapshot/index.html
3232
fi
33-
if [[ -d ./META-INF ]]; then
34-
git rm -rf ./META-INF
33+
if [[ -d ./snapshot/META-INF ]]; then
34+
git rm -rf ./snapshot/META-INF
3535
fi
36-
if [[ -d ./WEB-INF ]]; then
37-
git rm -rf ./WEB-INF
36+
if [[ -d ./snapshot/snapshot/WEB-INF ]]; then
37+
git rm -rf ./snapshot/snapshot/WEB-INF
3838
fi
3939

4040
# copy the new GwtMaterialDemo the snapshot dir.
41-
unzip -u $TRAVIS_BUILD_DIR/target/gwt-material-demo-*.war -d ./
42-
rm -rf ./META-INF
43-
rm -rf ./WEB-INF
41+
unzip -u $TRAVIS_BUILD_DIR/target/gwt-material-demo-*.war -d ./snapshot/
42+
rm -rf ./snapshot/META-INF
43+
rm -rf ./snapshot/WEB-INF
4444

4545
git add -f .
4646
git commit -m "Auto-push demo to gh-pages successful. (Travis build: $TRAVIS_BUILD_NUMBER)"

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-rc6</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-rc6</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-rc6</gwt-material.version>
37+
<gwt-material.version>2.0-rc7</gwt-material.version>
3838

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

src/.DS_Store

6 KB
Binary file not shown.

src/main/java/gwt/material/design/demo/client/ThemeManager.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,9 @@
2020
package gwt.material.design.demo.client;
2121

2222
import com.google.gwt.user.client.Cookies;
23-
import gwt.material.design.addins.client.combobox.MaterialComboBox;
2423
import gwt.material.design.client.base.MaterialWidget;
2524
import gwt.material.design.client.constants.Color;
2625
import gwt.material.design.client.ui.MaterialToast;
27-
import gwt.material.design.demo.client.application.addins.datatable.table.Person;
2826
import gwt.material.design.themes.amber.ThemeAmber;
2927
import gwt.material.design.themes.blue.ThemeBlue;
3028
import gwt.material.design.themes.brown.ThemeBrown;

src/main/java/gwt/material/design/demo/client/application/ApplicationModule.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import gwt.material.design.demo.client.application.apps.AppsModule;
2828
import gwt.material.design.demo.client.application.charts.ChartsModule;
2929
import gwt.material.design.demo.client.application.components.ComponentsModule;
30+
import gwt.material.design.demo.client.application.datatable.DataTableModule;
3031
import gwt.material.design.demo.client.application.gettingstarted.GettingStartedModule;
3132
import gwt.material.design.demo.client.application.menu.MenuModule;
3233
import gwt.material.design.demo.client.application.roadmap.RoadMapModule;
@@ -52,5 +53,6 @@ protected void configure() {
5253
install(new ComponentsModule());
5354
install(new StyleModule());
5455
install(new ChartsModule());
56+
install(new DataTableModule());
5557
}
5658
}

src/main/java/gwt/material/design/demo/client/application/ApplicationView.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import com.google.gwt.user.client.ui.Widget;
3333
import com.gwtplatform.mvp.client.ViewImpl;
3434
import gwt.material.design.client.ui.*;
35-
import gwt.material.design.client.ui.animate.MaterialAnimator;
35+
import gwt.material.design.client.ui.animate.MaterialAnimation;
3636
import gwt.material.design.client.ui.animate.Transition;
3737
import gwt.material.design.demo.client.ThemeManager;
3838

@@ -85,11 +85,11 @@ public interface Binder extends UiBinder<Widget, ApplicationView> {
8585
Window.open(specification, "_blank", "");
8686
});
8787
ThemeManager.register(chipXml, ThemeManager.DARKER_SHADE);
88-
ThemeManager.register(chipXml.getLetterMixin().getSpan(), ThemeManager.LIGHTER_SHADE);
88+
ThemeManager.register(chipXml.getLetterLabel(), ThemeManager.LIGHTER_SHADE);
8989
ThemeManager.register(chipJava, ThemeManager.DARKER_SHADE);
90-
ThemeManager.register(chipJava.getLetterMixin().getSpan(), ThemeManager.LIGHTER_SHADE);
90+
ThemeManager.register(chipJava.getLetterLabel(), ThemeManager.LIGHTER_SHADE);
9191
ThemeManager.register(chipSpecification, ThemeManager.DARKER_SHADE);
92-
ThemeManager.register(chipSpecification.getLetterMixin().getSpan(), ThemeManager.LIGHTER_SHADE);
92+
ThemeManager.register(chipSpecification.getLetterLabel(), ThemeManager.LIGHTER_SHADE);
9393
ThemeManager.register(titlePanel);
9494
}
9595

@@ -119,7 +119,7 @@ public void setPageTitle(String title, String description, String link, String s
119119
chipSpecification.setVisible(true);
120120
}
121121

122-
MaterialAnimator.animate(Transition.BOUNCEINLEFT, this.title, 1000);
123-
MaterialAnimator.animate(Transition.BOUNCEINLEFT, this.description, 1000);
122+
new MaterialAnimation().transition(Transition.BOUNCEINLEFT).animate(this.title);
123+
new MaterialAnimation().transition(Transition.BOUNCEINLEFT).animate(this.description);
124124
}
125125
}

src/main/java/gwt/material/design/demo/client/application/ApplicationView.ui.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<m:MaterialPanel ui:field="titlePanel" backgroundColor="BLUE" textColor="WHITE" marginTop="56" padding="56" shadow="1">
5353
<m:MaterialPanel ui:field="panel">
5454
<m:MaterialLabel ui:field="title" text="GWT-Material" fontSize="2.3em"/>
55-
<m:MaterialLabel ui:field="description" text="A Material Design look and feel for GWT Apps plus Phonegap." fontSize="1.1em"/>
55+
<m:MaterialLabel ui:field="description" text="A Material Design look and feel for GWT Apps." fontSize="1.1em"/>
5656
<m:MaterialPanel marginTop="20">
5757
<m:MaterialChip ui:field="chipXml" letter="X" textColor="WHITE" margin="6" text="XML" />
5858
<m:MaterialChip ui:field="chipJava" letter="J" textColor="WHITE" text="JAVA" margin="6" />
@@ -85,7 +85,7 @@
8585

8686
<m:MaterialColumn grid="s12 m4 l4">
8787
<m:MaterialTitle textColor="WHITE" title="Join The Discussion"
88-
description="We provide Gitter Chat rooms in order for GWT Developers discussed and collaborate about GWT Material Design and Phonegap Integration."/>
88+
description="We provide Gitter Chat rooms in order for GWT Developers discussed and collaborate about GWT Material Design"/>
8989
<m:MaterialAnchorButton href="https://gitter.im/GwtMaterialDesign/gwt-material" target="_blank" text="CHAT" waves="LIGHT" textColor="WHITE"/>
9090
</m:MaterialColumn>
9191
<m:MaterialColumn grid="s12 m4 l4">

0 commit comments

Comments
 (0)