Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Major improvements to Android touch controls, many bugfixes

Browse Source
This commit is contained in:
Anuken
2017-09-25 18:53:04 -04:00
parent c0505338f2
commit 9f3d7be7b4
27 changed files with 425 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
core/src/io/anuke/mindustry/ui/LoadDialog.java
View File

@@ -16,52 +16,58 @@ public class LoadDialog extends Dialog{
public LoadDialog() {
super("Load Game");
setup();
shown(()->{
shown(() -> {
setup();
});
getButtonTable().addButton("Back", ()->{
getButtonTable().addButton("Back", () -> {
hide();
}).pad(2).size(180, 44).units(Unit.dp);
}
private void setup(){
content().clear();
content().add("Select a save slot.").padBottom(2);
content().row();
for(int i = 0; i < Vars.saveSlots; i ++){
for(int i = 0; i < Vars.saveSlots; i++){
final int slot = i;
TextButton button = new TextButton("[orange]Slot " + (i+1));
TextButton button = new TextButton("[orange]Slot " + (i + 1));
button.getLabelCell().top().left().growX();
button.row();
button.pad(Unit.dp.inPixels(10));
button.add("[gray]" + (!SaveIO.isSaveValid(i) ? "<empty>" : "Last Saved: " + SaveIO.getTimeString(i))).padBottom(2);
button.getLabel().setFontScale(0.75f);
button.setDisabled(!SaveIO.isSaveValid(i) );
button.clicked(()->{
button.getLabel().setFontScale(Unit.dp.inPixels(0.75f));
button.setDisabled(!SaveIO.isSaveValid(i));
button.clicked(() -> {
if(!button.isDisabled()){
Vars.ui.showLoading();
Timer.schedule(new Task(){
@Override
public void run(){
SaveIO.loadFromSlot(slot);
Vars.ui.hideLoading();
hide();
try{
SaveIO.loadFromSlot(slot);
}catch(Exception e){
Vars.ui.showError("[orange]Save file corrupted or invalid!");
return;
}
Vars.ui.hideMenu();
GameState.set(State.playing);
}
}, 2f/60f);
}, 3f/60f);
}
});
content().add(button).size(400, 78).units(Unit.dp).pad(2);
content().row();
}
}
}

13
core/src/io/anuke/mindustry/ui/SaveDialog.java
View File

@@ -40,7 +40,7 @@ public class SaveDialog extends Dialog{
button.row();
button.pad(Unit.dp.inPixels(10));
button.add((!SaveIO.isSaveValid(i) ? "[gray]<empty>" : "[LIGHT_GRAY]Last Saved: " + SaveIO.getTimeString(i))).padBottom(2);
button.getLabel().setFontScale(0.75f);
button.getLabel().setFontScale(Unit.dp.inPixels(0.75f));
button.clicked(()->{
if(SaveIO.isSaveValid(slot)){
@@ -62,16 +62,21 @@ public class SaveDialog extends Dialog{
}
void save(int slot){
Vars.ui.showLoading("[yellow]Saving...");
Vars.ui.showLoading("[orange]Saving...");
Timer.schedule(new Task(){
@Override
public void run(){
SaveIO.saveToSlot(slot);
hide();
try{
SaveIO.saveToSlot(slot);
}catch (Exception e){
Vars.ui.showError("[orange]Failed to save game!");
return;
}
Vars.ui.hideLoading();
}
}, 8f/60f);
}, 5f/60f);
}
}