Skip to content

Commit 565d53b

Browse files
committed
Merge branch 'release_2.8.0'
2 parents 1f812f9 + 1ed47c9 commit 565d53b

File tree

5 files changed

+18
-5
lines changed

5 files changed

+18
-5
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ Support documentation can be found [here](https://github.com/GwtMaterialDesign/g
2020
We created <a href="http://gwtmaterialdesign.github.io/gwt-material-demo/apidocs" > Java Docs </a> for developers
2121

2222
## Maven
23-
### Current Version 2.8.0
23+
### Current Version 2.8.1
2424
```xml
2525
<dependency>
2626
<groupId>com.github.gwtmaterialdesign</groupId>
2727
<artifactId>gwt-material</artifactId>
28-
<version>2.8.0</version>
28+
<version>2.8.1</version>
2929
</dependency>
3030
```
3131
### Snapshot Version 2.8.0-SNAPSHOT

gwt-material/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<artifactId>gwt-material-parent</artifactId>
66
<groupId>com.github.gwtmaterialdesign</groupId>
7-
<version>2.8.0</version>
7+
<version>2.8.1</version>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>
1010

gwt-material/src/main/java/gwt/material/design/client/theme/ThemeManager.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
import com.google.gwt.core.client.GWT;
2323
import gwt.material.design.client.base.MaterialWidget;
24+
import gwt.material.design.client.theme.dark.DarkThemeLoader;
2425

2526
import java.util.ArrayList;
2627
import java.util.HashMap;
@@ -34,6 +35,7 @@
3435
ThemeManager {
3536

3637
private static SortedSet<Theme> themes;
38+
private static DarkThemeLoader darkTheme;
3739

3840
private static Map<Class, List<WidgetTheme>> themeCache = new HashMap<>();
3941

@@ -131,4 +133,12 @@ public static <T extends MaterialWidget> void addWidgetTheme(String themeName, W
131133
public static <T extends MaterialWidget> void addWidgetTheme(Theme theme, WidgetTheme<T> widgetTheme) {
132134
theme.put(widgetTheme.getClassSelector(), widgetTheme);
133135
}
136+
137+
public static DarkThemeLoader getDarkTheme() {
138+
return darkTheme;
139+
}
140+
141+
public static void setDarkTheme(DarkThemeLoader darkTheme) {
142+
ThemeManager.darkTheme = darkTheme;
143+
}
134144
}

gwt-material/src/main/java/gwt/material/design/client/ui/MaterialToast.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,9 @@ public boolean isOpen() {
200200
String id = getId();
201201
if (id != null && !id.isEmpty()) {
202202
Widget toast = RootPanel.get(id);
203+
if(toast == null){
204+
return false;
205+
}
203206
return toast.isAttached() && toast.isVisible();
204207
}
205208
return false;

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>com.github.gwtmaterialdesign</groupId>
77
<artifactId>gwt-material-parent</artifactId>
8-
<version>2.8.0</version>
8+
<version>2.8.1</version>
99
<packaging>pom</packaging>
1010
<modules>
1111
<module>gwt-material</module>
@@ -75,7 +75,7 @@
7575
<connection>scm:git:[email protected]:GwtMaterialDesign/gwt-material.git</connection>
7676
<developerConnection>scm:git:[email protected]:GwtMaterialDesign/gwt-material.git</developerConnection>
7777
<url>http://github.com/GwtMaterialDesign/gwt-material</url>
78-
<tag>v2.8.0</tag>
78+
<tag>v2.8.1</tag>
7979
</scm>
8080

8181
<licenses>

0 commit comments

Comments
 (0)