Skip to content

Commit ec8181f

Browse files
kevzlou7979kevzlou7979
authored
Merge pull request #21 from GwtMaterialDesign/release_1.5.2
Emergency Release for 1.5.3
2 parents 4959bd8 + 6a4ddf1 commit ec8181f

File tree

12 files changed

+186
-7
lines changed

12 files changed

+186
-7
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ 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.2 https://github.com/GwtMaterialDesign/gwt-material.git
10+
- git clone -b release_1.5.3 https://github.com/GwtMaterialDesign/gwt-material.git
1111
- cd gwt-material
1212
- mvn install -DskipTests=true -DdryRun=true
1313
- cd ..

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@
188188
<dependency>
189189
<groupId>com.github.gwtmaterialdesign</groupId>
190190
<artifactId>gwt-material</artifactId>
191-
<version>${gwt-material.version}</version>
191+
<version>1.5.3</version>
192192
</dependency>
193193
<dependency>
194194
<groupId>com.github.gwtmaterialdesign</groupId>

‎src/main/java/gwt/material/design/demo/client/application/animations/core/CoreAnimationsView.java‎

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,11 @@
2828
import com.google.gwt.uibinder.client.UiHandler;
2929
import com.google.gwt.user.client.ui.Widget;
3030
import com.gwtplatform.mvp.client.ViewImpl;
31+
import gwt.material.design.client.ui.MaterialButton;
3132
import gwt.material.design.client.ui.MaterialCard;
3233
import gwt.material.design.client.ui.MaterialListBox;
34+
import gwt.material.design.client.ui.MaterialToast;
35+
import gwt.material.design.client.ui.animate.MaterialAnimation;
3336
import gwt.material.design.client.ui.animate.MaterialAnimator;
3437
import gwt.material.design.client.ui.animate.Transition;
3538

@@ -43,6 +46,9 @@ interface Binder extends UiBinder<Widget, CoreAnimationsView> {
4346
@UiField
4447
MaterialCard card;
4548

49+
@UiField
50+
MaterialButton iconHeart, iconCallback, iconState;
51+
4652
@UiField
4753
MaterialListBox lstAnimations;
4854

@@ -147,4 +153,33 @@ private void animate(){
147153
Transition transition = Transition.fromStyleName(value);
148154
MaterialAnimator.animate(transition, card, 1000);
149155
}
150-
}
156+
157+
@UiHandler("btnAnimateInfinite")
158+
void onAnimateInfinite(ClickEvent e) {
159+
MaterialAnimator.animate(Transition.PULSE, iconHeart, 1000, true);
160+
}
161+
162+
@UiHandler("btnStopAnimation")
163+
void onStopAnimation(ClickEvent e) {
164+
MaterialAnimator.stopAnimation(iconHeart);
165+
}
166+
167+
@UiHandler("btnAnimateCallback")
168+
void onCallback(ClickEvent e) {
169+
Runnable callback = new Runnable() {
170+
@Override
171+
public void run() {
172+
MaterialToast.fireToast("Animation is finished");
173+
}
174+
};
175+
MaterialAnimator.animate(Transition.FLIPINX, iconCallback, 200, callback);
176+
}
177+
178+
@UiHandler("btnAnimateStateful")
179+
void onStateful(ClickEvent e) {
180+
new MaterialAnimation().durationMillis(1000)
181+
.delayMillis(100)
182+
.transition(Transition.WOBBLE)
183+
.animate(iconState);
184+
}
185+
}

‎src/main/java/gwt/material/design/demo/client/application/animations/core/CoreAnimationsView.ui.xml‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@
2828
.block{
2929
display: block;
3030
}
31+
.icon i{
32+
font-size: 4em;
33+
}
3134
</ui:style>
3235
<m:MaterialPanel>
3336
<m:MaterialTitle title="Usage" description="You can easily apply animation by calling MaterialAnimator.animate(Transition, Widget, Delay);"/>
@@ -50,5 +53,52 @@
5053
<m:MaterialButton ui:field="btnAnimate" text="Animate" backgroundColor="blue" textColor="white"/>
5154
</m:MaterialColumn>
5255
</m:MaterialRow>
56+
57+
<m:MaterialTitle title="Infinite" description="You can easily set the animation infinite."/>
58+
<m:MaterialRow>
59+
<m:MaterialColumn grid="s12 l6">
60+
<demo:PrettyPre addStyleNames="lang-java z-depth-1">
61+
// Play Infinite Animation<br/>
62+
MaterialAnimator.animate(Transition.PULSE, heart, 1000, true);<br/>
63+
// Stop Infinite Animation <br/>
64+
MaterialAnimator.stopAnimation(heart);<br/>
65+
</demo:PrettyPre>
66+
<m:MaterialButton ui:field="iconHeart" width="100px" height="100px" addStyleNames="{style.icon}" type="FLOATING" size="LARGE" iconType="FAVORITE" backgroundColor="pink" />
67+
</m:MaterialColumn>
68+
</m:MaterialRow>
69+
<m:MaterialButton ui:field="btnAnimateInfinite" text="Infinite Animation" backgroundColor="blue" textColor="white"/>
70+
<m:MaterialButton ui:field="btnStopAnimation" text="Stop Animation" type="FLAT" />
71+
72+
<m:MaterialTitle title="Callback" description="Setting the callback after animation" />
73+
<m:MaterialRow>
74+
<m:MaterialColumn grid="s12 l6">
75+
<demo:PrettyPre addStyleNames="lang-java z-depth-1">
76+
&emsp;Runnable callback = new Runnable() {<br/>
77+
&emsp;@Override<br/>
78+
&emsp;public void run() {<br/>
79+
&emsp;&emsp;MaterialToast.fireToast("Animation is finished");<br/>
80+
&emsp;}<br/>
81+
};<br/>
82+
MaterialAnimator.animate(Transition.FLIPINX, iconCallback, 200, callback);
83+
</demo:PrettyPre>
84+
<m:MaterialButton ui:field="iconCallback" width="100px" height="100px" addStyleNames="{style.icon}" type="FLOATING" size="LARGE" iconType="DIRECTIONS_BIKE" backgroundColor="blue" />
85+
</m:MaterialColumn>
86+
</m:MaterialRow>
87+
<m:MaterialButton ui:field="btnAnimateCallback" text="Animate with Callback" backgroundColor="blue" textColor="white"/>
88+
89+
<m:MaterialTitle title="Stateful Animation" description="Stateful object holding animation details. Default behaviour is a bounce transition for 800ms." />
90+
<m:MaterialRow>
91+
<m:MaterialColumn grid="s12 l6">
92+
<demo:PrettyPre addStyleNames="lang-java z-depth-1">
93+
&emsp;new MaterialAnimation().durationMillis(1000)<br/>
94+
&emsp;.delayMillis(100)<br/>
95+
&emsp;.transition(Transition.WOBBLE)<br/>
96+
&emsp;.animate(iconState);
97+
</demo:PrettyPre>
98+
<m:MaterialButton ui:field="iconState" width="100px" height="100px" addStyleNames="{style.icon}" type="FLOATING" size="LARGE" iconType="POLYMER" backgroundColor="purple" />
99+
</m:MaterialColumn>
100+
</m:MaterialRow>
101+
<m:MaterialButton ui:field="btnAnimateStateful" text="Animate with Callback" backgroundColor="blue" textColor="white"/>
102+
53103
</m:MaterialPanel>
54104
</ui:UiBinder>

‎src/main/java/gwt/material/design/demo/client/application/components/forms/FormsView.java‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ interface Binder extends UiBinder<Widget, FormsView> {
4444
@UiField MaterialLabel lblRange;
4545
@UiField MaterialRange range;
4646

47+
@UiField MaterialTextArea txtAreaAuto;
48+
@UiField MaterialTextArea txtAreaFocus;
49+
4750
@UiField MaterialFloatBox txtFloatBox;
4851
@UiField MaterialIntegerBox txtIntegerBox;
4952
@UiField MaterialDoubleBox txtDoubleBox;
@@ -56,6 +59,49 @@ interface Binder extends UiBinder<Widget, FormsView> {
5659
txtIntegerBox.setValue(10);
5760
txtDoubleBox.setValue(9999.90);
5861
txtLongBox.setValue((long) 1000.00);
62+
txtAreaAuto.setValue("Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc quam mauris, accumsan placerat " +
63+
"lectus ac, tincidunt mattis nisl. Ut efficitur massa in libero gravida tincidunt. Vestibulum eget massa " +
64+
"eget ex auctor tempus. Aenean vitae augue euismod, lacinia lectus ut, rhoncus enim. Sed vitae laoreet " +
65+
"felis, eget ullamcorper nunc. Vivamus elit urna, varius et arcu vel, euismod auctor augue. Praesent " +
66+
"scelerisque scelerisque libero sit amet euismod. Mauris eu est at felis feugiat tincidunt eu vel lectus. " +
67+
"Ut pretium magna vitae massa sollicitudin, eu tincidunt sapien scelerisque. Maecenas gravida lorem non dui " +
68+
"pretium, id vestibulum mi imperdiet. Fusce facilisis, dui nec ultrices molestie, nisi metus bibendum lacus, " +
69+
"eget posuere est odio vitae nulla. Mauris laoreet non justo fringilla tempus. Mauris ut risus risus. " +
70+
"Vivamus auctor accumsan gravida. Nam venenatis sapien nisl, quis accumsan odio dignissim non. Vestibulum " +
71+
"aliquam semper condimentum. Suspendisse a eros elementum, dapibus quam in, aliquet lorem. Morbi mi dui, " +
72+
"convallis at luctus ultricies, malesuada at leo. Morbi et turpis a ex vehicula ullamcorper. Vestibulum " +
73+
"lacinia, orci eget elementum fermentum, lectus velit interdum erat, sit amet pharetra justo elit in tortor. " +
74+
"Suspendisse ac vestibulum nisi.\n" +
75+
"\n" +
76+
"Nunc euismod metus nec elit sollicitudin blandit. Proin eleifend ex bibendum sodales blandit. Vestibulum " +
77+
"varius pharetra arcu, sit amet pellentesque odio hendrerit nec. Integer faucibus imperdiet tortor a tempus. " +
78+
"Sed accumsan condimentum nisl. Cras interdum sapien quis maximus commodo. Nulla malesuada imperdiet enim, " +
79+
"non ornare elit auctor in. Fusce at ipsum eget turpis tincidunt maximus. Nunc sodales tortor nec tincidunt " +
80+
"fringilla. Quisque sollicitudin ipsum at dolor faucibus, ultricies convallis ipsum convallis. Donec " +
81+
"consequat velit vel molestie tempus. Donec et accumsan lacus, non sollicitudin quam. Morbi arcu lacus, " +
82+
"blandit eu lacus nec, finibus tempus ligula.", true);
83+
84+
txtAreaFocus.setValue("Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc quam mauris, accumsan placerat " +
85+
"lectus ac, tincidunt mattis nisl. Ut efficitur massa in libero gravida tincidunt. Vestibulum eget massa " +
86+
"eget ex auctor tempus. Aenean vitae augue euismod, lacinia lectus ut, rhoncus enim. Sed vitae laoreet " +
87+
"felis, eget ullamcorper nunc. Vivamus elit urna, varius et arcu vel, euismod auctor augue. Praesent " +
88+
"scelerisque scelerisque libero sit amet euismod. Mauris eu est at felis feugiat tincidunt eu vel lectus. " +
89+
"Ut pretium magna vitae massa sollicitudin, eu tincidunt sapien scelerisque. Maecenas gravida lorem non dui " +
90+
"pretium, id vestibulum mi imperdiet. Fusce facilisis, dui nec ultrices molestie, nisi metus bibendum lacus, " +
91+
"eget posuere est odio vitae nulla. Mauris laoreet non justo fringilla tempus. Mauris ut risus risus. " +
92+
"Vivamus auctor accumsan gravida. Nam venenatis sapien nisl, quis accumsan odio dignissim non. Vestibulum " +
93+
"aliquam semper condimentum. Suspendisse a eros elementum, dapibus quam in, aliquet lorem. Morbi mi dui, " +
94+
"convallis at luctus ultricies, malesuada at leo. Morbi et turpis a ex vehicula ullamcorper. Vestibulum " +
95+
"lacinia, orci eget elementum fermentum, lectus velit interdum erat, sit amet pharetra justo elit in tortor. " +
96+
"Suspendisse ac vestibulum nisi.\n" +
97+
"\n" +
98+
"Nunc euismod metus nec elit sollicitudin blandit. Proin eleifend ex bibendum sodales blandit. Vestibulum " +
99+
"varius pharetra arcu, sit amet pellentesque odio hendrerit nec. Integer faucibus imperdiet tortor a tempus. " +
100+
"Sed accumsan condimentum nisl. Cras interdum sapien quis maximus commodo. Nulla malesuada imperdiet enim, " +
101+
"non ornare elit auctor in. Fusce at ipsum eget turpis tincidunt maximus. Nunc sodales tortor nec tincidunt " +
102+
"fringilla. Quisque sollicitudin ipsum at dolor faucibus, ultricies convallis ipsum convallis. Donec " +
103+
"consequat velit vel molestie tempus. Donec et accumsan lacus, non sollicitudin quam. Morbi arcu lacus, " +
104+
"blandit eu lacus nec, finibus tempus ligula.", true);
59105
}
60106

61107
@UiHandler("lstOptions")

‎src/main/java/gwt/material/design/demo/client/application/components/forms/FormsView.ui.xml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,19 @@
5151
&lt;m:MaterialTextArea ui:field="txtArea" placeholder="About" iconType="FACE"/><br/>
5252
</demo:PrettyPre>
5353

54+
<m:MaterialTitle title="Textarea" description="Textareas use a resize policy that can be configured to suit your need. "/>
55+
<m:MaterialTextArea ui:field="txtAreaAuto" placeholder="Using AUTO" resizeRule="AUTO" grid="s12"/>
56+
57+
<demo:PrettyPre addStyleNames="lang-xml z-depth-1">
58+
&lt;m:MaterialTextArea placeholder="Using AUTO" resizeRule="AUTO"/><br/>
59+
</demo:PrettyPre>
60+
61+
<m:MaterialTextArea ui:field="txtAreaFocus" placeholder="Using FOCUS" resizeRule="FOCUS" grid="s12"/>
62+
63+
<demo:PrettyPre addStyleNames="lang-xml z-depth-1">
64+
&lt;m:MaterialTextArea placeholder="Using FOCUS" resizeRule="FOCUS"/><br/>
65+
</demo:PrettyPre>
66+
5467
<m:MaterialTitle title="Character Counter" description="Use a character counter in fields where a character restriction is in place."/>
5568
<m:MaterialTextBox placeholder="Input Text" length="10" grid="s12"/>
5669
<m:MaterialTextArea placeholder="Text Area" length="120" grid="s12"/>

‎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
@@ -50,6 +50,7 @@ public static List<Hero> getAllHeroes(){
5050

5151
public static List<Version> getAllVersions() {
5252
List<Version> versions = new ArrayList<>();
53+
versions.add(new Version("1.5.3", "June 2016", Version.VersionLink.CORE_1_5_3.getName(), null, null, "red"));
5354
versions.add(new Version("1.5.2", "June 2016", Version.VersionLink.CORE_1_5_2.getName(), Version.VersionLink.ADDINS_1_5_2.getName(), Version.VersionLink.THEME_1_5_2.getName(), "orange"));
5455
versions.add(new Version("1.5.1", "June 2016", Version.VersionLink.CORE_1_5_1.getName(), Version.VersionLink.ADDINS_1_5_1.getName(), Version.VersionLink.THEME_1_5_1.getName(), "teal"));
5556
versions.add(new Version("1.5.0", "April 2016", Version.VersionLink.CORE_1_5_0.getName(), Version.VersionLink.ADDINS_1_5_0.getName(), Version.VersionLink.THEME_1_5_0.getName(), "deep-orange"));

‎src/main/java/gwt/material/design/demo/client/application/dto/Version.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ public class Version implements Serializable {
3232
public enum VersionLink{
3333

3434
// FOR gwt-material Core
35+
CORE_1_5_3("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material/1.5.3"),
3536
CORE_1_5_2("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material/1.5.2"),
3637
CORE_1_5_1("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material/1.5.1"),
3738
CORE_1_5_0("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material/1.5.0"),

‎src/main/java/gwt/material/design/demo/client/application/gettingstarted/GettingStartedView.ui.xml‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,39 @@
2828
<m:MaterialPanel>
2929
<m:MaterialTitle title="Maven Repository" description="We release a maven repository in order to improve the productivity of GWT Material."/>
3030
<m:MaterialLink ui:field="btnMaven" text="http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material." iconType="LINK" iconPosition="LEFT" textColor="blue"/>
31+
<m:MaterialLabel text="For gwt-material we've proposed an emergency release of 1.5.3 for the fixed on MaterialSwitch core component" />
3132
<demo:PrettyPre addStyleNames="lang-xml z-depth-1">
3233
&emsp;&lt;dependency><br/>
3334
&emsp;&lt;groupId>com.github.gwtmaterialdesign&lt;/groupId><br/>
3435
&emsp;&lt;artifactId>gwt-material&lt;/artifactId><br/>
36+
&emsp;&lt;version>1.5.3&lt;/version><br/>
37+
&lt;/dependency>
38+
</demo:PrettyPre>
39+
<m:MaterialRow>
40+
<m:MaterialLink target="_blank" text="gwt-material-addins" href="http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-addins" iconType="EXTENSION" iconPosition="LEFT" textColor="blue"/>
41+
</m:MaterialRow>
42+
<demo:PrettyPre addStyleNames="lang-xml z-depth-1">
43+
&emsp;&lt;dependency><br/>
44+
&emsp;&lt;groupId>com.github.gwtmaterialdesign&lt;/groupId><br/>
45+
&emsp;&lt;artifactId>gwt-material-addins&lt;/artifactId><br/>
46+
&emsp;&lt;version>1.5.2&lt;/version><br/>
47+
&lt;/dependency>
48+
</demo:PrettyPre>
49+
<m:MaterialRow>
50+
<m:MaterialLink target="_blank" text="gwt-material-themes" href="http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material-themes" iconType="PALETTE" iconPosition="LEFT" textColor="blue"/>
51+
</m:MaterialRow>
52+
<demo:PrettyPre addStyleNames="lang-xml z-depth-1">
53+
&emsp;&lt;dependency><br/>
54+
&emsp;&lt;groupId>com.github.gwtmaterialdesign&lt;/groupId><br/>
55+
&emsp;&lt;artifactId>gwt-material-themes&lt;/artifactId><br/>
3556
&emsp;&lt;version>1.5.2&lt;/version><br/>
3657
&lt;/dependency>
3758
</demo:PrettyPre>
3859
</m:MaterialPanel>
3960
<m:MaterialPanel>
4061
<m:MaterialTitle title="Download the JAR (Alternative)"
4162
description="If you are not using maven you can download the latest Jar Release easily and add it in your classpath."/>
42-
<m:MaterialButton ui:field="btnDownloadGWTMaterial" backgroundColor="blue" waves="LIGHT" iconType="FILE_DOWNLOAD" iconPosition="RIGHT" text="Download 1.5.2"/>
63+
<m:MaterialButton ui:field="btnDownloadGWTMaterial" backgroundColor="blue" waves="LIGHT" iconType="FILE_DOWNLOAD" iconPosition="RIGHT" text="Download 1.5.3"/>
4364
</m:MaterialPanel>
4465

4566
<m:MaterialTitle title="Wiki" description="A brief information about gwt-material using Github Wikis" />

‎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
@@ -92,7 +92,7 @@
9292
</m.html:ListItem>
9393
<m.html:ListItem waves="DEFAULT">
9494
<m:MaterialLink targetHistoryToken="{tokens.getGettingstarted}" iconPosition="LEFT" iconType="CLOUD_DOWNLOAD" text="Getting Started" textColor="blue">
95-
<m:MaterialBadge text="1.5.2" backgroundColor="blue" textColor="white"/>
95+
<m:MaterialBadge text="1.5.x" backgroundColor="blue" textColor="white"/>
9696
</m:MaterialLink>
9797
</m.html:ListItem>
9898
<m:MaterialCollapsible>

0 commit comments

Comments
 (0)