Transition Added, Switch bug fixed

kevzlou7979 · kevzlou7979 · commit 904f02a5b402 · 2015-04-16T18:52:26.000+08:00
diff --git a/src/main/java/gwt/material/design/client/resources/MaterialResources.java b/src/main/java/gwt/material/design/client/resources/MaterialResources.java
@@ -20,7 +20,7 @@ public interface MaterialResources extends ClientBundle {
 
 	@Source("materialize.min.js")
 	TextResource materializeJs();
-
+	
 	@Source("materialcss.gss")
 	MaterialCSS materialcss();
 
diff --git a/src/main/java/gwt/material/design/client/resources/ResourcesLoader.java b/src/main/java/gwt/material/design/client/resources/ResourcesLoader.java
@@ -27,6 +27,7 @@ public class ResourcesLoader {
     public ResourcesLoader(MaterialResources resources) {
         injectJQuery(resources);
         injectMaterializeJs(resources);
+       
     }
 
     private void injectJQuery(MaterialResources resources) {
diff --git a/src/main/java/gwt/material/design/client/ui/ListItem.java b/src/main/java/gwt/material/design/client/ui/ListItem.java
@@ -1,4 +1,4 @@
-package gwt.material.design.client.custom;
+package gwt.material.design.client.ui;
 
 import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.ui.ComplexPanel;
@@ -7,6 +7,8 @@
 @SuppressWarnings("deprecation")
 public class ListItem extends ComplexPanel {
 	
+	private String opacity;
+	
 	public ListItem() {
 		setElement(DOM.createElement("LI"));
 	}
@@ -24,4 +26,13 @@ public void insert(Widget w, int beforeIndex) {
 		super.insert(w, getElement(), beforeIndex, true);
 	}
 
+	public String getOpacity() {
+		return opacity;
+	}
+
+	public void setOpacity(String opacity) {
+		this.opacity = opacity;
+		this.getElement().getStyle().setOpacity(Double.parseDouble(opacity));
+	}
+
 }
diff --git a/src/main/java/gwt/material/design/client/ui/MaterialCollapsible.java b/src/main/java/gwt/material/design/client/ui/MaterialCollapsible.java
@@ -1,7 +1,5 @@
 package gwt.material.design.client.ui;
 
-import gwt.material.design.client.custom.UnorderedList;
-
 import com.google.gwt.uibinder.client.UiChild;
 import com.google.gwt.user.client.ui.Widget;
 
diff --git a/src/main/java/gwt/material/design/client/ui/MaterialCollapsibleItem.java b/src/main/java/gwt/material/design/client/ui/MaterialCollapsibleItem.java
@@ -1,7 +1,5 @@
 package gwt.material.design.client.ui;
 
-import gwt.material.design.client.custom.ListItem;
-
 import com.google.gwt.dom.client.Style.Unit;
 import com.google.gwt.uibinder.client.UiChild;
 import com.google.gwt.user.client.ui.Widget;
diff --git a/src/main/java/gwt/material/design/client/ui/MaterialCollection.java b/src/main/java/gwt/material/design/client/ui/MaterialCollection.java
@@ -1,8 +1,6 @@
 package gwt.material.design.client.ui;
 
-import gwt.material.design.client.custom.ListItem;
 import gwt.material.design.client.custom.MaterialWidget;
-import gwt.material.design.client.custom.UnorderedList;
 import gwt.material.design.client.resources.MaterialResources;
 
 import com.google.gwt.core.client.GWT;
diff --git a/src/main/java/gwt/material/design/client/ui/MaterialDropDown.java b/src/main/java/gwt/material/design/client/ui/MaterialDropDown.java
@@ -1,8 +1,6 @@
 package gwt.material.design.client.ui;
 
-import gwt.material.design.client.custom.ListItem;
 import gwt.material.design.client.custom.MaterialWidget;
-import gwt.material.design.client.custom.UnorderedList;
 import gwt.material.design.client.resources.MaterialResources;
 
 import com.google.gwt.core.client.GWT;
diff --git a/src/main/java/gwt/material/design/client/ui/MaterialFloatingContainer.java b/src/main/java/gwt/material/design/client/ui/MaterialFloatingContainer.java
@@ -1,7 +1,5 @@
 package gwt.material.design.client.ui;
 
-import gwt.material.design.client.custom.ListItem;
-import gwt.material.design.client.custom.UnorderedList;
 import gwt.material.design.client.resources.MaterialResources;
 
 import com.google.gwt.dom.client.Style.Unit;
diff --git a/src/main/java/gwt/material/design/client/ui/MaterialImage.java b/src/main/java/gwt/material/design/client/ui/MaterialImage.java
@@ -6,7 +6,8 @@ public class MaterialImage extends Image{
 	
 	private String type="";
 	private String caption="";
-
+	private String opacity;
+	
 	public MaterialImage() {
 		
 	}
@@ -44,5 +45,12 @@ public void setCaption(String caption) {
 		this.getElement().setAttribute("data-caption", caption);
 	}
 	
-	
+	public String getOpacity() {
+		return opacity;
+	}
+
+	public void setOpacity(String opacity) {
+		this.opacity = opacity;
+		this.getElement().getStyle().setOpacity(Double.parseDouble(opacity));
+	}
 }
diff --git a/src/main/java/gwt/material/design/client/ui/MaterialNavBar.java b/src/main/java/gwt/material/design/client/ui/MaterialNavBar.java
@@ -1,8 +1,6 @@
 package gwt.material.design.client.ui;
 
 import gwt.material.design.client.custom.CustomAnchor;
-import gwt.material.design.client.custom.ListItem;
-import gwt.material.design.client.custom.UnorderedList;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.dom.client.Style.Display;
diff --git a/src/main/java/gwt/material/design/client/ui/MaterialPagination.java b/src/main/java/gwt/material/design/client/ui/MaterialPagination.java
@@ -1,7 +1,6 @@
 package gwt.material.design.client.ui;
 
 import gwt.material.design.client.custom.MaterialWidget;
-import gwt.material.design.client.custom.UnorderedList;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/gwt/material/design/client/ui/MaterialSearch.java b/src/main/java/gwt/material/design/client/ui/MaterialSearch.java
@@ -0,0 +1,20 @@
+package gwt.material.design.client.ui;
+
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.uibinder.client.UiBinder;
+import com.google.gwt.user.client.ui.Composite;
+import com.google.gwt.user.client.ui.Widget;
+
+public class MaterialSearch extends Composite {
+
+	private static MaterialSearchUiBinder uiBinder = GWT
+			.create(MaterialSearchUiBinder.class);
+
+	interface MaterialSearchUiBinder extends UiBinder<Widget, MaterialSearch> {
+	}
+
+	public MaterialSearch() {
+		initWidget(uiBinder.createAndBindUi(this));
+	}
+
+}
diff --git a/src/main/java/gwt/material/design/client/ui/MaterialSwitch.java b/src/main/java/gwt/material/design/client/ui/MaterialSwitch.java
@@ -51,12 +51,13 @@ public Boolean getValue() {
 
 	public void setValue(Boolean value) {
 		this.value = value;
-		setInputValue(true);
+		if(value){
+			cbBox.getElement().setAttribute("checked", ""+value);
+		}else{
+			cbBox.getElement().removeAttribute("checked");
+		}
 	}
 
-	public static native void setInputValue(Boolean real)/*-{
-		$wnd.jQuery('#switch').prop('checked', real);
-	}-*/;
 
 	@Override
 	public HandlerRegistration addChangeHandler(ChangeHandler handler) {
diff --git a/src/main/java/gwt/material/design/client/ui/MaterialTabs.java b/src/main/java/gwt/material/design/client/ui/MaterialTabs.java
@@ -1,9 +1,7 @@
 package gwt.material.design.client.ui;
 
 import gwt.material.design.client.custom.CustomAnchor;
-import gwt.material.design.client.custom.ListItem;
 import gwt.material.design.client.custom.MaterialWidget;
-import gwt.material.design.client.custom.UnorderedList;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.uibinder.client.UiBinder;
diff --git a/src/main/java/gwt/material/design/client/ui/MaterialWeather.java b/src/main/java/gwt/material/design/client/ui/MaterialWeather.java
@@ -26,12 +26,12 @@ public MaterialWeather(String html) {
 	protected void onAttach() {
 		// TODO Auto-generated method stub
 		super.onAttach();
-		String name = String.valueOf(hashCode());
+		String name = "weatherPanel";
 		this.addStyleName(name);
 		showWeather(location, name, color);
 	}
 
-	public String getLocation() {
+	public String getLocation() {	
 		return location;
 	}
 
@@ -48,51 +48,38 @@ public void setColor(String color) {
 	}
 
 	public static native void showWeather(String location, String div, String color)/*-{
-		$wnd.jQuery
-				.getJSON(
-						"http://api.openweathermap.org/data/2.5/weather?q="
-								+ location,
-						function(data) {
-							var items = [];
-							var location = data.sys.country + ", " + data.name;
-							var icon = "http://openweathermap.org/img/w/"
-									+ data.weather[0].icon + ".png"
-							var temp = data.main.temp - 273.15;
-
-							var main = data.weather[0].main;
-							var desc = data.weather[0].description;
-							var humidity = data.main.humidity;
-							var pressure = data.main.pressure;
-							items
-									.push("<div class='row'> <div class='col s12 m12'> <div class='card white'> <h5 class='"
-											+ color
-											+ " white-text'  style='padding: 20px; margin-top: -5px;'>"
-											+ location
-											+ "</h5> <div class='card-content'> <div class='row "
-											+ color
-											+ "-text'> <div class='col s6 m6 l6'> <div class='col s3 m3 l3'> <p><img id='1' style='margin-top: 10px;' src='"
-											+ icon
-											+ "'></p> </div> <div class='col s8 m8 l8'> <h4>"
-											+ main
-											+ "</h4> <p>"
-											+ desc
-											+ "</p> </div> </div> <div class='col s6 m6 l6'> <h4>"
-											+ Math.round(temp * 10) / 10
-											+ "&#8451</h4> </div> </div> </div> <div class='card-action'> <a class='"
-											+ color
-											+ "-text' style='font-size: 0.7em;'>Humidity: "
-											+ humidity
-											+ "&#37</a> <a class='"
-											+ color
-											+ "-text' style='font-size: 0.7em;'>Pressure: "
-											+ pressure
-											+ "</a> </div> </div> </div> </div>");
-
-							$wnd.jQuery("<ul/>", {
-								"class" : "my-new-list",
-								html : items.join("")
-							}).appendTo("." + div);
-						});
+		$wnd.jQuery.getJSON( "http://api.openweathermap.org/data/2.5/weather?q=" + location, function( data ) {
+ 
+		  var items = [];
+		  var location = data.sys.country + ", " + data.name;
+		  var icon = "http://gwt-material.appspot.com/bin/weather/" +data.weather[0].icon + ".png"
+		  var temp = Math.round((data.main.temp - 273.15)* 10 ) / 10;
+		  
+		  var main = data.weather[0].main;
+		  var desc = data.weather[0].description;
+		  var humidity = data.main.humidity;
+		  var pressure = data.main.pressure;
+		  var d = new Date();
+		  var weekday = new Array(7);
+		  weekday[0]=  "Sunday";
+		  weekday[1] = "Monday";
+		  weekday[2] = "Tuesday";
+		  weekday[3] = "Wednesday";
+		  weekday[4] = "Thursday";
+		  weekday[5] = "Friday";
+		  weekday[6] = "Saturday";
+		
+		  var today = weekday[d.getDay()];
+		  
+		  items.push("<div class='center-align card white-text "+color+"'> <div class='row'> <ul id='weatherPanel' > <div class='col s12 m12 l6'> <li style='opacity: 0;'> <h5 >"+main+"</h5> <p style='margin-top: -5px; font-weight: 100;text-transform: capitalize;'>"+desc+"</p> </li> <li style='opacity: 0;'> <div class='row'> <div class='col s12 m4 l4'> <img src='"+icon+"' style='margin-top: 20px;'> </div> <div class='col s12 m8 l8'> <h2 style='font-weight: 100;'>"+temp+"</h2> </div> </div> </li> </div> <div class='col s12 m12 l6'> <li style='opacity: 0;'> <h5>"+location+"</h5> <p style='margin-top: -5px; font-weight: 100;'>"+today+"</p> </li> <div class='left-align'> <li style='opacity: 0;'> <span><i class='mdi-communication-invert-colors-on'> </i> "+humidity+"%</span><br> </li> <li style='opacity: 0;'> <span><i class='mdi-device-wifi-tethering'> </i>3.9  mph</span><br> </li> <li style='opacity: 0;'> <span><i class='mdi-av-timer'></i>"+pressure+"  hPa</span> </li> </div> </div> </ul> </div> </div>");
+		
+		
+		  $wnd.jQuery( "<ul/>", { "class": "my-new-list",  html: items.join( "" ) }).appendTo( "." + div );
+			
+		  $wnd.Materialize.showStaggeredList('#weatherPanel');
+		});
+		
+		
 	}-*/;
 
 }
diff --git a/src/main/java/gwt/material/design/client/ui/UnorderedList.java b/src/main/java/gwt/material/design/client/ui/UnorderedList.java
@@ -1,4 +1,4 @@
-package gwt.material.design.client.custom;
+package gwt.material.design.client.ui;
 
 import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.ui.ComplexPanel;
diff --git a/src/main/java/gwt/material/design/client/ui/animate/MaterialAnimator.java b/src/main/java/gwt/material/design/client/ui/animate/MaterialAnimator.java
@@ -21,6 +21,8 @@
  */
 
 import gwt.material.design.client.resources.MaterialResources;
+import gwt.material.design.client.ui.ListItem;
+import gwt.material.design.client.ui.UnorderedList;
 
 import com.google.gwt.user.client.Timer;
 import com.google.gwt.user.client.ui.Widget;
@@ -30,11 +32,17 @@ public class MaterialAnimator {
 	
 	public static void animate(final Transition transition,final Widget w, int delayMillis){
 		switch (transition) {
-		case SCALE:
-			w.addStyleName(MaterialResources.INSTANCE.materialcss().materialScaleInitial());
-			break;
-		case PULL:
-			w.addStyleName(MaterialResources.INSTANCE.materialcss().pullInitial());
+		case SHOW_STAGGERED_LIST:
+			
+			if(w instanceof UnorderedList){
+				UnorderedList ul = (UnorderedList) w;
+				
+				for(Widget li : ul){
+					if(li instanceof ListItem){
+						li.getElement().getStyle().setOpacity(0);
+					}
+				}
+			}
 			break;
 		default:
 			break;
@@ -48,12 +56,14 @@ public void run() {
 			}
 
 			private void applyAnimation(Transition transition, Widget w) {
+				String name = String.valueOf(this.hashCode());
+				w.getElement().setId(name);
 				switch (transition) {
-				case SCALE:
-					w.addStyleName(MaterialResources.INSTANCE.materialcss().materialScale());
+				case SHOW_STAGGERED_LIST:
+					showStaggeredList(name);
 					break;
-				case PULL:
-					w.addStyleName(MaterialResources.INSTANCE.materialcss().pull());
+				case FADE_IN_IMAGE:
+					fadeInImage(name);
 					break;
 				default:
 					break;
@@ -65,4 +75,12 @@ private void applyAnimation(Transition transition, Widget w) {
 		w.removeStyleName(MaterialResources.INSTANCE.materialcss().materialScale());
 	}
 	
+	protected static native void fadeInImage(String name) /*-{
+		$wnd.Materialize.fadeInImage('#' + name);
+	}-*/;
+
+	public static native void showStaggeredList(String name)/*-{
+		$wnd.Materialize.showStaggeredList('#' + name);
+	}-*/;
+	
 }
diff --git a/src/main/java/gwt/material/design/client/ui/animate/Transition.java b/src/main/java/gwt/material/design/client/ui/animate/Transition.java
@@ -22,6 +22,6 @@
 
 public enum Transition {
 
-	SCALE, PULL
+	SHOW_STAGGERED_LIST, FADE_IN_IMAGE
 	
 }
diff --git a/src/main/resources/gwt/material/design/client/ui/MaterialCollection.ui.xml b/src/main/resources/gwt/material/design/client/ui/MaterialCollection.ui.xml
@@ -1,11 +1,9 @@
 <!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
 <ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
 	xmlns:g="urn:import:com.google.gwt.user.client.ui"
-	xmlns:c="urn:import:gwt.material.design.client.custom">
+	xmlns:m="urn:import:gwt.material.design.client.ui">
 	<ui:style>
 	
 	</ui:style>
-	<c:UnorderedList ui:field="collection" addStyleNames="collection">
-		
-	</c:UnorderedList>	
+	<m:UnorderedList ui:field="collection" addStyleNames="collection" />
 </ui:UiBinder> 
diff --git a/src/main/resources/gwt/material/design/client/ui/MaterialDropDown.ui.xml b/src/main/resources/gwt/material/design/client/ui/MaterialDropDown.ui.xml
@@ -15,7 +15,7 @@
 	</ui:style>
 	<g:HTMLPanel>
 		<m:MaterialButton ui:field="anchor" width="100%" addStyleNames='dropdown-button' icon="mdi-navigation-arrow-drop-down" iconPosition="right"/>
-		<c:UnorderedList ui:field="list" addStyleNames='dropdown-content {style.dropdown}' />
+		<m:UnorderedList ui:field="list" addStyleNames='dropdown-content {style.dropdown}' />
 
 	</g:HTMLPanel>
 </ui:UiBinder> 
diff --git a/src/main/resources/gwt/material/design/client/ui/MaterialNavBar.ui.xml b/src/main/resources/gwt/material/design/client/ui/MaterialNavBar.ui.xml
@@ -33,8 +33,8 @@
 	        	<c:child><g:HTMLPanel><i class="mdi-navigation-menu"></i></g:HTMLPanel></c:child>
 	        </c:CustomAnchor>
 	       
-	        <c:UnorderedList ui:field="navigation"  addStyleNames="hide-on-med-and-down"/>
-	        <c:UnorderedList ui:field="mobileNav"  addStyleNames="side-nav {style.mobileNav} {res.materialmobilecss.mobileNav}"/>
+	        <m:UnorderedList ui:field="navigation"  addStyleNames="hide-on-med-and-down"/>
+	        <m:UnorderedList ui:field="mobileNav"  addStyleNames="side-nav {style.mobileNav} {res.materialmobilecss.mobileNav}"/>
 	        
 	      </g:HTMLPanel>
 	    </nav>
diff --git a/src/main/resources/gwt/material/design/client/ui/MaterialPagination.ui.xml b/src/main/resources/gwt/material/design/client/ui/MaterialPagination.ui.xml
diff --git a/src/main/resources/gwt/material/design/client/ui/MaterialSearch.ui.xml b/src/main/resources/gwt/material/design/client/ui/MaterialSearch.ui.xml
diff --git a/src/main/resources/gwt/material/design/client/ui/MaterialTabs.ui.xml b/src/main/resources/gwt/material/design/client/ui/MaterialTabs.ui.xml
diff --git a/src/main/resources/gwt/material/design/public/css/overridecss.css b/src/main/resources/gwt/material/design/public/css/overridecss.css

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ public class ResourcesLoader {`
`27`	`27`	`public ResourcesLoader(MaterialResources resources) {`
`28`	`28`	`injectJQuery(resources);`
`29`	`29`	`injectMaterializeJs(resources);`
	`30`	`+`
`30`	`31`	`}`
`31`	`32`
`32`	`33`	`private void injectJQuery(MaterialResources resources) {`