Merge pull request #11 from GwtMaterialDesign/rework/mk_09/2017

Official 2.0 release
GwtMaterialDesign · Nov 5, 2017 · 9ac8d50 · 9ac8d50
2 parents 162a0c5 + 4bf0e70
commit 9ac8d50
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@
 <dependency>
     <groupId>com.github.gwtmaterialdesign</groupId>
     <artifactId>gwt-material-patterns</artifactId>
-    <version>2.0-rc6</version>
+    <version>2.0</version>
 </dependency>
 
 ```

diff --git a/pom.xml b/pom.xml
@@ -4,12 +4,12 @@
     <parent>
         <artifactId>gwt-material-parent</artifactId>
         <groupId>com.github.gwtmaterialdesign</groupId>
-        <version>2.0-rc6</version>
+        <version>2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>gwt-material-patterns</artifactId>
-    <version>2.0-rc6</version>
+    <version>2.0</version>
 
     <packaging>war</packaging>
     <name>GMD Patterns</name>
@@ -19,7 +19,7 @@
         <gwt.version>2.8.1</gwt.version>
         <gwtp.version>1.5.3</gwtp.version>
         <gin.version>2.1.2</gin.version>
-        <gwt-material.version>2.0-rc6</gwt-material.version>
+        <gwt-material.version>2.0</gwt-material.version>
         <gwt.style>OBF</gwt.style>
 
         <!-- maven -->

diff --git a/src/main/java/com/github/gwtmaterialdesign/client/application/googleplus/GooglePlusView.java b/src/main/java/com/github/gwtmaterialdesign/client/application/googleplus/GooglePlusView.java
@@ -50,7 +50,7 @@ interface Binder extends UiBinder<Widget, GooglePlusView> {
             @Override
             public void run() {
                 splash.hide();
-                tab.reinitialize();
+                tab.reload();
             }
         };
         t.schedule(5000);

diff --git a/...java/com/github/gwtmaterialdesign/client/application/navbardefault/DefaultNavBarView.java b/...java/com/github/gwtmaterialdesign/client/application/navbardefault/DefaultNavBarView.java
@@ -27,7 +27,7 @@
 import com.gwtplatform.mvp.client.ViewImpl;
 import gwt.material.design.client.ui.MaterialFAB;
 import gwt.material.design.client.ui.MaterialNavBar;
-import gwt.material.design.client.ui.MaterialSideNav;
+import gwt.material.design.client.ui.MaterialSideNavDrawer;
 
 import javax.inject.Inject;
 
@@ -43,7 +43,7 @@ interface Binder extends UiBinder<Widget, DefaultNavBarView> {
     MaterialFAB fab;
 
     @UiField
-    MaterialSideNav sideNav;
+    MaterialSideNavDrawer sideNav;
 
     @Inject
     DefaultNavBarView(Binder uiBinder) {

diff --git a/...ain/java/com/github/gwtmaterialdesign/client/application/navbarfixed/FixedNavBarView.java b/...ain/java/com/github/gwtmaterialdesign/client/application/navbarfixed/FixedNavBarView.java
@@ -28,6 +28,7 @@
 import gwt.material.design.client.ui.MaterialFAB;
 import gwt.material.design.client.ui.MaterialNavBar;
 import gwt.material.design.client.ui.MaterialSideNav;
+import gwt.material.design.client.ui.MaterialSideNavDrawer;
 
 import javax.inject.Inject;
 
@@ -43,7 +44,7 @@ interface Binder extends UiBinder<Widget, FixedNavBarView> {
     MaterialFAB fab;
 
     @UiField
-    MaterialSideNav sideNav;
+    MaterialSideNavDrawer sideNav;
 
     @Inject
     FixedNavBarView(Binder uiBinder) {

diff --git a/...n/java/com/github/gwtmaterialdesign/client/application/navbarshrink/ShrinkNavBarView.java b/...n/java/com/github/gwtmaterialdesign/client/application/navbarshrink/ShrinkNavBarView.java
@@ -45,7 +45,7 @@ interface Binder extends UiBinder<Widget, ShrinkNavBarView> {
     MaterialFAB fab;
 
     @UiField
-    MaterialSideNav sideNav;
+    MaterialSideNavPush sideNav;
 
     @Inject
     ShrinkNavBarView(Binder uiBinder) {

diff --git a/src/main/java/com/github/gwtmaterialdesign/client/application/navbartabs/TabNavBarView.java b/src/main/java/com/github/gwtmaterialdesign/client/application/navbartabs/TabNavBarView.java
@@ -26,31 +26,26 @@
 import com.google.gwt.user.client.ui.Widget;
 import com.gwtplatform.mvp.client.ViewImpl;
 import gwt.material.design.client.ui.MaterialSideNav;
+import gwt.material.design.client.ui.MaterialSideNavPush;
 import gwt.material.design.client.ui.MaterialTab;
 
 import javax.inject.Inject;
 
-import static gwt.material.design.client.js.JsMaterialElement.$;
-
 
 public class TabNavBarView extends ViewImpl implements TabNavBarPresenter.MyView {
     interface Binder extends UiBinder<Widget, TabNavBarView> {
     }
 
     @UiField
-    MaterialSideNav sidenav;
+    MaterialSideNavPush sidenav;
 
     @UiField
     MaterialTab tab;
 
     @Inject
     TabNavBarView(Binder uiBinder) {
         initWidget(uiBinder.createAndBindUi(this));
-        sidenav.addOpenedHandler(event -> {
-            tab.reinitialize();
-        });
-        sidenav.addClosedHandler(event -> {
-            tab.reinitialize();
-        });
+        sidenav.addOpenedHandler(event -> tab.reload());
+        sidenav.addClosedHandler(event -> tab.reload());
     }
 }
diff --git a/...ava/com/github/gwtmaterialdesign/client/application/navbartabspush/TabPushNavBarView.java b/...ava/com/github/gwtmaterialdesign/client/application/navbartabspush/TabPushNavBarView.java
@@ -21,12 +21,12 @@
  */
 
 
-import com.github.gwtmaterialdesign.client.application.navbartabs.TabNavBarPresenter;
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiField;
 import com.google.gwt.user.client.ui.Widget;
 import com.gwtplatform.mvp.client.ViewImpl;
 import gwt.material.design.client.ui.MaterialSideNav;
+import gwt.material.design.client.ui.MaterialSideNavPush;
 import gwt.material.design.client.ui.MaterialTab;
 
 import javax.inject.Inject;
@@ -37,19 +37,15 @@ interface Binder extends UiBinder<Widget, TabPushNavBarView> {
     }
 
     @UiField
-    MaterialSideNav sidenav;
+    MaterialSideNavPush sidenav;
 
     @UiField
     MaterialTab tab;
 
     @Inject
     TabPushNavBarView(Binder uiBinder) {
         initWidget(uiBinder.createAndBindUi(this));
-        sidenav.addOpenedHandler(event -> {
-            tab.reinitialize();
-        });
-        sidenav.addClosedHandler(event -> {
-            tab.reinitialize();
-        });
+        sidenav.addOpenedHandler(event -> tab.reload());
+        sidenav.addClosedHandler(event -> tab.reload());
     }
 }
diff --git a/src/main/java/com/github/gwtmaterialdesign/client/application/navbartall/TallNavBarView.java b/src/main/java/com/github/gwtmaterialdesign/client/application/navbartall/TallNavBarView.java
@@ -27,7 +27,7 @@
 import com.gwtplatform.mvp.client.ViewImpl;
 import gwt.material.design.client.ui.MaterialFAB;
 import gwt.material.design.client.ui.MaterialNavBar;
-import gwt.material.design.client.ui.MaterialSideNav;
+import gwt.material.design.client.ui.MaterialSideNavDrawer;
 
 import javax.inject.Inject;
 
@@ -43,7 +43,7 @@ interface Binder extends UiBinder<Widget, TallNavBarView> {
     MaterialFAB fab;
 
     @UiField
-    MaterialSideNav sideNav;
+    MaterialSideNavDrawer sideNav;
 
     @Inject
     TallNavBarView(Binder uiBinder) {

diff --git a/...ain/java/com/github/gwtmaterialdesign/client/application/sidenavedge/EdgeSideNavView.java b/...ain/java/com/github/gwtmaterialdesign/client/application/sidenavedge/EdgeSideNavView.java
@@ -26,10 +26,12 @@
 import com.google.gwt.uibinder.client.UiField;
 import com.google.gwt.user.client.ui.Widget;
 import com.gwtplatform.mvp.client.ViewImpl;
+import gwt.material.design.client.base.AbstractSideNav;
 import gwt.material.design.client.base.TransitionConfig;
 import gwt.material.design.client.ui.MaterialFAB;
 import gwt.material.design.client.ui.MaterialNavBar;
 import gwt.material.design.client.ui.MaterialSideNav;
+import gwt.material.design.client.ui.MaterialSideNavCard;
 
 import javax.inject.Inject;
 
@@ -42,7 +44,7 @@ interface Binder extends UiBinder<Widget, EdgeSideNavView> {
     MaterialNavBar navBar;
 
     @UiField
-    MaterialSideNav sideNav;
+    MaterialSideNavCard sideNav;
 
     @UiField
     MaterialFAB fab;