mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-04 15:27:19 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed black styles on game reload (Android)

Browse Source
This commit is contained in:
Anuken
2019-09-12 09:06:25 -04:00
parent 41b21c81a0
commit bbaaa91575
3 changed files with 278 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
annotations/src/main/java/io/anuke/annotations/AssetsAnnotationProcessor.java
View File

@ -55,6 +55,7 @@ public class AssetsAnnotationProcessor extends AbstractProcessor{
TypeSpec.Builder type = TypeSpec.classBuilder("Tex").addModifiers(Modifier.PUBLIC); TypeSpec.Builder type = TypeSpec.classBuilder("Tex").addModifiers(Modifier.PUBLIC);
TypeSpec.Builder ictype = TypeSpec.classBuilder("Icon").addModifiers(Modifier.PUBLIC); TypeSpec.Builder ictype = TypeSpec.classBuilder("Icon").addModifiers(Modifier.PUBLIC);
MethodSpec.Builder load = MethodSpec.methodBuilder("load").addModifiers(Modifier.PUBLIC, Modifier.STATIC); MethodSpec.Builder load = MethodSpec.methodBuilder("load").addModifiers(Modifier.PUBLIC, Modifier.STATIC);
MethodSpec.Builder loadStyles = MethodSpec.methodBuilder("loadStyles").addModifiers(Modifier.PUBLIC, Modifier.STATIC);
MethodSpec.Builder icload = MethodSpec.methodBuilder("load").addModifiers(Modifier.PUBLIC, Modifier.STATIC); MethodSpec.Builder icload = MethodSpec.methodBuilder("load").addModifiers(Modifier.PUBLIC, Modifier.STATIC);
String resources = path + "/assets-raw/sprites/ui"; String resources = path + "/assets-raw/sprites/ui";
Files.walk(Paths.get(resources)).forEach(p -> { Files.walk(Paths.get(resources)).forEach(p -> {
@ -98,7 +99,7 @@ public class AssetsAnnotationProcessor extends AbstractProcessor{
t.getEnclosedElements().stream().filter(e -> e.getKind() == ElementKind.FIELD).forEach(field -> { t.getEnclosedElements().stream().filter(e -> e.getKind() == ElementKind.FIELD).forEach(field -> {
String fname = field.getSimpleName().toString(); String fname = field.getSimpleName().toString();
if(fname.startsWith("default")){ if(fname.startsWith("default")){
load.addStatement("io.anuke.arc.Core.scene.addStyle(" + field.asType().toString() + ".class, io.anuke.mindustry.ui.Styles." + fname + ")"); loadStyles.addStatement("io.anuke.arc.Core.scene.addStyle(" + field.asType().toString() + ".class, io.anuke.mindustry.ui.Styles." + fname + ")");
} }
}); });
} }
@ -107,6 +108,7 @@ public class AssetsAnnotationProcessor extends AbstractProcessor{
JavaFile.builder(packageName, ictype.build()).build().writeTo(Utils.filer); JavaFile.builder(packageName, ictype.build()).build().writeTo(Utils.filer);
type.addMethod(load.build()); type.addMethod(load.build());
type.addMethod(loadStyles.build());
JavaFile.builder(packageName, type.build()).build().writeTo(Utils.filer); JavaFile.builder(packageName, type.build()).build().writeTo(Utils.filer);
} }

2
core/src/io/anuke/mindustry/core/UI.java
View File

@ -91,6 +91,8 @@ public class UI implements ApplicationListener, Loadable{
Tex.load(); Tex.load();
Icon.load(); Icon.load();
Styles.load();
Tex.loadStyles();
Dialog.setShowAction(() -> sequence(alpha(0f), fadeIn(0.1f))); Dialog.setShowAction(() -> sequence(alpha(0f), fadeIn(0.1f)));
Dialog.setHideAction(() -> sequence(fadeOut(0.1f))); Dialog.setHideAction(() -> sequence(fadeOut(0.1f)));

96
core/src/io/anuke/mindustry/ui/Styles.java
View File

@ -23,30 +23,41 @@ import static io.anuke.mindustry.gen.Tex.*;
@StyleDefaults @StyleDefaults
public class Styles{ public class Styles{
public static Drawable public static Drawable black, black9, black8, black6, black3, none, flatDown, flatOver;
black = whiteui.tint(0f, 0f, 0f, 1f), public static ButtonStyle defaultb, waveb;
black9 = whiteui.tint(0f, 0f, 0f, 0.9f), public static TextButtonStyle defaultt, squaret, nodet, cleart, discordt, infot, clearPartialt, clearTogglet, clearToggleMenut, togglet;
black8 = whiteui.tint(0f, 0f, 0f, 0.8f), public static ImageButtonStyle defaulti, nodei, righti, emptyi, emptytogglei, selecti, cleari, clearFulli, clearPartiali, clearPartial2i, clearTogglei, clearTransi, clearToggleTransi, clearTogglePartiali;
black6 = whiteui.tint(0f, 0f, 0f, 0.6f), public static ScrollPaneStyle defaultPane, horizontalPane;
black3 = whiteui.tint(0f, 0f, 0f, 0.3f), public static KeybindDialogStyle defaultKeybindDialog;
none = whiteui.tint(0f, 0f, 0f, 0f), public static SliderStyle defaultSlider, vSlider;
flatDown = createFlatDown(), public static LabelStyle defaultLabel, outlineLabel;
public static TextFieldStyle defaultField, areaField;
public static CheckBoxStyle defaultCheck;
public static DialogStyle defaultDialog, fullDialog;
public static void load(){
black = whiteui.tint(0f, 0f, 0f, 1f);
black9 = whiteui.tint(0f, 0f, 0f, 0.9f);
black8 = whiteui.tint(0f, 0f, 0f, 0.8f);
black6 = whiteui.tint(0f, 0f, 0f, 0.6f);
black3 = whiteui.tint(0f, 0f, 0f, 0.3f);
none = whiteui.tint(0f, 0f, 0f, 0f);
flatDown = createFlatDown();
flatOver = whiteui.tint(Color.valueOf("454545")); flatOver = whiteui.tint(Color.valueOf("454545"));
public static ButtonStyle
defaultb = new ButtonStyle(){{ defaultb = new ButtonStyle(){{
down = buttonDown; down = buttonDown;
up = button; up = button;
over = buttonOver; over = buttonOver;
disabled = buttonDisabled; disabled = buttonDisabled;
}}, }};
waveb = new ButtonStyle(){{ waveb = new ButtonStyle(){{
up = buttonEdge4; up = buttonEdge4;
over = buttonEdgeOver4; over = buttonEdgeOver4;
disabled = buttonEdge4; disabled = buttonEdge4;
}}; }};
public static TextButtonStyle
defaultt = new TextButtonStyle(){{ defaultt = new TextButtonStyle(){{
over = buttonOver; over = buttonOver;
disabled = buttonDisabled; disabled = buttonDisabled;
@ -55,7 +66,7 @@ public class Styles{
disabledFontColor = Color.gray; disabledFontColor = Color.gray;
down = buttonDown; down = buttonDown;
up = button; up = button;
}}, }};
squaret = new TextButtonStyle(){{ squaret = new TextButtonStyle(){{
font = Fonts.def; font = Fonts.def;
fontColor = Color.white; fontColor = Color.white;
@ -64,7 +75,7 @@ public class Styles{
disabled = buttonDisabled; disabled = buttonDisabled;
down = buttonSquareDown; down = buttonSquareDown;
up = buttonSquare; up = buttonSquare;
}}, }};
nodet = new TextButtonStyle(){{ nodet = new TextButtonStyle(){{
disabled = button; disabled = button;
font = Fonts.def; font = Fonts.def;
@ -72,7 +83,7 @@ public class Styles{
disabledFontColor = Color.gray; disabledFontColor = Color.gray;
up = buttonOver; up = buttonOver;
over = buttonDown; over = buttonDown;
}}, }};
cleart = new TextButtonStyle(){{ cleart = new TextButtonStyle(){{
over = flatOver; over = flatOver;
font = Fonts.def; font = Fonts.def;
@ -80,17 +91,17 @@ public class Styles{
disabledFontColor = Color.gray; disabledFontColor = Color.gray;
down = flatOver; down = flatOver;
up = black; up = black;
}}, }};
discordt = new TextButtonStyle(){{ discordt = new TextButtonStyle(){{
font = Fonts.def; font = Fonts.def;
fontColor = Color.white; fontColor = Color.white;
up = discordBanner; up = discordBanner;
}}, }};
infot = new TextButtonStyle(){{ infot = new TextButtonStyle(){{
font = Fonts.def; font = Fonts.def;
fontColor = Color.white; fontColor = Color.white;
up = infoBanner; up = infoBanner;
}}, }};
clearPartialt = new TextButtonStyle(){{ clearPartialt = new TextButtonStyle(){{
down = whiteui; down = whiteui;
up = pane; up = pane;
@ -98,7 +109,7 @@ public class Styles{
font = Fonts.def; font = Fonts.def;
fontColor = Color.white; fontColor = Color.white;
disabledFontColor = Color.gray; disabledFontColor = Color.gray;
}}, }};
clearTogglet = new TextButtonStyle(){{ clearTogglet = new TextButtonStyle(){{
font = Fonts.def; font = Fonts.def;
fontColor = Color.white; fontColor = Color.white;
@ -108,7 +119,7 @@ public class Styles{
over = flatOver; over = flatOver;
disabled = black; disabled = black;
disabledFontColor = Color.gray; disabledFontColor = Color.gray;
}}, }};
clearToggleMenut = new TextButtonStyle(){{ clearToggleMenut = new TextButtonStyle(){{
font = Fonts.def; font = Fonts.def;
fontColor = Color.white; fontColor = Color.white;
@ -118,7 +129,7 @@ public class Styles{
over = flatOver; over = flatOver;
disabled = black; disabled = black;
disabledFontColor = Color.gray; disabledFontColor = Color.gray;
}}, }};
togglet = new TextButtonStyle(){{ togglet = new TextButtonStyle(){{
font = Fonts.def; font = Fonts.def;
fontColor = Color.white; fontColor = Color.white;
@ -130,7 +141,6 @@ public class Styles{
disabledFontColor = Color.gray; disabledFontColor = Color.gray;
}}; }};
public static ImageButtonStyle
defaulti = new ImageButtonStyle(){{ defaulti = new ImageButtonStyle(){{
down = buttonDown; down = buttonDown;
up = button; up = button;
@ -138,66 +148,66 @@ public class Styles{
imageDisabledColor = Color.gray; imageDisabledColor = Color.gray;
imageUpColor = Color.white; imageUpColor = Color.white;
disabled = buttonDisabled; disabled = buttonDisabled;
}}, }};
nodei = new ImageButtonStyle(){{ nodei = new ImageButtonStyle(){{
up = buttonOver; up = buttonOver;
over = buttonDown; over = buttonDown;
}}, }};
righti = new ImageButtonStyle(){{ righti = new ImageButtonStyle(){{
over = buttonRightOver; over = buttonRightOver;
down = buttonRightDown; down = buttonRightDown;
up = buttonRight; up = buttonRight;
}}, }};
emptyi = new ImageButtonStyle(){{ emptyi = new ImageButtonStyle(){{
imageDownColor = Pal.accent; imageDownColor = Pal.accent;
imageUpColor = Color.white; imageUpColor = Color.white;
}}, }};
emptytogglei = new ImageButtonStyle(){{ emptytogglei = new ImageButtonStyle(){{
imageCheckedColor = Color.white; imageCheckedColor = Color.white;
imageDownColor = Color.white; imageDownColor = Color.white;
imageUpColor = Color.gray; imageUpColor = Color.gray;
}}, }};
selecti = new ImageButtonStyle(){{ selecti = new ImageButtonStyle(){{
checked = buttonSelect; checked = buttonSelect;
up = none; up = none;
}}, }};
cleari = new ImageButtonStyle(){{ cleari = new ImageButtonStyle(){{
down = flatOver; down = flatOver;
up = black; up = black;
over = flatOver; over = flatOver;
}}, }};
clearFulli = new ImageButtonStyle(){{ clearFulli = new ImageButtonStyle(){{
down = whiteui; down = whiteui;
up = pane; up = pane;
over = flatDown; over = flatDown;
}}, }};
clearPartiali = new ImageButtonStyle(){{ clearPartiali = new ImageButtonStyle(){{
down = flatDown; down = flatDown;
up = none; up = none;
over = flatOver; over = flatOver;
}}, }};
clearPartial2i = new ImageButtonStyle(){{ clearPartial2i = new ImageButtonStyle(){{
down = whiteui; down = whiteui;
up = pane; up = pane;
over = flatDown; over = flatDown;
}}, }};
clearTogglei = new ImageButtonStyle(){{ clearTogglei = new ImageButtonStyle(){{
down = flatDown; down = flatDown;
checked = flatDown; checked = flatDown;
up = black; up = black;
over = flatOver; over = flatOver;
}}, }};
clearTransi = new ImageButtonStyle(){{ clearTransi = new ImageButtonStyle(){{
down = flatDown; down = flatDown;
up = black6; up = black6;
over = flatOver; over = flatOver;
}}, }};
clearToggleTransi = new ImageButtonStyle(){{ clearToggleTransi = new ImageButtonStyle(){{
down = flatDown; down = flatDown;
checked = flatDown; checked = flatDown;
up = black6; up = black6;
over = flatOver; over = flatOver;
}}, }};
clearTogglePartiali = new ImageButtonStyle(){{ clearTogglePartiali = new ImageButtonStyle(){{
down = flatDown; down = flatDown;
checked = flatDown; checked = flatDown;
@ -205,11 +215,10 @@ public class Styles{
over = flatOver; over = flatOver;
}}; }};
public static ScrollPaneStyle
defaultPane = new ScrollPaneStyle(){{ defaultPane = new ScrollPaneStyle(){{
vScroll = scroll; vScroll = scroll;
vScrollKnob = scrollKnobVerticalBlack; vScrollKnob = scrollKnobVerticalBlack;
}}, }};
horizontalPane = new ScrollPaneStyle(){{ horizontalPane = new ScrollPaneStyle(){{
vScroll = scroll; vScroll = scroll;
vScrollKnob = scrollKnobVerticalBlack; vScrollKnob = scrollKnobVerticalBlack;
@ -217,20 +226,18 @@ public class Styles{
hScrollKnob = scrollKnobHorizontalBlack; hScrollKnob = scrollKnobHorizontalBlack;
}}; }};
public static KeybindDialogStyle
defaultKeybindDialog = new KeybindDialogStyle(){{ defaultKeybindDialog = new KeybindDialogStyle(){{
keyColor = Pal.accent; keyColor = Pal.accent;
keyNameColor = Color.white; keyNameColor = Color.white;
controllerColor = Color.lightGray; controllerColor = Color.lightGray;
}}; }};
public static SliderStyle
defaultSlider = new SliderStyle(){{ defaultSlider = new SliderStyle(){{
background = slider; background = slider;
knob = sliderKnob; knob = sliderKnob;
knobOver = sliderKnobOver; knobOver = sliderKnobOver;
knobDown = sliderKnobDown; knobDown = sliderKnobDown;
}}, }};
vSlider = new SliderStyle(){{ vSlider = new SliderStyle(){{
background = sliderVertical; background = sliderVertical;
knob = sliderKnob; knob = sliderKnob;
@ -238,17 +245,15 @@ public class Styles{
knobDown = sliderKnobDown; knobDown = sliderKnobDown;
}}; }};
public static LabelStyle
defaultLabel = new LabelStyle(){{ defaultLabel = new LabelStyle(){{
font = Fonts.def; font = Fonts.def;
fontColor = Color.white; fontColor = Color.white;
}}, }};
outlineLabel = new LabelStyle(){{ outlineLabel = new LabelStyle(){{
font = Fonts.outline; font = Fonts.outline;
fontColor = Color.white; fontColor = Color.white;
}}; }};
public static TextFieldStyle
defaultField = new TextFieldStyle(){{ defaultField = new TextFieldStyle(){{
font = Fonts.chat; font = Fonts.chat;
fontColor = Color.white; fontColor = Color.white;
@ -260,7 +265,7 @@ public class Styles{
cursor = Tex.cursor; cursor = Tex.cursor;
messageFont = Fonts.def; messageFont = Fonts.def;
messageFontColor = Color.gray; messageFontColor = Color.gray;
}}, }};
areaField = new TextFieldStyle(){{ areaField = new TextFieldStyle(){{
font = Fonts.chat; font = Fonts.chat;
fontColor = Color.white; fontColor = Color.white;
@ -272,7 +277,6 @@ public class Styles{
messageFontColor = Color.gray; messageFontColor = Color.gray;
}}; }};
public static CheckBoxStyle
defaultCheck = new CheckBoxStyle(){{ defaultCheck = new CheckBoxStyle(){{
checkboxOn = checkOn; checkboxOn = checkOn;
checkboxOff = checkOff; checkboxOff = checkOff;
@ -285,19 +289,19 @@ public class Styles{
disabledFontColor = Color.gray; disabledFontColor = Color.gray;
}}; }};
public static DialogStyle
defaultDialog = new DialogStyle(){{ defaultDialog = new DialogStyle(){{
stageBackground = black9; stageBackground = black9;
titleFont = Fonts.def; titleFont = Fonts.def;
background = windowEmpty; background = windowEmpty;
titleFontColor = Pal.accent; titleFontColor = Pal.accent;
}}, }};
fullDialog = new DialogStyle(){{ fullDialog = new DialogStyle(){{
stageBackground = black; stageBackground = black;
titleFont = Fonts.def; titleFont = Fonts.def;
background = windowEmpty; background = windowEmpty;
titleFontColor = Pal.accent; titleFontColor = Pal.accent;
}}; }};
}
private static Drawable createFlatDown(){ private static Drawable createFlatDown(){
AtlasRegion region = Core.atlas.find("flat-down-base"); AtlasRegion region = Core.atlas.find("flat-down-base");