Skip to content

Commit a6946a8

Browse files
committed
Group toggle button dark theme support.
1 parent 03ba815 commit a6946a8

File tree

10 files changed

+54
-11
lines changed

10 files changed

+54
-11
lines changed

src/main/java/gwt/material/design/incubator/client/dark/IncubatorDarkThemeLoader.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,12 @@
2121

2222
import gwt.material.design.client.theme.dark.DarkThemeLoader;
2323
import gwt.material.design.incubator.client.progress.ProgressLineBarDarkTheme;
24+
import gwt.material.design.incubator.client.toggle.GroupToggleDarkTheme;
2425

2526
public class IncubatorDarkThemeLoader extends DarkThemeLoader {
2627

2728
public IncubatorDarkThemeLoader() {
28-
super(new ProgressLineBarDarkTheme());
29+
super(new GroupToggleDarkTheme(),
30+
new ProgressLineBarDarkTheme());
2931
}
3032
}

src/main/java/gwt/material/design/incubator/client/dark/IncubatorDarkThemeReloader.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ public class IncubatorDarkThemeReloader {
99
static IncubatorDarkThemeReloader instance;
1010

1111
public void reload(Class<? extends DarkThemeLoader> widgetLoader) {
12-
DarkThemeLoader addinsLoader = DarkThemeManager.get().getLoader(IncubatorDarkThemeLoader.class);
13-
if (addinsLoader != null) {
14-
DarkThemeLoader child = addinsLoader.getChild(widgetLoader);
12+
DarkThemeLoader incubatorLoader = DarkThemeManager.get().getLoader(IncubatorDarkThemeLoader.class);
13+
if (incubatorLoader != null) {
14+
DarkThemeLoader child = incubatorLoader.getChild(widgetLoader);
1515
if (child != null && child instanceof AddinsWidgetDarkTheme) {
1616
((AddinsWidgetDarkTheme) child).suppressReload();
1717
}

src/main/java/gwt/material/design/incubator/client/toggle/GroupToggleButton.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@
3636
import gwt.material.design.client.ui.html.Label;
3737
import gwt.material.design.incubator.client.base.IncubatorWidget;
3838
import gwt.material.design.incubator.client.base.constants.IncubatorCssName;
39+
import gwt.material.design.incubator.client.dark.IncubatorDarkThemeLoader;
40+
import gwt.material.design.incubator.client.dark.IncubatorDarkThemeReloader;
3941

4042
import java.util.ArrayList;
4143
import java.util.Arrays;
@@ -93,12 +95,12 @@ public GroupToggleButton() {
9395
protected void onLoad() {
9496
super.onLoad();
9597

96-
registerHandler(addSelectionHandler(selectionEvent -> {
97-
ValueChangeEvent.fire(GroupToggleButton.this, getValue());
98-
}));
9998
add(label);
10099
add(wrapper);
101100
add(errorLabel);
101+
102+
registerHandler(addSelectionHandler(selectionEvent -> ValueChangeEvent.fire(GroupToggleButton.this, getValue())));
103+
IncubatorDarkThemeReloader.get().reload(GroupToggleDarkTheme.class);
102104
}
103105

104106
public ToggleButton addItem(String text) {

src/main/java/gwt/material/design/incubator/client/toggle/GroupToggleButtonClientBundle.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,7 @@ public interface GroupToggleButtonClientBundle extends ClientBundle {
3333

3434
@Source("resources/css/group-toggle-button.min.css")
3535
TextResource groupToggleButtonCss();
36+
37+
@Source("resources/css/group-toggle-button-dark.min.css")
38+
TextResource groupToggleButtonDarkCss();
3639
}

src/main/java/gwt/material/design/incubator/client/toggle/GroupToggleButtonDebugClientBundle.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,7 @@ public interface GroupToggleButtonDebugClientBundle extends ClientBundle {
3333

3434
@Source("resources/css/group-toggle-button.css")
3535
TextResource groupToggleDebugCss();
36+
37+
@Source("resources/css/group-toggle-button-dark.css")
38+
TextResource groupToggleDarkCss();
3639
}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package gwt.material.design.incubator.client.toggle;
2+
3+
import gwt.material.design.addins.client.dark.AddinsWidgetDarkTheme;
4+
import gwt.material.design.incubator.client.AddinsIncubator;
5+
import gwt.material.design.incubator.client.progress.ProgressLineBarClientBundle;
6+
import gwt.material.design.incubator.client.progress.ProgressLineBarDebugClientBundle;
7+
8+
public class GroupToggleDarkTheme extends AddinsWidgetDarkTheme {
9+
10+
public GroupToggleDarkTheme() {
11+
super(AddinsIncubator.isDebug() ? GroupToggleButtonDebugClientBundle.INSTANCE.groupToggleDarkCss() : GroupToggleButtonClientBundle.INSTANCE.groupToggleButtonDarkCss());
12+
}
13+
}
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
.progress-line-bar .progress-item.active {
2-
background: #bb86fc;
2+
background: #bb86fc !important;
33
}
44

55
.progress-item {
6-
border-right: 1px solid #292929;
7-
background: #3e3e3e;
6+
border-right: 1px solid #292929 !important;
7+
background: #3e3e3e !important;
88
}

src/main/resources/gwt/material/design/incubator/client/progress/resources/css/progress-line-bar-dark.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
.group-toggle-button .wrapper {
2+
background: #424242;
3+
}
4+
5+
.group-toggle-button .wrapper button.active,
6+
.group-toggle-button .wrapper button:not(.active):hover{
7+
background: #bb86fc;
8+
color: #1e1e1e;
9+
}
10+
11+
.group-toggle-button .wrapper button:not(.active):hover {
12+
background-color: #525252;
13+
}
14+
15+
.group-toggle-button .wrapper button {
16+
color: #8e8e8e;
17+
background-color: #424242;
18+
border-right: 1px solid #292929;
19+
}

src/main/resources/gwt/material/design/incubator/client/toggle/resources/css/group-toggle-button-dark.min.css

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)