Skip to content

Commit

Permalink
Merge pull request #21 from GwtMaterialDesign/release_1.5.2
Browse files Browse the repository at this point in the history
Emergency Release for 1.5.3
  • Loading branch information
kevzlou7979 authored Jul 1, 2016
2 parents 4959bd8 + 6a4ddf1 commit ec8181f
Show file tree
Hide file tree
Showing 12 changed files with 186 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ cache:
- $HOME/.m2
before_install:
# install the gwt-material library before we build the demo
- git clone -b release_1.5.2 https://github.com/GwtMaterialDesign/gwt-material.git
- git clone -b release_1.5.3 https://github.com/GwtMaterialDesign/gwt-material.git
- cd gwt-material
- mvn install -DskipTests=true -DdryRun=true
- cd ..
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@
<dependency>
<groupId>com.github.gwtmaterialdesign</groupId>
<artifactId>gwt-material</artifactId>
<version>${gwt-material.version}</version>
<version>1.5.3</version>
</dependency>
<dependency>
<groupId>com.github.gwtmaterialdesign</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,11 @@
import com.google.gwt.uibinder.client.UiHandler;
import com.google.gwt.user.client.ui.Widget;
import com.gwtplatform.mvp.client.ViewImpl;
import gwt.material.design.client.ui.MaterialButton;
import gwt.material.design.client.ui.MaterialCard;
import gwt.material.design.client.ui.MaterialListBox;
import gwt.material.design.client.ui.MaterialToast;
import gwt.material.design.client.ui.animate.MaterialAnimation;
import gwt.material.design.client.ui.animate.MaterialAnimator;
import gwt.material.design.client.ui.animate.Transition;

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

@UiField
MaterialButton iconHeart, iconCallback, iconState;

@UiField
MaterialListBox lstAnimations;

Expand Down Expand Up @@ -147,4 +153,33 @@ private void animate(){
Transition transition = Transition.fromStyleName(value);
MaterialAnimator.animate(transition, card, 1000);
}
}

@UiHandler("btnAnimateInfinite")
void onAnimateInfinite(ClickEvent e) {
MaterialAnimator.animate(Transition.PULSE, iconHeart, 1000, true);
}

@UiHandler("btnStopAnimation")
void onStopAnimation(ClickEvent e) {
MaterialAnimator.stopAnimation(iconHeart);
}

@UiHandler("btnAnimateCallback")
void onCallback(ClickEvent e) {
Runnable callback = new Runnable() {
@Override
public void run() {
MaterialToast.fireToast("Animation is finished");
}
};
MaterialAnimator.animate(Transition.FLIPINX, iconCallback, 200, callback);
}

@UiHandler("btnAnimateStateful")
void onStateful(ClickEvent e) {
new MaterialAnimation().durationMillis(1000)
.delayMillis(100)
.transition(Transition.WOBBLE)
.animate(iconState);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@
.block{
display: block;
}
.icon i{
font-size: 4em;
}
</ui:style>
<m:MaterialPanel>
<m:MaterialTitle title="Usage" description="You can easily apply animation by calling MaterialAnimator.animate(Transition, Widget, Delay);"/>
Expand All @@ -50,5 +53,52 @@
<m:MaterialButton ui:field="btnAnimate" text="Animate" backgroundColor="blue" textColor="white"/>
</m:MaterialColumn>
</m:MaterialRow>

<m:MaterialTitle title="Infinite" description="You can easily set the animation infinite."/>
<m:MaterialRow>
<m:MaterialColumn grid="s12 l6">
<demo:PrettyPre addStyleNames="lang-java z-depth-1">
// Play Infinite Animation<br/>
MaterialAnimator.animate(Transition.PULSE, heart, 1000, true);<br/>
// Stop Infinite Animation <br/>
MaterialAnimator.stopAnimation(heart);<br/>
</demo:PrettyPre>
<m:MaterialButton ui:field="iconHeart" width="100px" height="100px" addStyleNames="{style.icon}" type="FLOATING" size="LARGE" iconType="FAVORITE" backgroundColor="pink" />
</m:MaterialColumn>
</m:MaterialRow>
<m:MaterialButton ui:field="btnAnimateInfinite" text="Infinite Animation" backgroundColor="blue" textColor="white"/>
<m:MaterialButton ui:field="btnStopAnimation" text="Stop Animation" type="FLAT" />

<m:MaterialTitle title="Callback" description="Setting the callback after animation" />
<m:MaterialRow>
<m:MaterialColumn grid="s12 l6">
<demo:PrettyPre addStyleNames="lang-java z-depth-1">
&emsp;Runnable callback = new Runnable() {<br/>
&emsp;@Override<br/>
&emsp;public void run() {<br/>
&emsp;&emsp;MaterialToast.fireToast("Animation is finished");<br/>
&emsp;}<br/>
};<br/>
MaterialAnimator.animate(Transition.FLIPINX, iconCallback, 200, callback);
</demo:PrettyPre>
<m:MaterialButton ui:field="iconCallback" width="100px" height="100px" addStyleNames="{style.icon}" type="FLOATING" size="LARGE" iconType="DIRECTIONS_BIKE" backgroundColor="blue" />
</m:MaterialColumn>
</m:MaterialRow>
<m:MaterialButton ui:field="btnAnimateCallback" text="Animate with Callback" backgroundColor="blue" textColor="white"/>

<m:MaterialTitle title="Stateful Animation" description="Stateful object holding animation details. Default behaviour is a bounce transition for 800ms." />
<m:MaterialRow>
<m:MaterialColumn grid="s12 l6">
<demo:PrettyPre addStyleNames="lang-java z-depth-1">
&emsp;new MaterialAnimation().durationMillis(1000)<br/>
&emsp;.delayMillis(100)<br/>
&emsp;.transition(Transition.WOBBLE)<br/>
&emsp;.animate(iconState);
</demo:PrettyPre>
<m:MaterialButton ui:field="iconState" width="100px" height="100px" addStyleNames="{style.icon}" type="FLOATING" size="LARGE" iconType="POLYMER" backgroundColor="purple" />
</m:MaterialColumn>
</m:MaterialRow>
<m:MaterialButton ui:field="btnAnimateStateful" text="Animate with Callback" backgroundColor="blue" textColor="white"/>

</m:MaterialPanel>
</ui:UiBinder>
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ interface Binder extends UiBinder<Widget, FormsView> {
@UiField MaterialLabel lblRange;
@UiField MaterialRange range;

@UiField MaterialTextArea txtAreaAuto;
@UiField MaterialTextArea txtAreaFocus;

@UiField MaterialFloatBox txtFloatBox;
@UiField MaterialIntegerBox txtIntegerBox;
@UiField MaterialDoubleBox txtDoubleBox;
Expand All @@ -56,6 +59,49 @@ interface Binder extends UiBinder<Widget, FormsView> {
txtIntegerBox.setValue(10);
txtDoubleBox.setValue(9999.90);
txtLongBox.setValue((long) 1000.00);
txtAreaAuto.setValue("Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc quam mauris, accumsan placerat " +
"lectus ac, tincidunt mattis nisl. Ut efficitur massa in libero gravida tincidunt. Vestibulum eget massa " +
"eget ex auctor tempus. Aenean vitae augue euismod, lacinia lectus ut, rhoncus enim. Sed vitae laoreet " +
"felis, eget ullamcorper nunc. Vivamus elit urna, varius et arcu vel, euismod auctor augue. Praesent " +
"scelerisque scelerisque libero sit amet euismod. Mauris eu est at felis feugiat tincidunt eu vel lectus. " +
"Ut pretium magna vitae massa sollicitudin, eu tincidunt sapien scelerisque. Maecenas gravida lorem non dui " +
"pretium, id vestibulum mi imperdiet. Fusce facilisis, dui nec ultrices molestie, nisi metus bibendum lacus, " +
"eget posuere est odio vitae nulla. Mauris laoreet non justo fringilla tempus. Mauris ut risus risus. " +
"Vivamus auctor accumsan gravida. Nam venenatis sapien nisl, quis accumsan odio dignissim non. Vestibulum " +
"aliquam semper condimentum. Suspendisse a eros elementum, dapibus quam in, aliquet lorem. Morbi mi dui, " +
"convallis at luctus ultricies, malesuada at leo. Morbi et turpis a ex vehicula ullamcorper. Vestibulum " +
"lacinia, orci eget elementum fermentum, lectus velit interdum erat, sit amet pharetra justo elit in tortor. " +
"Suspendisse ac vestibulum nisi.\n" +
"\n" +
"Nunc euismod metus nec elit sollicitudin blandit. Proin eleifend ex bibendum sodales blandit. Vestibulum " +
"varius pharetra arcu, sit amet pellentesque odio hendrerit nec. Integer faucibus imperdiet tortor a tempus. " +
"Sed accumsan condimentum nisl. Cras interdum sapien quis maximus commodo. Nulla malesuada imperdiet enim, " +
"non ornare elit auctor in. Fusce at ipsum eget turpis tincidunt maximus. Nunc sodales tortor nec tincidunt " +
"fringilla. Quisque sollicitudin ipsum at dolor faucibus, ultricies convallis ipsum convallis. Donec " +
"consequat velit vel molestie tempus. Donec et accumsan lacus, non sollicitudin quam. Morbi arcu lacus, " +
"blandit eu lacus nec, finibus tempus ligula.", true);

txtAreaFocus.setValue("Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc quam mauris, accumsan placerat " +
"lectus ac, tincidunt mattis nisl. Ut efficitur massa in libero gravida tincidunt. Vestibulum eget massa " +
"eget ex auctor tempus. Aenean vitae augue euismod, lacinia lectus ut, rhoncus enim. Sed vitae laoreet " +
"felis, eget ullamcorper nunc. Vivamus elit urna, varius et arcu vel, euismod auctor augue. Praesent " +
"scelerisque scelerisque libero sit amet euismod. Mauris eu est at felis feugiat tincidunt eu vel lectus. " +
"Ut pretium magna vitae massa sollicitudin, eu tincidunt sapien scelerisque. Maecenas gravida lorem non dui " +
"pretium, id vestibulum mi imperdiet. Fusce facilisis, dui nec ultrices molestie, nisi metus bibendum lacus, " +
"eget posuere est odio vitae nulla. Mauris laoreet non justo fringilla tempus. Mauris ut risus risus. " +
"Vivamus auctor accumsan gravida. Nam venenatis sapien nisl, quis accumsan odio dignissim non. Vestibulum " +
"aliquam semper condimentum. Suspendisse a eros elementum, dapibus quam in, aliquet lorem. Morbi mi dui, " +
"convallis at luctus ultricies, malesuada at leo. Morbi et turpis a ex vehicula ullamcorper. Vestibulum " +
"lacinia, orci eget elementum fermentum, lectus velit interdum erat, sit amet pharetra justo elit in tortor. " +
"Suspendisse ac vestibulum nisi.\n" +
"\n" +
"Nunc euismod metus nec elit sollicitudin blandit. Proin eleifend ex bibendum sodales blandit. Vestibulum " +
"varius pharetra arcu, sit amet pellentesque odio hendrerit nec. Integer faucibus imperdiet tortor a tempus. " +
"Sed accumsan condimentum nisl. Cras interdum sapien quis maximus commodo. Nulla malesuada imperdiet enim, " +
"non ornare elit auctor in. Fusce at ipsum eget turpis tincidunt maximus. Nunc sodales tortor nec tincidunt " +
"fringilla. Quisque sollicitudin ipsum at dolor faucibus, ultricies convallis ipsum convallis. Donec " +
"consequat velit vel molestie tempus. Donec et accumsan lacus, non sollicitudin quam. Morbi arcu lacus, " +
"blandit eu lacus nec, finibus tempus ligula.", true);
}

@UiHandler("lstOptions")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,19 @@
&lt;m:MaterialTextArea ui:field="txtArea" placeholder="About" iconType="FACE"/><br/>
</demo:PrettyPre>

<m:MaterialTitle title="Textarea" description="Textareas use a resize policy that can be configured to suit your need. "/>
<m:MaterialTextArea ui:field="txtAreaAuto" placeholder="Using AUTO" resizeRule="AUTO" grid="s12"/>

<demo:PrettyPre addStyleNames="lang-xml z-depth-1">
&lt;m:MaterialTextArea placeholder="Using AUTO" resizeRule="AUTO"/><br/>
</demo:PrettyPre>

<m:MaterialTextArea ui:field="txtAreaFocus" placeholder="Using FOCUS" resizeRule="FOCUS" grid="s12"/>

<demo:PrettyPre addStyleNames="lang-xml z-depth-1">
&lt;m:MaterialTextArea placeholder="Using FOCUS" resizeRule="FOCUS"/><br/>
</demo:PrettyPre>

<m:MaterialTitle title="Character Counter" description="Use a character counter in fields where a character restriction is in place."/>
<m:MaterialTextBox placeholder="Input Text" length="10" grid="s12"/>
<m:MaterialTextArea placeholder="Text Area" length="120" grid="s12"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ public static List<Hero> getAllHeroes(){

public static List<Version> getAllVersions() {
List<Version> versions = new ArrayList<>();
versions.add(new Version("1.5.3", "June 2016", Version.VersionLink.CORE_1_5_3.getName(), null, null, "red"));
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"));
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"));
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"));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ public class Version implements Serializable {
public enum VersionLink{

// FOR gwt-material Core
CORE_1_5_3("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material/1.5.3"),
CORE_1_5_2("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material/1.5.2"),
CORE_1_5_1("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material/1.5.1"),
CORE_1_5_0("http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material/1.5.0"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,39 @@
<m:MaterialPanel>
<m:MaterialTitle title="Maven Repository" description="We release a maven repository in order to improve the productivity of GWT Material."/>
<m:MaterialLink ui:field="btnMaven" text="http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material." iconType="LINK" iconPosition="LEFT" textColor="blue"/>
<m:MaterialLabel text="For gwt-material we've proposed an emergency release of 1.5.3 for the fixed on MaterialSwitch core component" />
<demo:PrettyPre addStyleNames="lang-xml z-depth-1">
&emsp;&lt;dependency><br/>
&emsp;&lt;groupId>com.github.gwtmaterialdesign&lt;/groupId><br/>
&emsp;&lt;artifactId>gwt-material&lt;/artifactId><br/>
&emsp;&lt;version>1.5.3&lt;/version><br/>
&lt;/dependency>
</demo:PrettyPre>
<m:MaterialRow>
<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"/>
</m:MaterialRow>
<demo:PrettyPre addStyleNames="lang-xml z-depth-1">
&emsp;&lt;dependency><br/>
&emsp;&lt;groupId>com.github.gwtmaterialdesign&lt;/groupId><br/>
&emsp;&lt;artifactId>gwt-material-addins&lt;/artifactId><br/>
&emsp;&lt;version>1.5.2&lt;/version><br/>
&lt;/dependency>
</demo:PrettyPre>
<m:MaterialRow>
<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"/>
</m:MaterialRow>
<demo:PrettyPre addStyleNames="lang-xml z-depth-1">
&emsp;&lt;dependency><br/>
&emsp;&lt;groupId>com.github.gwtmaterialdesign&lt;/groupId><br/>
&emsp;&lt;artifactId>gwt-material-themes&lt;/artifactId><br/>
&emsp;&lt;version>1.5.2&lt;/version><br/>
&lt;/dependency>
</demo:PrettyPre>
</m:MaterialPanel>
<m:MaterialPanel>
<m:MaterialTitle title="Download the JAR (Alternative)"
description="If you are not using maven you can download the latest Jar Release easily and add it in your classpath."/>
<m:MaterialButton ui:field="btnDownloadGWTMaterial" backgroundColor="blue" waves="LIGHT" iconType="FILE_DOWNLOAD" iconPosition="RIGHT" text="Download 1.5.2"/>
<m:MaterialButton ui:field="btnDownloadGWTMaterial" backgroundColor="blue" waves="LIGHT" iconType="FILE_DOWNLOAD" iconPosition="RIGHT" text="Download 1.5.3"/>
</m:MaterialPanel>

<m:MaterialTitle title="Wiki" description="A brief information about gwt-material using Github Wikis" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
</m.html:ListItem>
<m.html:ListItem waves="DEFAULT">
<m:MaterialLink targetHistoryToken="{tokens.getGettingstarted}" iconPosition="LEFT" iconType="CLOUD_DOWNLOAD" text="Getting Started" textColor="blue">
<m:MaterialBadge text="1.5.2" backgroundColor="blue" textColor="white"/>
<m:MaterialBadge text="1.5.x" backgroundColor="blue" textColor="white"/>
</m:MaterialLink>
</m.html:ListItem>
<m:MaterialCollapsible>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<!-- 1.6.0 -->
<m:MaterialCard grid="s12 l8" offset="l2" >
<m:MaterialCardContent grid="s12 l3">
<m:MaterialCardTitle text="1.5.2" textColor="black"/>
<m:MaterialCardTitle text="1.6.0" textColor="black"/>
<m:MaterialLabel textColor="grey" text="Ongoing"/>
</m:MaterialCardContent>
<m:MaterialCardAction grid="s12 l9" padding="12" backgroundColor="grey lighten-3" addStyleNames="{style.horizontalCard}">
Expand All @@ -42,6 +42,18 @@
</m:MaterialPanel>
</m:MaterialCardAction>
</m:MaterialCard>
<!-- 1.5.3 -->
<m:MaterialCard grid="s12 l8" offset="l2" >
<m:MaterialCardContent grid="s12 l3">
<m:MaterialCardTitle text="1.5.3" textColor="black"/>
<m:MaterialLabel textColor="grey" text="June 2016"/>
</m:MaterialCardContent>
<m:MaterialCardAction grid="s12 l9" padding="12" backgroundColor="grey lighten-3" addStyleNames="{style.horizontalCard}">
<m:MaterialPanel>
<m:MaterialChip letter="E" letterColor="white" letterBackgroundColor="red" text="Emergency Release for MaterialSwitch Bug Fix" margin="4"/>
</m:MaterialPanel>
</m:MaterialCardAction>
</m:MaterialCard>
<!-- 1.5.2 -->
<m:MaterialCard grid="s12 l8" offset="l2" >
<m:MaterialCardContent grid="s12 l3">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apkUrl=http://gwt-material.appspot.com/bin/gwtmaterial.apk
rawSourceUrl=http://gwt-material.appspot.com/bin/materialize-v0.96.5.zip
sourceUrl=http://central.maven.org/maven2/com/github/gwtmaterialdesign/gwt-material/1.5.2/gwt-material-1.5.2.jar
sourceUrl=http://central.maven.org/maven2/com/github/gwtmaterialdesign/gwt-material/1.5.3/gwt-material-1.5.3.jar
gitterUrl=https://gitter.im/GwtMaterialDesign/gwt-material
weatherIconsUrl=http://gwt-material.appspot.com/bin/weather
mavenUrl=http://mvnrepository.com/artifact/com.github.gwtmaterialdesign/gwt-material
Expand Down

0 comments on commit ec8181f

Please sign in to comment.