Merge branch 'release_2.8.0'

GwtMaterialDesign · Sep 22, 2023 · 565d53b · 565d53b
2 parents 1f812f9 + 1ed47c9
commit 565d53b
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -20,12 +20,12 @@ Support documentation can be found [here](https://github.com/GwtMaterialDesign/g
 We created <a href="http://gwtmaterialdesign.github.io/gwt-material-demo/apidocs" > Java Docs </a> for developers
 
 ## Maven
-### Current Version 2.8.0
+### Current Version 2.8.1
 ```xml
 <dependency>
     <groupId>com.github.gwtmaterialdesign</groupId>
     <artifactId>gwt-material</artifactId>
-    <version>2.8.0</version>
+    <version>2.8.1</version>
 </dependency>
 ```
 ### Snapshot Version 2.8.0-SNAPSHOT

diff --git a/gwt-material/pom.xml b/gwt-material/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>gwt-material-parent</artifactId>
         <groupId>com.github.gwtmaterialdesign</groupId>
-        <version>2.8.0</version>
+        <version>2.8.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/gwt-material/src/main/java/gwt/material/design/client/theme/ThemeManager.java b/gwt-material/src/main/java/gwt/material/design/client/theme/ThemeManager.java
@@ -21,6 +21,7 @@
 
 import com.google.gwt.core.client.GWT;
 import gwt.material.design.client.base.MaterialWidget;
+import gwt.material.design.client.theme.dark.DarkThemeLoader;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -34,6 +35,7 @@
 ThemeManager {
 
     private static SortedSet<Theme> themes;
+    private static DarkThemeLoader darkTheme;
 
     private static Map<Class, List<WidgetTheme>> themeCache = new HashMap<>();
 
@@ -131,4 +133,12 @@ public static <T extends MaterialWidget> void addWidgetTheme(String themeName, W
     public static <T extends MaterialWidget> void addWidgetTheme(Theme theme, WidgetTheme<T> widgetTheme) {
         theme.put(widgetTheme.getClassSelector(), widgetTheme);
     }
+
+    public static DarkThemeLoader getDarkTheme() {
+        return darkTheme;
+    }
+
+    public static void setDarkTheme(DarkThemeLoader darkTheme) {
+        ThemeManager.darkTheme = darkTheme;
+    }
 }
diff --git a/gwt-material/src/main/java/gwt/material/design/client/ui/MaterialToast.java b/gwt-material/src/main/java/gwt/material/design/client/ui/MaterialToast.java
@@ -200,6 +200,9 @@ public boolean isOpen() {
         String id = getId();
         if (id != null && !id.isEmpty()) {
             Widget toast = RootPanel.get(id);
+            if(toast == null){
+                return false;
+            }
             return toast.isAttached() && toast.isVisible();
         }
         return false;

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.github.gwtmaterialdesign</groupId>
     <artifactId>gwt-material-parent</artifactId>
-    <version>2.8.0</version>
+    <version>2.8.1</version>
     <packaging>pom</packaging>
     <modules>
         <module>gwt-material</module>
@@ -75,7 +75,7 @@
         <connection>scm:git:git@github.com:GwtMaterialDesign/gwt-material.git</connection>
         <developerConnection>scm:git:git@github.com:GwtMaterialDesign/gwt-material.git</developerConnection>
         <url>http://github.com/GwtMaterialDesign/gwt-material</url>
-        <tag>v2.8.0</tag>
+        <tag>v2.8.1</tag>
     </scm>
 
     <licenses>