Skip to content

Commit d25674d

Browse files
kevzlou7979kevzlou7979
committed
Merge pull request #127 from GwtMaterialDesign/release_1.4
Release 1.4 - Ready for testing and maven deployment.
2 parents 4a4d0ce + 2909790 commit d25674d

File tree

371 files changed

+32933
-60734
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

371 files changed

+32933
-60734
lines changed

‎.travis.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
language: java
2+
jdk:
3+
- oraclejdk7
4+
- oraclejdk8

‎README.md‎

Lines changed: 24 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -1,109 +1,33 @@
1-
# GwtMaterial
1+
# GwtMaterial [![Build Status](https://travis-ci.org/GwtMaterialDesign/gwt-material.svg?branch=master)](https://travis-ci.org/GwtMaterialDesign/gwt-material) [![Join the chat at https://gitter.im/GwtMaterialDesign/gwt-material](https://img.shields.io/badge/GITTER-join%20chat-green.svg)](https://gitter.im/GwtMaterialDesign/gwt-material?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
22

33
<img src="http://gwt-material-demo.herokuapp.com/bin/ic_gwt_logo.png" />
44
<br/>
5-
A Google Material Design wrapper for GWT <br>
6-
<a href="www.gwt-material.appspot.com">http://gwt-material-demo.herokuapp.com</a><br/>
7-
<a href="https://www.bountysource.com/teams/gwtmaterialdesign/members"> Support us on Bountysource </a>
5+
A Google Material Design wrapper for GWT<br/>
86

7+
## Demo
8+
* [1.4 Release Demo](http://gwtmaterialdesign.github.io/gwt-material-demo/)
9+
* [1.5 Snapshot Demo](http://gwtmaterialdesign.github.io/gwt-material-demo/snapshot/)
910

10-
<h3>Upcomming Version 1.3.4</h3>
11-
<ul>
12-
<li><a href="http://gwt-material-demo.herokuapp.com/#datagrid" >DataGrid : Material Image Cell</a></li>
13-
<li><a href="http://gwt-material-demo.herokuapp.com/#datagrid" >DataGrid : Pager (on Going) </a></li>
14-
<li><a href="http://gwt-material-demo.herokuapp.com/#chips" >Material Chips</a></li>
15-
<li><a href="http://gwt-material-demo.herokuapp.com/#autocompletes" >Material Autocomplete</a></li>
16-
<li><a href="http://gwt-material-demo.herokuapp.com/#errors" >Material form error message</a></li>
17-
<li><a href="http://gwt-material-demo.herokuapp.com/#dialogs" >Parameter on Modals (autoHideEnabled)</a></li>
18-
<li><a href="#">Transition : SHOW_GRID and HIDE_GRID</a></li>
19-
<li>Fixed Button setDisabled </li>
20-
<li>Fixed Datepicker inside modal </li>
21-
<li>MaterialDropdown : Code modification</li>
22-
<li>Material NavBar : Fixed and Extended Types</li>
23-
<li>Material SideNav : Float (Permanent) or Card (Permanent) </li>
24-
<li>Material SideNav : Open (Permanent) or Close (Persistent) </li>
25-
<li>Material SideNav : Clip (Permanent) </li>
26-
<li>Material SideNav : Mini Variant (Persistent) </li>
27-
<li>MaterialNavBar : Dropdown Menu</li>
28-
</ul>
11+
## Documentation
12+
Support documentation can be found [here](https://github.com/GwtMaterialDesign/gwt-material/wiki)
2913

30-
<h3>Version 1.3.3</h3>
31-
<ul>
32-
<li><a href="http://gwt-material-demo.herokuapp.com/#dialogs" >Toast with Action and Toast with Rounded Style </a></li>
33-
<li><a href="https://www.bountysource.com/teams/gwtmaterialdesign" >BountySource </a></li>
34-
<li><a href="http://gwt-material-demo.herokuapp.com/#charts" >Material Charts v1 </a></li>
35-
<li><a href="http://gwt-material-demo.herokuapp.com/#media" >Image Slider / Full Screen </a></li>
36-
<li>Fixed the Sidebar Waves on Collapsible Items</li>
37-
<li><a href="http://gwt-material-demo.herokuapp.com/#forms" >Date Picker Selection Type -> Month Day, Month Day Year, Year, Day </a></li>
38-
<li><a href="http://gwt-material-demo.herokuapp.com/#forms">Material Listbox Change Handler Solved</a></li>
39-
<li><a href="http://gwt-material-demo.herokuapp.com/#loaders">Material Nav Bar Progress Loader</a></li>
40-
<li><a href="http://gwt-material-demo.herokuapp.com/#showcase">Material Splash Screen</a></li>
41-
<li><a href="http://gwt-material-demo.herokuapp.com/#datagrid">Material Datagrid v1 Implementation with MaterialCheckboxCell and MaterialButtonCell</a></li>
42-
<li><a href="http://gwt-material-demo.herokuapp.com/#forms">Material CheckBox Styles (Filled in)</a></li>
43-
<li><a href="http://gwt-material-demo.herokuapp.com/#forms">Material Radio Button Styles (With GAP)</a></li>
44-
<li><a href="http://gwt-material-demo.herokuapp.com/#tabs">Material Tabs setTabIndex(index) method</a></li>
45-
<li><a href="http://gwt-material-demo.herokuapp.com/#templates">Material Design Templates</a></li>
46-
</ul>
14+
## Maven
15+
```xml
16+
<dependency>
17+
<groupId>com.github.gwtmaterialdesign</groupId>
18+
<artifactId>gwt-material</artifactId>
19+
<version>1.4</version>
20+
</dependency>
21+
```
4722

48-
<h3>Version 1.3.2</h3>
49-
<ul>
50-
<li><a href="http://gwt-material-demo.herokuapp.com/#theme" >GWT Material Themes</a></li>
51-
<li><a href="http://gwt-material-demo.herokuapp.com/#shadow">Shadow DOM on Material Panels, Columns, Rows</a></li>
52-
<li><a href="http://gwt-material-demo.herokuapp.com/#helper">Helpers (Alignment, Hiding Content, Formatting esp. Text Truncation)</a></li>
53-
<li><a href="http://gwt-material-demo.herokuapp.com/#table">Tables (Bordered Table, Striped Table, Hoverable Table, Centered Table, Responsive Table)</a></li>
54-
<li>Updated the Getting Started Page of showcase site to add Starter Template Sample (UI Binder Code) <a href="http://gwt-material-starter.appspot.com">Demo(Google Inbox App)</a></li>
55-
<li><a href="http://gwt-material-demo.herokuapp.com/#dialogs">Material Window Dialog</a></li>
56-
<li><a href="http://gwt-material-demo.herokuapp.com/#icons">Material Icons</a></li>
57-
<li>Sidebar supports Collapsible Submenus and multi declaration on any interface</li>
58-
<li><a href="http://gwt-material-demo.herokuapp.com/#scrollspy">Scroll Spy</li></li>
59-
<li><a href="http://gwt-material-demo.herokuapp.com/#badges">Material Badge Update</li></li>
60-
</ul>
61-
<h3>Version 1.3.1</h3>
62-
<ul>
63-
<li>Many bug fixes provided. <a href='https://github.com/GwtMaterialDesign/gwt-material/releases/tag/gwt-material-1.3.1'>See release notes</a></li>
64-
</ul>
65-
<h3>Version 1.3</h3>
66-
<ul>
67-
<li>GWT Material Official Maven Release</li>
68-
<li>Switch bug fixed on setValue()</li>
69-
<li>Transition Added</li>
70-
<li>Embed stylesheets and javascripts inside the project (no more external files)</li>
71-
<li>GWT Material Showcase</li>
72-
<ul>
73-
<li>Parallax</li>
74-
<li>Material Weather</li>
75-
<li>Login UI</li>
76-
</ul>
77-
</li>
78-
<li>Material Collapsible Popout</li>
79-
<li>Material Bottom Sheets</li>
80-
<li>Side Bar nav fixed with overflow auto on small devices</li>
81-
<li>Apache License 2.0 Information Added</li>
82-
<li>Donate Button added to support the development of GWT Material</li>
83-
</ul>
84-
<img src="http://gwt-material-demo.herokuapp.com/bin/weather.gif" width="200px"/>
85-
<img src="http://gwt-material.appspot.com/bin/parallax.gif" width="200px"/>
23+
## Changelog
24+
You can find lists of features by version <a href="https://github.com/GwtMaterialDesign/gwt-material/wiki/Changelog">here</a>.
8625

87-
<h3>Version 1.2</h3>
88-
<ul>
89-
<li>Integrate GWT Material to Phonegap</li>
90-
<li>Remove GWT Uploader on Build Path (Which cause a inheritance problem)</li>
91-
<li>Grid System</li>
92-
<li>Badge Component (Collections and DropDowns)</li>
93-
<li>Disabled Styles</li>
94-
- ListBox
95-
- Browser Default listBox
96-
- Radio Button
97-
- Checkbox
98-
- Switches
99-
<li>Adding Roboto Fonts by default</li>
100-
</ul>
26+
## Current Snapshot
27+
1.5-SNAPSHOT
10128

102-
<h3>Version 1.0 </h3>
103-
<ul>
104-
<li>Collabsible and Accordion</li>
105-
<li>Dropdown Menu</li>
106-
<li>Footer</li>
107-
<li>Tabs</li>
108-
<li>Collections (Dismissable and Avatar)</li>
109-
</ul>
29+
## License
30+
[Apache 2.0 License](https://github.com/GwtMaterialDesign/gwt-material/blob/master/LICENSE)
31+
32+
## Contributing
33+
Contributions are welcomed by all! If you would like to submit changes be sure to fork this project and create a [Pull Request](https://yangsu.github.io/pull-request-tutorial/) for us to review. PR's will be reviewed by the team as soon as possible. You will also be listed as a contributor on our changelog notes.

‎gwt-material/pom.xml‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<parent>
6+
<artifactId>gwt-material-parent</artifactId>
7+
<groupId>com.github.gwtmaterialdesign</groupId>
8+
<version>1.4-SNAPSHOT</version>
9+
</parent>
10+
<modelVersion>4.0.0</modelVersion>
11+
12+
<artifactId>gwt-material</artifactId>
13+
14+
<name>Gwt Material</name>
15+
<description>A Material Design look and feel for GWT Apps plus Phonegap</description>
16+
17+
<dependencies>
18+
<dependency>
19+
<groupId>com.google.gwt</groupId>
20+
<artifactId>gwt-user</artifactId>
21+
<version>${gwt.version}</version>
22+
<scope>provided</scope>
23+
</dependency>
24+
<dependency>
25+
<groupId>junit</groupId>
26+
<artifactId>junit</artifactId>
27+
<version>4.11</version>
28+
<scope>test</scope>
29+
</dependency>
30+
</dependencies>
31+
32+
<build>
33+
<plugins>
34+
<plugin>
35+
<groupId>org.codehaus.mojo</groupId>
36+
<artifactId>gwt-maven-plugin</artifactId>
37+
<configuration>
38+
<validateOnly>true</validateOnly>
39+
</configuration>
40+
</plugin>
41+
<plugin>
42+
<groupId>org.apache.maven.plugins</groupId>
43+
<artifactId>maven-compiler-plugin</artifactId>
44+
</plugin>
45+
<plugin>
46+
<groupId>org.apache.maven.plugins</groupId>
47+
<artifactId>maven-source-plugin</artifactId>
48+
</plugin>
49+
</plugins>
50+
</build>
51+
</project>

‎src/main/java/gwt/material/design/client/GwtMaterialDesign.java‎ renamed to ‎gwt-material/src/main/java/gwt/material/design/client/MaterialDesign.java‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,12 @@
2020
* #L%
2121
*/
2222

23-
import gwt.material.design.client.resources.MaterialResources;
24-
import gwt.material.design.client.resources.ResourcesLoader;
25-
2623
import com.google.gwt.core.client.EntryPoint;
2724

28-
/**
29-
* Entry point classes define <code>onModuleLoad()</code>.
30-
*/
31-
public class GwtMaterialDesign implements EntryPoint {
32-
33-
public void onModuleLoad() {
34-
new ResourcesLoader(MaterialResources.INSTANCE);
35-
}
36-
37-
38-
25+
public class MaterialDesign extends MaterialDesignBase implements EntryPoint {
26+
27+
@Override
28+
public void onModuleLoad() {
29+
load();
30+
}
3931
}

‎gwt-material/src/main/java/gwt/material/design/client/MaterialDesignBase.java‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
package gwt.material.design.client;
2+
3+
/*
4+
* #%L
5+
* GwtMaterialDesign
6+
* %%
7+
* Copyright (C) 2015 GwtMaterial
8+
* %%
9+
* Licensed under the Apache License, Version 2.0 (the "License");
10+
* you may not use this file except in compliance with the License.
11+
* You may obtain a copy of the License at
12+
*
13+
* http://www.apache.org/licenses/LICENSE-2.0
14+
*
15+
* Unless required by applicable law or agreed to in writing, software
16+
* distributed under the License is distributed on an "AS IS" BASIS,
17+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
18+
* See the License for the specific language governing permissions and
19+
* limitations under the License.
20+
* #L%
21+
*/
22+
23+
import com.google.gwt.core.client.ScriptInjector;
24+
import com.google.gwt.resources.client.TextResource;
25+
import gwt.material.design.client.resources.MaterialResources;
26+
27+
public class MaterialDesignBase {
28+
29+
public void load() {
30+
inject(MaterialResources.INSTANCE.materializeJs());
31+
inject(MaterialResources.INSTANCE.timepickerJs());
32+
inject(MaterialResources.INSTANCE.animationJs());
33+
inject(MaterialResources.INSTANCE.scriptJs());
34+
}
35+
36+
protected void inject(TextResource resource) {
37+
inject(resource, true, false);
38+
}
39+
40+
protected void injectDebug(TextResource resource) {
41+
inject(resource, false, true);
42+
}
43+
44+
protected void inject(TextResource resource, boolean removeTag, boolean sourceUrl) {
45+
String text = resource.getText() +
46+
(sourceUrl ? "//# sourceURL="+resource.getName()+".js" : "");
47+
48+
// Inject the script resource
49+
ScriptInjector.fromString(text)
50+
.setWindow(ScriptInjector.TOP_WINDOW)
51+
.setRemoveTag(removeTag)
52+
.inject();
53+
}
54+
55+
/**
56+
* Check to see if jQuery is loaded already
57+
*
58+
* @return true is jQuery is loaded, false otherwise
59+
*/
60+
public static native boolean isjQueryLoaded() /*-{
61+
return (typeof $wnd['jQuery'] !== 'undefined');
62+
}-*/;
63+
}

‎gwt-material/src/main/java/gwt/material/design/client/MaterialDesignDebug.java‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
package gwt.material.design.client;
2+
3+
/*
4+
* #%L
5+
* GwtMaterialDesign
6+
* %%
7+
* Copyright (C) 2015 GwtMaterial
8+
* %%
9+
* Licensed under the Apache License, Version 2.0 (the "License");
10+
* you may not use this file except in compliance with the License.
11+
* You may obtain a copy of the License at
12+
*
13+
* http://www.apache.org/licenses/LICENSE-2.0
14+
*
15+
* Unless required by applicable law or agreed to in writing, software
16+
* distributed under the License is distributed on an "AS IS" BASIS,
17+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
18+
* See the License for the specific language governing permissions and
19+
* limitations under the License.
20+
* #L%
21+
*/
22+
23+
import com.google.gwt.core.client.EntryPoint;
24+
25+
public class MaterialDesignDebug extends MaterialDesignDebugBase implements EntryPoint {
26+
27+
@Override
28+
public void onModuleLoad() {
29+
load();
30+
}
31+
}

‎gwt-material/src/main/java/gwt/material/design/client/MaterialDesignDebugBase.java‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
package gwt.material.design.client;
2+
3+
/*
4+
* #%L
5+
* GwtMaterialDesign
6+
* %%
7+
* Copyright (C) 2015 GwtMaterial
8+
* %%
9+
* Licensed under the Apache License, Version 2.0 (the "License");
10+
* you may not use this file except in compliance with the License.
11+
* You may obtain a copy of the License at
12+
*
13+
* http://www.apache.org/licenses/LICENSE-2.0
14+
*
15+
* Unless required by applicable law or agreed to in writing, software
16+
* distributed under the License is distributed on an "AS IS" BASIS,
17+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
18+
* See the License for the specific language governing permissions and
19+
* limitations under the License.
20+
* #L%
21+
*/
22+
23+
import gwt.material.design.client.resources.MaterialDebugResources;
24+
import gwt.material.design.client.resources.MaterialResources;
25+
26+
public class MaterialDesignDebugBase extends MaterialDesignBase {
27+
28+
@Override
29+
public void load() {
30+
injectDebug(MaterialDebugResources.INSTANCE.materializeJsDebug());
31+
injectDebug(MaterialDebugResources.INSTANCE.timepickerJsDebug());
32+
injectDebug(MaterialResources.INSTANCE.animationJs());
33+
injectDebug(MaterialResources.INSTANCE.scriptJs());
34+
}
35+
}

‎gwt-material/src/main/java/gwt/material/design/client/MaterialWithJQuery.java‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
package gwt.material.design.client;
2+
3+
/*
4+
* #%L
5+
* GwtMaterialDesign
6+
* %%
7+
* Copyright (C) 2015 GwtMaterial
8+
* %%
9+
* Licensed under the Apache License, Version 2.0 (the "License");
10+
* you may not use this file except in compliance with the License.
11+
* You may obtain a copy of the License at
12+
*
13+
* http://www.apache.org/licenses/LICENSE-2.0
14+
*
15+
* Unless required by applicable law or agreed to in writing, software
16+
* distributed under the License is distributed on an "AS IS" BASIS,
17+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
18+
* See the License for the specific language governing permissions and
19+
* limitations under the License.
20+
* #L%
21+
*/
22+
23+
import com.google.gwt.core.client.EntryPoint;
24+
import gwt.material.design.client.resources.WithJQueryResources;
25+
26+
public class MaterialWithJQuery extends MaterialDesignBase implements EntryPoint {
27+
28+
@Override
29+
public void onModuleLoad() {
30+
load();
31+
}
32+
33+
@Override
34+
public void load() {
35+
if(!isjQueryLoaded()) {
36+
inject(WithJQueryResources.INSTANCE.jQuery());
37+
}
38+
super.load();
39+
}
40+
}

0 commit comments

Comments
 (0)