Merge pull request #40 from GwtMaterialDesign/release_2.0

Release 2.0-rc2

Author: kevzlou7979

.travis.yml

@@ -22,7 +22,7 @@ before_install:
 - mvn install -DskipTests=true -DdryRun=true
 - cd ..
 # install the gwt-material-table library before we build the demo
-- git clone -b master https://github.com/GwtMaterialDesign/gwt-material-table.git
+- git clone -b release_1.0 https://github.com/GwtMaterialDesign/gwt-material-table.git
 - cd gwt-material-table
 - mvn install -DskipTests=true -DdryRun=true
 - cd ..

.utility/update_demo_site.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 set -ev
-if [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "master" ]; then
+if [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "release_2.0" ]; then
 
 if [[ -z "$GH_TOKEN" ]]; then
 echo -e "GH_TOKEN is not set"
@@ -24,23 +24,23 @@ git clone --quiet --branch=gh-pages https://[email protected]/GwtMaterialDesi
 cd gh-pages
 
 # remove the GwtMaterialDemo directories from git.
-if [[ -d ./gwtmaterialdemo ]]; then
-git rm -rf ./gwtmaterialdemo
+if [[ -d ./snapshot/gwtmaterialdemo ]]; then
+git rm -rf ./snapshot/gwtmaterialdemo
 fi
-if [[ -f ./index.html ]]; then
-git rm -rf ./index.html
+if [[ -f ./snapshot/index.html ]]; then
+git rm -rf ./snapshot/index.html
 fi
-if [[ -d ./META-INF ]]; then
-git rm -rf ./META-INF
+if [[ -d ./snapshot/META-INF ]]; then
+git rm -rf ./snapshot/META-INF
 fi
-if [[ -d ./WEB-INF ]]; then
-git rm -rf ./WEB-INF
+if [[ -d ./snapshot/WEB-INF ]]; then
+git rm -rf ./snapshot/WEB-INF
 fi
 
-# copy the new GwtMaterialDemo the 2.0-SNAPSHOT dir.
-unzip -u $TRAVIS_BUILD_DIR/target/gwt-material-demo-*.war -d ./
-rm -rf ./META-INF
-rm -rf ./WEB-INF
+# copy the new GwtMaterialDemo the snapshot dir.
+unzip -u $TRAVIS_BUILD_DIR/target/gwt-material-demo-*.war -d ./snapshot/
+rm -rf ./snapshot/META-INF
+rm -rf ./snapshot/WEB-INF
 
 git add -f .
 git commit -m "Auto-push demo to gh-pages successful. (Travis build: $TRAVIS_BUILD_NUMBER)"

README.md

@@ -2,13 +2,13 @@
 #gwt-material-demo [![Build Status](https://travis-ci.org/GwtMaterialDesign/gwt-material-demo.svg?branch=master)](https://travis-ci.org/GwtMaterialDesign/gwt-material-demo)
 Demo application to show the features of the [gwt-material](https://github.com/GwtMaterialDesign/gwt-material) library.
 
-### Release 2.0-rc1 Demo
+### Release 2.0-rc2 Demo
 [http://gwtmaterialdesign.github.io/gwt-material-demo](http://gwtmaterialdesign.github.io/gwt-material-demo)
 ```xml
 <dependency>
     <groupId>com.github.gwtmaterialdesign</groupId>
     <artifactId>gwt-material-demo</artifactId>
-    <version>2.0-rc1</version>
+    <version>2.0-rc2</version>
 </dependency>
 ```
 

pom.xml

@@ -4,14 +4,14 @@
     <parent>
         <artifactId>gwt-material-parent</artifactId>
         <groupId>com.github.gwtmaterialdesign</groupId>
-        <version>2.0-rc1</version>
+        <version>2.0-rc2</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>gwt-material-demo</artifactId>
     <packaging>war</packaging>
-    <version>2.0-rc1</version>
+    <version>2.0-rc2</version>
     <name>Gwt Material Demo</name>
     <description>Showcase for gwt-material</description>
 
@@ -34,8 +34,8 @@
         <gwt.version>2.8.0</gwt.version>
         <gwtp.version>1.5.3</gwtp.version>
         <gin.version>2.1.2</gin.version>
-        <gwt-material.version>2.0-rc1</gwt-material.version>
-        <gwt-material-table.version>1.0-rc1</gwt-material-table.version>
+        <gwt-material.version>2.0-rc2</gwt-material.version>
+        <gwt-material-table.version>1.0-rc2</gwt-material-table.version>
 
         <gwt.style>PRETTY</gwt.style>
 
@@ -223,19 +223,14 @@
 
     <repositories>
         <repository>
-            <id>snapshots-repo</id>
-            <url>https://oss.sonatype.org/content/repositories/google-snapshots</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
+            <id>central</id>
+            <name>Central Repository</name>
+            <url>https://repo.maven.apache.org/maven2</url>
         </repository>
         <repository>
-            <id>jboss-public-repository-group</id>
-            <name>JBoss Public Maven Repository Group</name>
-            <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+            <id>sonatype-nexus-snapshot</id>
+            <name>Sonatype Nexus snapshot repository</name>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
         </repository>
     </repositories>
 

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

@@ -36,6 +36,7 @@
 import gwt.material.design.demo.client.application.addins.iconmorph.IconMorphModule;
 import gwt.material.design.demo.client.application.addins.masonry.MasonryModule;
 import gwt.material.design.demo.client.application.addins.menubar.MenuBarModule;
+import gwt.material.design.demo.client.application.addins.overlay.OverlayModule;
 import gwt.material.design.demo.client.application.addins.pathanimator.PathAnimatorModule;
 import gwt.material.design.demo.client.application.addins.rating.RatingModule;
 import gwt.material.design.demo.client.application.addins.richeditor.RichEditorModule;
@@ -81,5 +82,6 @@ protected void configure() {
         install(new RatingModule());
         install(new ComboBoxModule());
         install(new DataTableModule());
+        install(new OverlayModule());
     }
 }

src/main/java/gwt/material/design/demo/client/application/addins/autocomplete/AutoCompleteView.ui.xml

@@ -40,7 +40,7 @@
             <m:MaterialTitle title="Autocomplete" description="Use GWT Autocomplete to search for matches from local or remote data sources. We used MultiWordSuggestOracle to populate the list to be added on the autocomplete values"/>
             <m:MaterialRow>
                 <m:MaterialColumn grid="s12 m12 l6">
-                    <ma:autocomplete.MaterialAutoComplete ui:field="acList" placeholder="Contacts" />
+                    <ma:autocomplete.MaterialAutoComplete ui:field="acList" placeholder="Contacts" grid="s12"/>
                 </m:MaterialColumn>
             </m:MaterialRow>
 
@@ -53,7 +53,7 @@
                 <p>To disable , add enabled="false" parameter on the autocomplete widget</p>
             </blockquote>
 
-            <m:MaterialButton ui:field="btnGetAll" text="Get All States" waves="LIGHT" backgroundColor="BLUE"/>
+            <m:MaterialButton ui:field="btnGetAll" text="Get All States" waves="LIGHT"/>
             <m:MaterialButton ui:field="btnClear" text="Clear" waves="DEFAULT" textColor="BLACK" backgroundColor="WHITE"/>
 
             <m.demo:PrettyPre addStyleNames="lang-java">
@@ -119,7 +119,7 @@
             <m:MaterialTitle title="Type TEXT" description="Type TEXT is just an alternative for combo box component."/>
             <m:MaterialRow>
                 <m:MaterialColumn grid="s12 m12 l6">
-                    <ma:autocomplete.MaterialAutoComplete ui:field="acListType" type="TEXT" limit="1" placeholder="Contacts" />
+                    <ma:autocomplete.MaterialAutoComplete ui:field="acListType" type="TEXT" limit="1" placeholder="Contacts" grid="s12"/>
                 </m:MaterialColumn>
             </m:MaterialRow>
             <demo:PrettyPre addStyleNames="lang-xml">
@@ -131,7 +131,7 @@
             <m:MaterialTitle title="Limiting Items" description="You can limit the autocomplete items by adding limit='2' attribute."/>
             <m:MaterialRow>
                 <m:MaterialColumn grid="s12 m12 l6">
-                    <ma:autocomplete.MaterialAutoComplete ui:field="acListLimit" limit="3" placeholder="Contacts" />
+                    <ma:autocomplete.MaterialAutoComplete ui:field="acListLimit" limit="3" placeholder="Contacts" grid="s12"/>
                 </m:MaterialColumn>
             </m:MaterialRow>
             <demo:PrettyPre addStyleNames="lang-xml">
@@ -145,7 +145,7 @@
             <m:MaterialModal ui:field="modal">
                 <m:MaterialModalContent>
                     <m:MaterialTitle title="Select contacts" description="Some description here..."/>
-                    <ma:autocomplete.MaterialAutoComplete ui:field="acModal" placeholder="Contacts"/>
+                    <ma:autocomplete.MaterialAutoComplete ui:field="acModal" placeholder="Contacts" grid="s12"/>
                 </m:MaterialModalContent>
                 <m:MaterialModalFooter textAlign="RIGHT">
                     <m:MaterialButton ui:field="btnClose" text="Close" type="FLAT" textColor="BLACK" waves="DEFAULT"/>

src/main/java/gwt/material/design/demo/client/application/addins/fileuploader/FileUploaderView.ui.xml

@@ -123,7 +123,7 @@
                 <p><b>Drag End</b> - Dragging has ended.</p>
                 <p><b>Drag Enter</b> - The user dragged a file onto the Dropzone.</p>
                 <p><b>Drag Over</b> - The user is dragging a file over the Dropzone.</p>
-                <p><b>Drag Leave</b> - The user is dragging a file over the Dropzone.</p>
+                <p><b>Drag Leave</b> - The user dragged a file out of the Dropzone.</p>
                 <p><b>Added File &lt;UploadFile></b> - When a file is added to the list.</p>
                 <p><b>Removed File &lt;UploadFile></b> - Called whenever a file is removed from the list. You can listen to this and delete the file from your server if you want to.</p>
                 <p><b>Error &lt;UploadFile></b> - An error occured. Receives the errorMessage as second parameter and if the error was due to the XMLHttpRequest the xhr object as third.</p>

src/main/java/gwt/material/design/demo/client/application/addins/masonry/MasonryView.ui.xml

@@ -98,7 +98,7 @@
 
         <m:MaterialRow addStyleNames="code">
             <m:MaterialTitle title="Origin Left" description="By default originLeft is set to true, you can rearrange the blocks into right by setting it to false." />
-            <ma:masonry.MaterialMasonry grid="l6 s12 m12" originLeft="false">
+            <ma:masonry.MaterialMasonry grid="l12 s12 m12" originLeft="false">
                 <m:MaterialColumn grid="l2 s12 m6" backgroundColor="BLUE_LIGHTEN_1" height="200px" waves="DEFAULT" padding="0"/>
                 <m:MaterialColumn grid="l3 s12 m6" backgroundColor="GREY_LIGHTEN_2" height="400px" waves="DEFAULT" padding="0"/>
                 <m:MaterialColumn grid="l3 s12 m6" backgroundColor="YELLOW_LIGHTEN_3" height="200px" waves="DEFAULT" padding="0"/>
@@ -118,7 +118,7 @@
 
         <m:MaterialRow addStyleNames="code">
             <m:MaterialTitle title="Origin Top" description="By default originLeft is set to false, you can rearrange the blocks into bottom by setting it to false." />
-            <ma:masonry.MaterialMasonry grid="l6 s12 m12" originTop="false">
+            <ma:masonry.MaterialMasonry grid="l12 s12 m12" originTop="false">
                 <m:MaterialColumn grid="l2 s12 m6" backgroundColor="BLUE_LIGHTEN_1" height="200px" waves="DEFAULT" padding="0"/>
                 <m:MaterialColumn grid="l3 s12 m6" backgroundColor="GREY_LIGHTEN_2" height="400px" waves="DEFAULT" padding="0"/>
                 <m:MaterialColumn grid="l3 s12 m6" backgroundColor="YELLOW_LIGHTEN_3" height="200px" waves="DEFAULT" padding="0"/>
@@ -138,7 +138,7 @@
 
         <m:MaterialRow addStyleNames="code">
             <m:MaterialTitle title="Transition Duration" description="You can set how fast the transition of masonry by settung it's duration, if set to 0 then no transition will be applied." />
-            <ma:masonry.MaterialMasonry grid="l6 s12 m12" transitionDuration="0">
+            <ma:masonry.MaterialMasonry grid="l12 s12 m12" transitionDuration="0">
                 <m:MaterialColumn grid="l2 s12 m6" backgroundColor="BLUE_LIGHTEN_1" height="200px" waves="DEFAULT" padding="0"/>
                 <m:MaterialColumn grid="l3 s12 m6" backgroundColor="GREY_LIGHTEN_2" height="400px" waves="DEFAULT" padding="0"/>
                 <m:MaterialColumn grid="l3 s12 m6" backgroundColor="YELLOW_LIGHTEN_3" height="200px" waves="DEFAULT" padding="0"/>

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

@@ -0,0 +1,31 @@
+package gwt.material.design.demo.client.application.addins.overlay;
+
+/*
+ * #%L
+ * GwtMaterial
+ * %%
+ * Copyright (C) 2015 - 2016 GwtMaterialDesign
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
+
+import com.gwtplatform.mvp.client.gin.AbstractPresenterModule;
+
+public class OverlayModule extends AbstractPresenterModule {
+    @Override
+    protected void configure() {
+        bindPresenter(OverlayPresenter.class, OverlayPresenter.MyView.class, OverlayView.class, OverlayPresenter.MyProxy.class);
+    }
+}

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

@@ -0,0 +1,60 @@
+package gwt.material.design.demo.client.application.addins.overlay;
+
+/*
+ * #%L
+ * GwtMaterial
+ * %%
+ * Copyright (C) 2015 - 2016 GwtMaterialDesign
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
+
+import com.google.inject.Inject;
+import com.google.web.bindery.event.shared.EventBus;
+import com.gwtplatform.mvp.client.Presenter;
+import com.gwtplatform.mvp.client.View;
+import com.gwtplatform.mvp.client.annotations.NameToken;
+import com.gwtplatform.mvp.client.annotations.ProxyCodeSplit;
+import com.gwtplatform.mvp.client.presenter.slots.NestedSlot;
+import com.gwtplatform.mvp.client.proxy.ProxyPlace;
+import gwt.material.design.demo.client.application.ApplicationPresenter;
+import gwt.material.design.demo.client.event.SetPageTitleEvent;
+import gwt.material.design.demo.client.place.NameTokens;
+
+public class OverlayPresenter extends Presenter<OverlayPresenter.MyView, OverlayPresenter.MyProxy> {
+    interface MyView extends View {
+    }
+
+    @NameToken(NameTokens.overlay)
+    @ProxyCodeSplit
+    interface MyProxy extends ProxyPlace<OverlayPresenter> {
+    }
+
+    @Inject
+    OverlayPresenter(
+            EventBus eventBus,
+            MyView view,
+            MyProxy proxy) {
+        super(eventBus, view, proxy, ApplicationPresenter.SLOT_MAIN);
+
+    }
+
+    @Override
+    protected void onReveal() {
+        super.onReveal();
+        SetPageTitleEvent.fire("Overlay", "Provides a meaningful transition of source widget to popup or overlay panel.", "addins/scrollfire/OverlayView", this);
+    }
+
+}