Skip to content

Commit a600fa1

Browse files
authored
Merge pull request #587 from GwtMaterialDesign/release_2.0
Release 2.0-rc5
2 parents 444d9f1 + 6f32db2 commit a600fa1

File tree

127 files changed

+2787
-881
lines changed

Some content is hidden

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

127 files changed

+2787
-881
lines changed

README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
<img src="http://i.imgur.com/VaBxpGj.png" />
22
<h2>gwt-material</h2>
33
<p>A Google Material Design wrapper for GWT</p>
4+
45
[![Build Status](https://travis-ci.org/GwtMaterialDesign/gwt-material.svg?branch=master)](https://travis-ci.org/GwtMaterialDesign/gwt-material) [![Join the chat at https://gitter.im/GwtMaterialDesign/gwt-material](https://img.shields.io/badge/GITTER-join%20chat-green.svg)](https://gitter.im/GwtMaterialDesign/gwt-material?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
56

67
<br/>
78

89
## Demo
9-
* [2.0-rc4 Release Demo](http://gwtmaterialdesign.github.io/gwt-material-demo/)
10+
* [2.0-rc5 Release Demo](http://gwtmaterialdesign.github.io/gwt-material-demo/)
1011
* [2.0 Snapshot Demo](http://gwtmaterialdesign.github.io/gwt-material-demo/snapshot/)
1112
* [2.1 Snapshot Demo](http://gwtmaterialdesign.github.io/gwt-material-demo/2.1/)
1213

@@ -16,12 +17,12 @@ We created <a href="http://gwtmaterialdesign.github.io/gwt-material-demo/apidocs
1617

1718

1819
## Maven
19-
### Current Version 2.0-rc4
20+
### Current Version 2.0-rc5
2021
```xml
2122
<dependency>
2223
<groupId>com.github.gwtmaterialdesign</groupId>
2324
<artifactId>gwt-material</artifactId>
24-
<version>2.0-rc4</version>
25+
<version>2.0-rc5</version>
2526
</dependency>
2627
```
2728
### Snapshot Version 2.0-SNAPSHOT

gwt-material/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<artifactId>gwt-material-parent</artifactId>
66
<groupId>com.github.gwtmaterialdesign</groupId>
7-
<version>2.0-rc4</version>
7+
<version>2.0-rc5</version>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>
1010

@@ -17,7 +17,7 @@
1717
<dependency>
1818
<groupId>com.github.gwtmaterialdesign</groupId>
1919
<artifactId>gwt-material-jquery</artifactId>
20-
<version>1.0-rc4</version>
20+
<version>2.0-rc5</version>
2121
</dependency>
2222
<dependency>
2323
<groupId>com.google.gwt</groupId>

gwt-material/src/main/java/gwt/material/design/client/MaterialDesignBase.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ protected void load() {
5050
if(!isMaterializeLoaded()) {
5151
injectJs(MaterialResources.INSTANCE.materializeJs());
5252
injectJs(MaterialResources.INSTANCE.animationJs());
53-
injectJs(MaterialResources.INSTANCE.shrinkJs());
5453
}
5554
onModuleLoaded();
5655
}

gwt-material/src/main/java/gwt/material/design/client/MaterialDesignDebugBase.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ public void load() {
3030
if(!isMaterializeLoaded()) {
3131
injectDebugJs(MaterialDebugResources.INSTANCE.materializeJsDebug());
3232
injectDebugJs(MaterialDebugResources.INSTANCE.animationJsDebug());
33-
injectDebugJs(MaterialDebugResources.INSTANCE.shrinkJsDebug());
3433
}
3534
onModuleLoaded();
3635
}

gwt-material/src/main/java/gwt/material/design/client/base/AbstractButton.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,4 +188,8 @@ public void setTargetHistoryToken(final String targetHistoryToken) {
188188
public String getTargetHistoryToken() {
189189
return targetHistoryToken;
190190
}
191+
192+
public Span getSpan() {
193+
return span;
194+
}
191195
}

gwt-material/src/main/java/gwt/material/design/client/base/HasTransition.java renamed to gwt-material/src/main/java/gwt/material/design/client/base/HasDelayTransition.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* #%L
33
* GwtMaterial
44
* %%
5-
* Copyright (C) 2015 - 2016 GwtMaterialDesign
5+
* Copyright (C) 2015 - 2017 GwtMaterialDesign
66
* %%
77
* Licensed under the Apache License, Version 2.0 (the "License");
88
* you may not use this file except in compliance with the License.
@@ -19,15 +19,15 @@
1919
*/
2020
package gwt.material.design.client.base;
2121

22-
public interface HasTransition {
22+
public interface HasDelayTransition {
2323

2424
/**
25-
* Sets the In Duration of transition.
25+
* Set the animation duration delay in milliseconds.
2626
*/
27-
void setInDuration(int inDuration);
27+
void setDelay(int delay);
2828

2929
/**
30-
* Sets the our duration of transition.
30+
* Get the animation duration delay in milliseconds.
3131
*/
32-
void setOutDuration(int outDuration);
32+
int getDelay();
3333
}
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
/*
2+
* #%L
3+
* GwtMaterial
4+
* %%
5+
* Copyright (C) 2015 - 2017 GwtMaterialDesign
6+
* %%
7+
* Licensed under the Apache License, Version 2.0 (the "License");
8+
* you may not use this file except in compliance with the License.
9+
* You may obtain a copy of the License at
10+
*
11+
* http://www.apache.org/licenses/LICENSE-2.0
12+
*
13+
* Unless required by applicable law or agreed to in writing, software
14+
* distributed under the License is distributed on an "AS IS" BASIS,
15+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
* See the License for the specific language governing permissions and
17+
* limitations under the License.
18+
* #L%
19+
*/
20+
package gwt.material.design.client.base;
21+
22+
public interface HasDurationTransition {
23+
24+
/**
25+
* Set the animation duration in milliseconds.
26+
*/
27+
void setDuration(int duration);
28+
29+
/**
30+
* Get the animation duration in milliseconds.
31+
*/
32+
int getDuration();
33+
}
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
/*
2+
* #%L
3+
* GwtMaterial
4+
* %%
5+
* Copyright (C) 2015 - 2016 GwtMaterialDesign
6+
* %%
7+
* Licensed under the Apache License, Version 2.0 (the "License");
8+
* you may not use this file except in compliance with the License.
9+
* You may obtain a copy of the License at
10+
*
11+
* http://www.apache.org/licenses/LICENSE-2.0
12+
*
13+
* Unless required by applicable law or agreed to in writing, software
14+
* distributed under the License is distributed on an "AS IS" BASIS,
15+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
* See the License for the specific language governing permissions and
17+
* limitations under the License.
18+
* #L%
19+
*/
20+
package gwt.material.design.client.base;
21+
22+
public interface HasInOutDurationTransition {
23+
24+
/**
25+
* Set the in / enter animation duration in milliseconds.
26+
*/
27+
void setInDuration(int inDuration);
28+
29+
/**
30+
* Get the in / enter animation duration in milliseconds.
31+
*/
32+
int getInDuration();
33+
34+
/**
35+
* Set the out / exit animation duration in milliseconds.
36+
*/
37+
void setOutDuration(int outDuration);
38+
39+
/**
40+
* Get the out / exit animation duration in milliseconds.
41+
*/
42+
int getOutDuration();
43+
}
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
/*
2+
* #%L
3+
* GwtMaterial
4+
* %%
5+
* Copyright (C) 2015 - 2017 GwtMaterialDesign
6+
* %%
7+
* Licensed under the Apache License, Version 2.0 (the "License");
8+
* you may not use this file except in compliance with the License.
9+
* You may obtain a copy of the License at
10+
*
11+
* http://www.apache.org/licenses/LICENSE-2.0
12+
*
13+
* Unless required by applicable law or agreed to in writing, software
14+
* distributed under the License is distributed on an "AS IS" BASIS,
15+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
* See the License for the specific language governing permissions and
17+
* limitations under the License.
18+
* #L%
19+
*/
20+
package gwt.material.design.client.base;
21+
22+
/**
23+
* An interface to determine whether this sidenav
24+
* component will not be selectable on {@link gwt.material.design.client.ui.MaterialSideNav} component.
25+
*/
26+
public interface HasNoSideNavSelection {
27+
}
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
/*
2+
* #%L
3+
* GwtMaterial
4+
* %%
5+
* Copyright (C) 2015 - 2017 GwtMaterialDesign
6+
* %%
7+
* Licensed under the Apache License, Version 2.0 (the "License");
8+
* you may not use this file except in compliance with the License.
9+
* You may obtain a copy of the License at
10+
*
11+
* http://www.apache.org/licenses/LICENSE-2.0
12+
*
13+
* Unless required by applicable law or agreed to in writing, software
14+
* distributed under the License is distributed on an "AS IS" BASIS,
15+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
* See the License for the specific language governing permissions and
17+
* limitations under the License.
18+
* #L%
19+
*/
20+
package gwt.material.design.client.base;
21+
22+
import com.google.web.bindery.event.shared.HandlerRegistration;
23+
import gwt.material.design.client.events.NavBarExpandEvent;
24+
import gwt.material.design.client.events.NavBarShrinkEvent;
25+
26+
public interface HasShrinkableNavBarHandlers {
27+
28+
HandlerRegistration addExpandHandler(NavBarExpandEvent.NavBarExpandHandler handler);
29+
30+
HandlerRegistration addShrinkHandler(NavBarShrinkEvent.NavBarShrinkHandler handler);
31+
}

0 commit comments

Comments
 (0)