From 4bf0e7064106acc42552ad6433d2720e5ee1be3e Mon Sep 17 00:00:00 2001 From: kevzlou7979 Date: Sun, 5 Nov 2017 21:25:24 +0800 Subject: [PATCH] Updated GMD Version to 2.0 --- README.md | 2 +- pom.xml | 6 +++--- .../client/application/navbardefault/DefaultNavBarView.java | 4 ++-- .../client/application/navbarfixed/FixedNavBarView.java | 3 ++- .../client/application/navbarshrink/ShrinkNavBarView.java | 2 +- .../client/application/navbartabs/TabNavBarView.java | 3 ++- .../application/navbartabspush/TabPushNavBarView.java | 3 ++- .../client/application/navbartall/TallNavBarView.java | 4 ++-- .../client/application/sidenavedge/EdgeSideNavView.java | 4 +++- 9 files changed, 18 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 087f117..dcbb3c7 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ com.github.gwtmaterialdesign gwt-material-patterns - 2.0-rc6 + 2.0 ``` diff --git a/pom.xml b/pom.xml index 35b56a9..de08603 100644 --- a/pom.xml +++ b/pom.xml @@ -4,12 +4,12 @@ gwt-material-parent com.github.gwtmaterialdesign - 2.0-SNAPSHOT + 2.0 4.0.0 gwt-material-patterns - 2.0-SNAPSHOT + 2.0 war GMD Patterns @@ -19,7 +19,7 @@ 2.8.1 1.5.3 2.1.2 - 2.0-SNAPSHOT + 2.0 OBF diff --git a/src/main/java/com/github/gwtmaterialdesign/client/application/navbardefault/DefaultNavBarView.java b/src/main/java/com/github/gwtmaterialdesign/client/application/navbardefault/DefaultNavBarView.java index b11f582..05dfcf0 100644 --- a/src/main/java/com/github/gwtmaterialdesign/client/application/navbardefault/DefaultNavBarView.java +++ b/src/main/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 { MaterialFAB fab; @UiField - MaterialSideNav sideNav; + MaterialSideNavDrawer sideNav; @Inject DefaultNavBarView(Binder uiBinder) { diff --git a/src/main/java/com/github/gwtmaterialdesign/client/application/navbarfixed/FixedNavBarView.java b/src/main/java/com/github/gwtmaterialdesign/client/application/navbarfixed/FixedNavBarView.java index 9857292..75c00a1 100644 --- a/src/main/java/com/github/gwtmaterialdesign/client/application/navbarfixed/FixedNavBarView.java +++ b/src/main/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 { MaterialFAB fab; @UiField - MaterialSideNav sideNav; + MaterialSideNavDrawer sideNav; @Inject FixedNavBarView(Binder uiBinder) { diff --git a/src/main/java/com/github/gwtmaterialdesign/client/application/navbarshrink/ShrinkNavBarView.java b/src/main/java/com/github/gwtmaterialdesign/client/application/navbarshrink/ShrinkNavBarView.java index 56779b7..45185c7 100644 --- a/src/main/java/com/github/gwtmaterialdesign/client/application/navbarshrink/ShrinkNavBarView.java +++ b/src/main/java/com/github/gwtmaterialdesign/client/application/navbarshrink/ShrinkNavBarView.java @@ -45,7 +45,7 @@ interface Binder extends UiBinder { 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 index 73c9188..6736860 100644 --- 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,6 +26,7 @@ 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; @@ -36,7 +37,7 @@ interface Binder extends UiBinder { } @UiField - MaterialSideNav sidenav; + MaterialSideNavPush sidenav; @UiField MaterialTab tab; diff --git a/src/main/java/com/github/gwtmaterialdesign/client/application/navbartabspush/TabPushNavBarView.java b/src/main/java/com/github/gwtmaterialdesign/client/application/navbartabspush/TabPushNavBarView.java index 69aa794..0932979 100644 --- a/src/main/java/com/github/gwtmaterialdesign/client/application/navbartabspush/TabPushNavBarView.java +++ b/src/main/java/com/github/gwtmaterialdesign/client/application/navbartabspush/TabPushNavBarView.java @@ -26,6 +26,7 @@ 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; @@ -36,7 +37,7 @@ interface Binder extends UiBinder { } @UiField - MaterialSideNav sidenav; + MaterialSideNavPush sidenav; @UiField MaterialTab tab; 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 index cbfeec6..0238911 100644 --- 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 { MaterialFAB fab; @UiField - MaterialSideNav sideNav; + MaterialSideNavDrawer sideNav; @Inject TallNavBarView(Binder uiBinder) { diff --git a/src/main/java/com/github/gwtmaterialdesign/client/application/sidenavedge/EdgeSideNavView.java b/src/main/java/com/github/gwtmaterialdesign/client/application/sidenavedge/EdgeSideNavView.java index b69545b..e0a016a 100644 --- a/src/main/java/com/github/gwtmaterialdesign/client/application/sidenavedge/EdgeSideNavView.java +++ b/src/main/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 { MaterialNavBar navBar; @UiField - MaterialSideNav sideNav; + MaterialSideNavCard sideNav; @UiField MaterialFAB fab;