Skip to content

Commit d43c2e4

Browse files
authored
Merge pull request #23 from GwtMaterialDesign/release_1.6.0
Release 1.6.0
2 parents f54229e + 82bd618 commit d43c2e4

38 files changed

+795
-111
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ cache:
77
- $HOME/.m2
88
before_install:
99
# install the gwt-material library before we build the demo
10-
- git clone -b release_1.5.3 https://github.com/GwtMaterialDesign/gwt-material.git
10+
- git clone -b release_1.6.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_1.6.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 -b release_1.5.2 https://github.com/GwtMaterialDesign/gwt-material-addins.git
20+
- git clone -b release_1.6.0 https://github.com/GwtMaterialDesign/gwt-material-addins.git
2121
- cd gwt-material-addins
2222
- mvn install -DskipTests=true -DdryRun=true
2323
- cd ..

.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" == "oraclejdk7" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "release_1.5.2" ]; then
3+
if [ "$TRAVIS_JDK_VERSION" == "oraclejdk7" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "release_1.6.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/WEB-INF ]]; then
37+
git rm -rf ./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
@@ -12,13 +12,13 @@ Demo application to show the features of the [gwt-material](https://github.com/G
1212
</dependency>
1313
```
1414

15-
### 1.6.0 Snapshot Demo
15+
### 1.5.2 Snapshot Demo
1616
[http://gwtmaterialdesign.github.io/gwt-material-demo/snapshot](http://gwtmaterialdesign.github.io/gwt-material-demo/snapshot)
1717
```xml
1818
<dependency>
1919
<groupId>com.github.gwtmaterialdesign</groupId>
2020
<artifactId>gwt-material-demo</artifactId>
21-
<version>1.6.0-SNAPSHOT</version>
21+
<version>1.5.2-SNAPSHOT</version>
2222
</dependency>
2323
```
2424

pom.xml

Lines changed: 6 additions & 6 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>1.5.2</version>
7+
<version>1.6.0</version>
88
</parent>
99

1010
<modelVersion>4.0.0</modelVersion>
1111

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

@@ -34,7 +34,7 @@
3434
<gwt.version>2.7.0</gwt.version>
3535
<gwtp.version>1.5.3</gwtp.version>
3636
<gin.version>2.1.2</gin.version>
37-
<gwt-material.version>1.5.2</gwt-material.version>
37+
<gwt-material.version>1.6.0-SNAPSHOT</gwt-material.version>
3838

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

@@ -188,17 +188,17 @@
188188
<dependency>
189189
<groupId>com.github.gwtmaterialdesign</groupId>
190190
<artifactId>gwt-material</artifactId>
191-
<version>1.5.3</version>
191+
<version>1.6.0</version>
192192
</dependency>
193193
<dependency>
194194
<groupId>com.github.gwtmaterialdesign</groupId>
195195
<artifactId>gwt-material-themes</artifactId>
196-
<version>1.5.2</version>
196+
<version>1.6.0</version>
197197
</dependency>
198198
<dependency>
199199
<groupId>com.github.gwtmaterialdesign</groupId>
200200
<artifactId>gwt-material-addins</artifactId>
201-
<version>1.5.2</version>
201+
<version>1.6.0</version>
202202
</dependency>
203203

204204
<!-- App Engine -->

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
</m:MaterialRow>
8888

8989
<m:MaterialFooterCopyright addStyleNames="footer-copyright">
90-
<m:MaterialLabel text="© 2015 Copyright GWT Material" />
90+
<m:MaterialLabel text="© 2016 Copyright GWT Material" />
9191
</m:MaterialFooterCopyright>
9292
</m:MaterialFooter>
9393
</g:HTMLPanel>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@
1818
#L%
1919
-->
2020
<ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder' xmlns:g='urn:import:com.google.gwt.user.client.ui'
21-
xmlns:m="urn:import:gwt.material.design.client.ui"
22-
xmlns:p="urn:import:gwt.material.design.demo.client.panel">
21+
xmlns:m="urn:import:gwt.material.design.client.ui">
2322

2423
<ui:with field='res' type='gwt.material.design.demo.client.resources.MaterialResources' />
2524

src/main/java/gwt/material/design/demo/client/application/addins/AddinsModule.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import com.google.gwt.inject.client.AbstractGinModule;
2525
import com.google.gwt.user.client.ui.SplitLayoutPanel;
2626
import gwt.material.design.demo.client.application.addins.autocomplete.AutoCompleteModule;
27+
import gwt.material.design.demo.client.application.addins.avatar.AvatarModule;
2728
import gwt.material.design.demo.client.application.addins.bubble.BubbleModule;
2829
import gwt.material.design.demo.client.application.addins.camera.CameraModule;
2930
import gwt.material.design.demo.client.application.addins.cutouts.CutOutsModule;
@@ -34,6 +35,7 @@
3435
import gwt.material.design.demo.client.application.addins.masonry.MasonryModule;
3536
import gwt.material.design.demo.client.application.addins.menubar.MenuBarModule;
3637
import gwt.material.design.demo.client.application.addins.pathanimator.PathAnimatorModule;
38+
import gwt.material.design.demo.client.application.addins.rating.RatingModule;
3739
import gwt.material.design.demo.client.application.addins.richeditor.RichEditorModule;
3840
import gwt.material.design.demo.client.application.addins.scrollfire.ScrollFireModule;
3941
import gwt.material.design.demo.client.application.addins.splitpanel.SplitPanelModule;
@@ -73,5 +75,7 @@ protected void configure() {
7375
install(new SplitPanelModule());
7476
install(new FileUploaderModule());
7577
install(new RichEditorModule());
78+
install(new AvatarModule());
79+
install(new RatingModule());
7680
}
7781
}
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
package gwt.material.design.demo.client.application.addins.avatar;
2+
3+
/*
4+
* #%L
5+
* GwtMaterial
6+
* %%
7+
* Copyright (C) 2015 - 2016 GwtMaterialDesign
8+
* %%
9+
* Licensed under the Apache License, Version 2.0 (the "License");
10+
* you may not use this file except in compliance with the License.
11+
* You may obtain a copy of the License at
12+
*
13+
* http://www.apache.org/licenses/LICENSE-2.0
14+
*
15+
* Unless required by applicable law or agreed to in writing, software
16+
* distributed under the License is distributed on an "AS IS" BASIS,
17+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
18+
* See the License for the specific language governing permissions and
19+
* limitations under the License.
20+
* #L%
21+
*/
22+
23+
24+
import com.gwtplatform.mvp.client.gin.AbstractPresenterModule;
25+
26+
public class AvatarModule extends AbstractPresenterModule {
27+
@Override
28+
protected void configure() {
29+
bindPresenter(AvatarPresenter.class, AvatarPresenter.MyView.class, AvatarView.class, AvatarPresenter.MyProxy.class);
30+
}
31+
}
Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
package gwt.material.design.demo.client.application.addins.avatar;
2+
3+
/*
4+
* #%L
5+
* GwtMaterial
6+
* %%
7+
* Copyright (C) 2015 - 2016 GwtMaterialDesign
8+
* %%
9+
* Licensed under the Apache License, Version 2.0 (the "License");
10+
* you may not use this file except in compliance with the License.
11+
* You may obtain a copy of the License at
12+
*
13+
* http://www.apache.org/licenses/LICENSE-2.0
14+
*
15+
* Unless required by applicable law or agreed to in writing, software
16+
* distributed under the License is distributed on an "AS IS" BASIS,
17+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
18+
* See the License for the specific language governing permissions and
19+
* limitations under the License.
20+
* #L%
21+
*/
22+
23+
24+
import com.google.inject.Inject;
25+
import com.google.web.bindery.event.shared.EventBus;
26+
import com.gwtplatform.mvp.client.Presenter;
27+
import com.gwtplatform.mvp.client.View;
28+
import com.gwtplatform.mvp.client.annotations.NameToken;
29+
import com.gwtplatform.mvp.client.annotations.ProxyCodeSplit;
30+
import com.gwtplatform.mvp.client.proxy.ProxyPlace;
31+
import gwt.material.design.demo.client.application.ApplicationPresenter;
32+
import gwt.material.design.demo.client.event.SetPageTitleEvent;
33+
import gwt.material.design.demo.client.place.NameTokens;
34+
35+
public class AvatarPresenter extends Presenter<AvatarPresenter.MyView, AvatarPresenter.MyProxy> {
36+
interface MyView extends View {
37+
}
38+
39+
@NameToken(NameTokens.avatar)
40+
@ProxyCodeSplit
41+
interface MyProxy extends ProxyPlace<AvatarPresenter> {
42+
}
43+
44+
@Inject
45+
AvatarPresenter(
46+
EventBus eventBus,
47+
MyView view,
48+
MyProxy proxy) {
49+
super(eventBus, view, proxy, ApplicationPresenter.SLOT_MAIN);
50+
51+
}
52+
53+
@Override
54+
protected void onReveal() {
55+
super.onReveal();
56+
SetPageTitleEvent.fire("Avatar", "Generated avatar based on JDenticon that provides a unique avatar based on unique name.", this);
57+
}
58+
59+
}
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
package gwt.material.design.demo.client.application.addins.avatar;
2+
3+
/*
4+
* #%L
5+
* GwtMaterial
6+
* %%
7+
* Copyright (C) 2015 - 2016 GwtMaterialDesign
8+
* %%
9+
* Licensed under the Apache License, Version 2.0 (the "License");
10+
* you may not use this file except in compliance with the License.
11+
* You may obtain a copy of the License at
12+
*
13+
* http://www.apache.org/licenses/LICENSE-2.0
14+
*
15+
* Unless required by applicable law or agreed to in writing, software
16+
* distributed under the License is distributed on an "AS IS" BASIS,
17+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
18+
* See the License for the specific language governing permissions and
19+
* limitations under the License.
20+
* #L%
21+
*/
22+
23+
24+
import com.google.gwt.event.dom.client.KeyUpEvent;
25+
import com.google.gwt.uibinder.client.UiBinder;
26+
import com.google.gwt.uibinder.client.UiField;
27+
import com.google.gwt.uibinder.client.UiHandler;
28+
import com.google.gwt.user.client.ui.Widget;
29+
import com.gwtplatform.mvp.client.ViewImpl;
30+
import gwt.material.design.addins.client.avatar.MaterialAvatar;
31+
import gwt.material.design.client.ui.MaterialTextBox;
32+
33+
import javax.inject.Inject;
34+
35+
36+
public class AvatarView extends ViewImpl implements AvatarPresenter.MyView {
37+
interface Binder extends UiBinder<Widget, AvatarView> {
38+
}
39+
40+
@UiField
41+
MaterialTextBox txtAvatarName;
42+
43+
@UiField
44+
MaterialAvatar avatar;
45+
46+
@Inject
47+
AvatarView(Binder uiBinder) {
48+
initWidget(uiBinder.createAndBindUi(this));
49+
}
50+
51+
@UiHandler("txtAvatarName")
52+
void onUpdateAvatar(KeyUpEvent e) {
53+
avatar.setName(txtAvatarName.getText());
54+
avatar.initialize();
55+
}
56+
}

0 commit comments

Comments
 (0)