From b4088dcfbc84648bfc8b5561df1c35ba8ae3d86b Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 22 May 2018 14:30:54 -0700 Subject: [PATCH] Some more revisions to iOS version --- core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java | 4 ++++ ios/robovm.properties | 2 +- ios/src/io/anuke/mindustry/IOSLauncher.java | 7 +++---- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java index 61fb59a8d04f..109f2c6f129a 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java @@ -26,6 +26,10 @@ public AboutDialog(){ ScrollPane pane = new ScrollPane(in, "clear"); for(LinkEntry link : Links.getLinks()){ + if(ios && link.name.equals("google-play")){ //because Apple doesn't like me mentioning android + continue; + } + Table table = new Table("button"); table.margin(0); table.table(img -> { diff --git a/ios/robovm.properties b/ios/robovm.properties index 9c1da23a7a8c..9847b37ee0c1 100644 --- a/ios/robovm.properties +++ b/ios/robovm.properties @@ -2,5 +2,5 @@ app.version=3.5 app.id=io.anuke.mindustry app.mainclass=io.anuke.mindustry.IOSLauncher app.executable=IOSLauncher -app.build=6 +app.build=10 app.name=Mindustry diff --git a/ios/src/io/anuke/mindustry/IOSLauncher.java b/ios/src/io/anuke/mindustry/IOSLauncher.java index 08413e632f60..00f0d6b6f4fd 100644 --- a/ios/src/io/anuke/mindustry/IOSLauncher.java +++ b/ios/src/io/anuke/mindustry/IOSLauncher.java @@ -12,7 +12,6 @@ import io.anuke.mindustry.io.SaveIO; import io.anuke.mindustry.io.Saves.SaveSlot; import io.anuke.mindustry.net.Net; -import io.anuke.ucore.core.Timers; import io.anuke.ucore.scene.ui.TextField; import io.anuke.ucore.scene.ui.layout.Unit; import io.anuke.ucore.util.Bundles; @@ -116,10 +115,10 @@ public boolean didFinishLaunching(UIApplication application, UIApplicationLaunch } void openURL(NSURL url){ - FileHandle file = Gdx.files.absolute(getDocumentsDirectory()).child(url.getLastPathComponent()); - Gdx.files.absolute(url.getPath()).copyTo(file); - Timers.runTask(30f, () -> { + Gdx.app.postRunnable(() -> { + FileHandle file = Gdx.files.absolute(getDocumentsDirectory()).child(url.getLastPathComponent()); + Gdx.files.absolute(url.getPath()).copyTo(file); if(file.extension().equalsIgnoreCase("mins")){ //open save