Skip to content

Commit ae1f532

Browse files
kevzlou7979kevzlou7979
authored andcommitted
Material Tab : Code Modification
1 parent 920cfc2 commit ae1f532

File tree

8 files changed

+101
-227
lines changed

8 files changed

+101
-227
lines changed

src/main/java/gwt/material/design/client/GwtMaterialDesign.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,7 @@ public class GwtMaterialDesign implements EntryPoint {
3333
public void onModuleLoad() {
3434
new ResourcesLoader(MaterialResources.INSTANCE);
3535
}
36+
37+
38+
3639
}

src/main/java/gwt/material/design/client/custom/MaterialWindowHeader.ui.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@
4141
<m:MaterialPanel>
4242
<m:MaterialPanel ui:field="headerPanel" addStyleNames="blue darken-2 {style.header}" >
4343
<m:MaterialLabel ui:field="lblTitle" addStyleNames="{style.title}" fontSize="1.2"/>
44-
<m:MaterialLink ui:field="btnRestore" tooltip="Restore" tooltipLocation="bottom" icon="mdi-image-filter-none" fontSize="1.2" textColor="white" addStyleNames="{style.icon}" />
45-
<m:MaterialLink ui:field="btnMaximize" tooltip="Maximize" tooltipLocation="bottom" icon="mdi-toggle-check-box-outline-blank" fontSize="1.2" textColor="white" addStyleNames="{style.icon}"/>
46-
<m:MaterialLink ui:field="btnClose" tooltip="Close" tooltipLocation="bottom" icon="mdi-navigation-close" fontSize="1.2" textColor="white" addStyleNames="{style.icon}"/>
44+
<m:MaterialLink ui:field="btnRestore" tooltip="Restore" tooltipLocation="bottom" icon="remove" fontSize="1.2" textColor="white" addStyleNames="{style.icon}" />
45+
<m:MaterialLink ui:field="btnMaximize" tooltip="Maximize" tooltipLocation="bottom" icon="crop_square" fontSize="1.2" textColor="white" addStyleNames="{style.icon}"/>
46+
<m:MaterialLink ui:field="btnClose" tooltip="Close" tooltipLocation="bottom" icon="close" fontSize="1.2" textColor="white" addStyleNames="{style.icon}"/>
4747
</m:MaterialPanel>
4848
</m:MaterialPanel>
4949
</ui:UiBinder>

src/main/java/gwt/material/design/client/resources/ResourcesLoader.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ private void injectMaterializeJs(MaterialResources resources) {
4949
ScriptInjector.fromString(resources.materializeJs().getText())
5050
.setWindow(ScriptInjector.TOP_WINDOW)
5151
.inject();
52-
initTooltip();
5352
}
5453

5554
private void injectPickTimeJs(MaterialResources resources) {
@@ -67,9 +66,4 @@ private native boolean isjQueryLoaded() /*-{
6766
return (typeof $wnd['jQuery'] !== 'undefined');
6867
}-*/;
6968

70-
public native void initTooltip()/*-{
71-
$wnd.jQuery(document).ready(function(){
72-
$wnd.jQuery('.tooltipped').tooltip({delay: 50});
73-
});
74-
}-*/;
7569
}
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package gwt.material.design.client.ui;
2+
3+
import gwt.material.design.client.custom.ComplexWidget;
4+
5+
import com.google.gwt.dom.client.Document;
6+
7+
public class MaterialTab extends ComplexWidget{
8+
9+
public MaterialTab() {
10+
setElement(Document.get().createULElement());
11+
setStyleName("tabs");
12+
}
13+
14+
}
Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
package gwt.material.design.client.ui;
2+
3+
import gwt.material.design.client.custom.ComplexWidget;
4+
import gwt.material.design.client.custom.HasColors;
5+
import gwt.material.design.client.custom.HasDisabled;
6+
import gwt.material.design.client.custom.HasGrid;
7+
import gwt.material.design.client.custom.HasWaves;
8+
9+
import com.google.gwt.dom.client.Document;
10+
import com.google.gwt.user.client.ui.HasWidgets;
11+
12+
public class MaterialTabItem extends ComplexWidget implements HasWidgets, HasColors, HasWaves, HasGrid, HasDisabled{
13+
14+
public MaterialTabItem() {
15+
setElement(Document.get().createLIElement());
16+
setStyleName("tab");
17+
}
18+
19+
@Override
20+
protected void onLoad() {
21+
// TODO Auto-generated method stub
22+
super.onLoad();
23+
initWaves();
24+
}
25+
26+
@Override
27+
public void setGrid(String grid) {
28+
this.addStyleName("col " + grid);
29+
}
30+
31+
@Override
32+
public void setOffset(String offset) {
33+
String tobeadded = "";
34+
String[] vals = offset.split(" ");
35+
for(String val : vals){
36+
tobeadded = tobeadded + " offset-" + val;
37+
}
38+
this.addStyleName(tobeadded);
39+
}
40+
41+
@Override
42+
public void setWaves(String waves) {
43+
addStyleName("waves-"+waves + " waves-effect");
44+
}
45+
46+
@Override
47+
public native void initWaves()/*-{
48+
$wnd.Waves.displayEffect();
49+
}-*/;
50+
51+
@Override
52+
public void setBackgroundColor(String bgColor) {
53+
// TODO Auto-generated method stub
54+
addStyleName(bgColor);
55+
}
56+
57+
@Override
58+
public void setTextColor(String textColor) {
59+
// TODO Auto-generated method stub
60+
addStyleName(textColor+"-text");
61+
}
62+
63+
@Override
64+
public void setDisabled(boolean disabled) {
65+
if(disabled)addStyleName("disabled");
66+
else removeStyleName("disabled");
67+
}
68+
69+
@Override
70+
public boolean isDisabled() {
71+
// TODO Auto-generated method stub
72+
return false;
73+
}
74+
75+
}

src/main/java/gwt/material/design/client/ui/MaterialTabs.java

Lines changed: 0 additions & 217 deletions
This file was deleted.

src/main/resources/gwt/material/design/client/resources/animation.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
2+
3+
14
function showGrid(id, duration){
25
var speed = 900;
36
var container = $(id);

src/main/resources/gwt/material/design/client/resources/materialize.0.97.1.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@
3939
* OF THE POSSIBILITY OF SUCH DAMAGE.
4040
*
4141
*/
42-
42+
jQuery(document).ready(function(){
43+
jQuery('.tooltipped').tooltip({delay: 50});
44+
});
4345
// t: current time, b: begInnIng value, c: change In value, d: duration
4446
jQuery.easing['jswing'] = jQuery.easing['swing'];
4547

0 commit comments

Comments
 (0)