Removed additional info from mac version

This commit is contained in:
Anuken
2018-05-28 16:55:46 -04:00
parent e58194ac3c
commit fcb74d4fba
3 changed files with 22 additions and 6 deletions

View File

@@ -2,17 +2,20 @@ package io.anuke.mindustry.ui.dialogs;
import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.utils.ObjectSet;
import io.anuke.mindustry.ui.Links; import io.anuke.mindustry.ui.Links;
import io.anuke.mindustry.ui.Links.LinkEntry; import io.anuke.mindustry.ui.Links.LinkEntry;
import io.anuke.ucore.core.Core; import io.anuke.ucore.core.Core;
import io.anuke.ucore.core.Timers; import io.anuke.ucore.core.Timers;
import io.anuke.ucore.scene.ui.ScrollPane; import io.anuke.ucore.scene.ui.ScrollPane;
import io.anuke.ucore.scene.ui.layout.Table; import io.anuke.ucore.scene.ui.layout.Table;
import io.anuke.ucore.util.OS;
import static io.anuke.mindustry.Vars.ios; import static io.anuke.mindustry.Vars.ios;
import static io.anuke.mindustry.Vars.ui; import static io.anuke.mindustry.Vars.ui;
public class AboutDialog extends FloatingDialog { public class AboutDialog extends FloatingDialog {
private static ObjectSet<String> bannedItems = ObjectSet.with("google-play", "itch.io", "dev-builds", "trello");
public AboutDialog(){ public AboutDialog(){
super("$text.about.button"); super("$text.about.button");
@@ -26,7 +29,7 @@ public class AboutDialog extends FloatingDialog {
ScrollPane pane = new ScrollPane(in, "clear"); ScrollPane pane = new ScrollPane(in, "clear");
for(LinkEntry link : Links.getLinks()){ for(LinkEntry link : Links.getLinks()){
if(ios && link.name.equals("google-play")){ //because Apple doesn't like me mentioning android if((ios || OS.isMac) && bannedItems.contains(link.name)){ //because Apple doesn't like me mentioning things
continue; continue;
} }
@@ -64,13 +67,14 @@ public class AboutDialog extends FloatingDialog {
content().add(pane).growX(); content().add(pane).growX();
buttons().addButton("$text.credits", this::showCredits).size(200f, 64f); buttons().addButton("$text.credits", this::showCredits).size(200f, 64f);
if(!ios){
if(!ios && !OS.isMac){
buttons().addButton("$text.changelog.title", ui.changelog::show).size(200f, 64f); buttons().addButton("$text.changelog.title", ui.changelog::show).size(200f, 64f);
} }
} }
private void showCredits(){ public void showCredits(){
FloatingDialog dialog = new FloatingDialog("$text.credits"); FloatingDialog dialog = new FloatingDialog("$text.credits");
dialog.addCloseButton(); dialog.addCloseButton();
dialog.content().add("$text.about"); dialog.content().add("$text.about");

View File

@@ -10,6 +10,7 @@ import io.anuke.ucore.core.Settings;
import io.anuke.ucore.scene.ui.ScrollPane; import io.anuke.ucore.scene.ui.ScrollPane;
import io.anuke.ucore.scene.ui.layout.Table; import io.anuke.ucore.scene.ui.layout.Table;
import io.anuke.ucore.util.Log; import io.anuke.ucore.util.Log;
import io.anuke.ucore.util.OS;
import static io.anuke.mindustry.Vars.ios; import static io.anuke.mindustry.Vars.ios;
@@ -24,7 +25,7 @@ public class ChangelogDialog extends FloatingDialog{
content().add("$text.changelog.loading"); content().add("$text.changelog.loading");
if(!ios) { if(!ios && !OS.isMac) {
Changelogs.getChangelog(result -> { Changelogs.getChangelog(result -> {
versions = result; versions = result;
Gdx.app.postRunnable(this::setup); Gdx.app.postRunnable(this::setup);
@@ -55,6 +56,10 @@ public class ChangelogDialog extends FloatingDialog{
} }
}else{ }else{
for(VersionInfo info : versions){ for(VersionInfo info : versions){
String desc = info.description;
desc = desc.replace("Android", "Mobile");
Table in = new Table("clear"); Table in = new Table("clear");
in.top().left().margin(10); in.top().left().margin(10);
@@ -67,7 +72,7 @@ public class ChangelogDialog extends FloatingDialog{
in.add("$text.changelog.latest"); in.add("$text.changelog.latest");
} }
in.row(); in.row();
in.labelWrap("[lightgray]" + info.description).width(vw - 20).padTop(12); in.labelWrap("[lightgray]" + desc).width(vw - 20).padTop(12);
table.add(in).width(vw).pad(8).row(); table.add(in).width(vw).pad(8).row();
} }

View File

@@ -9,6 +9,7 @@ import io.anuke.mindustry.ui.dialogs.FloatingDialog;
import io.anuke.ucore.scene.builders.imagebutton; import io.anuke.ucore.scene.builders.imagebutton;
import io.anuke.ucore.scene.builders.label; import io.anuke.ucore.scene.builders.label;
import io.anuke.ucore.scene.builders.table; import io.anuke.ucore.scene.builders.table;
import io.anuke.ucore.util.OS;
import static io.anuke.mindustry.Vars.*; import static io.anuke.mindustry.Vars.*;
@@ -44,7 +45,13 @@ public class MenuFragment implements Fragment{
add(new MenuButton("icon-info", "$text.about.button", ui.about::show)); add(new MenuButton("icon-info", "$text.about.button", ui.about::show));
add(new MenuButton("icon-menu", "$text.changelog.title", ui.changelog::show)); add(new MenuButton("icon-menu", OS.isMac ? "$text.credits" : "$text.changelog.title", () -> {
if(OS.isMac){
ui.about.showCredits();
}else {
ui.changelog.show();
}
}));
row(); row();