Merge remote-tracking branch 'origin/master'

build.gradle

@@ -38,7 +38,7 @@ allprojects{
         }
 
         getArcHash = {
-            return new Properties().with{ p -> p.load(new File((File)projectDir, 'gradle.properties').newReader()); return p }["archash"]
+            return new Properties().with{ p -> p.load(file('gradle.properties').newReader()); return p }["archash"]
         }
 
         arcModule = { String name ->
@@ -200,7 +200,7 @@ project(":core"){
     }
 
     dependencies{
-        if(System.properties["user.name"] == "anuke"){
+        if(System.properties["user.name"] == "anuke2"){
             task cleanGen{
                 doFirst{
                     delete{

core/src/io/anuke/mindustry/editor/MapEditorDialog.java

@@ -85,7 +85,6 @@ public class MapEditorDialog extends Dialog implements Disposable{
 
             t.row();
 
-            if(!ios){
             t.addImageTextButton("$editor.import", Icon.loadMapSmall, () ->
             createDialog("$editor.import",
             "$editor.importmap", "$editor.importmap.description", Icon.loadMap, (Runnable)loadDialog::show,
@@ -113,9 +112,8 @@ public class MapEditorDialog extends Dialog implements Disposable{
                 }
             })))
             );
-            }
 
-            Cell cell = t.addImageTextButton("$editor.export", Icon.saveMapSmall, () -> {
+            t.addImageTextButton("$editor.export", Icon.saveMapSmall, () -> {
                 if(!ios){
                     platform.showFileChooser(false, mapExtension, file -> {
                         ui.loadAnd(() -> {
@@ -143,10 +141,6 @@ public class MapEditorDialog extends Dialog implements Disposable{
                     });
                 }
             });
-
-            if(ios){
-                cell.size(swidth * 2f + 10, 60f).colspan(2);
-            }
         });
 
         menu.cont.row();

core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java

@@ -126,8 +126,6 @@ public class SettingsMenuDialog extends SettingsDialog{
 
             t.row();
 
-            //iOS doesn't have a file chooser.
-            //if(!ios){
             t.addButton("$data.import", style, () -> ui.showConfirm("$confirm", "$data.import.confirm", () -> platform.showFileChooser(true, "zip", file -> {
                 try{
                     data.importData(file);
@@ -143,7 +141,6 @@ public class SettingsMenuDialog extends SettingsDialog{
                     }
                 }
             })));
-            //}
         });
 
         ScrollPane pane = new ScrollPane(prefs);

ios/Info.plist.xml

@@ -74,23 +74,23 @@
                 </array>
             </dict>
 
-            <array>
             <dict>
                 <key>CFBundleTypeIconFiles</key>
                 <array>
                     <string>icon-72.png</string>
                 </array>
                 <key>CFBundleTypeName</key>
-                    <string>Zip Data File</string>
+                <string>Zip Game Data</string>
+                <key>CFBundleTypeRole</key>
+                <string>Editor</string>
                 <key>LSHandlerRank</key>
-                    <string>Alternate</string>
+                <string>Owner</string>
                 <key>LSItemContentTypes</key>
                 <array>
                     <string>public.archive</string>
                 </array>
             </dict>
         </array>
-        </array>
 
         <key>UTExportedTypeDeclarations</key>
         <array>

ios/src/io/anuke/mindustry/IOSLauncher.java

@@ -13,6 +13,7 @@ import io.anuke.mindustry.io.*;
 import io.anuke.mindustry.ui.*;
 import org.robovm.apple.foundation.*;
 import org.robovm.apple.uikit.*;
+import org.robovm.apple.uikit.UIBarButtonItem.*;
 import org.robovm.objc.block.*;
 
 import java.io.*;
@@ -39,10 +40,15 @@ public class IOSLauncher extends IOSApplication.Delegate{
 
             @Override
             public void showFileChooser(boolean open, String extension, Consumer<FileHandle> cons){
-                UIDocumentBrowserViewController cont = new UIDocumentBrowserViewController(NSArray.fromStrings("public.archive"));
+                UIDocumentBrowserViewController cont = new UIDocumentBrowserViewController((NSArray)null);
 
-                cont.setAllowsDocumentCreation(false);
+                NSArray<UIBarButtonItem> arr = new NSArray<>(new UIBarButtonItem(Core.bundle.get("cancel"), UIBarButtonItemStyle.Plain,
-                cont.setDelegate(new UIDocumentBrowserViewControllerDelegate(){
+                    uiBarButtonItem -> cont.dismissViewController(true, () -> {})));
+
+                cont.setAllowsDocumentCreation(!open);
+                cont.setAdditionalLeadingNavigationBarButtonItems(arr);
+
+                class ChooserDelegate extends NSObject implements UIDocumentBrowserViewControllerDelegate{
                     @Override
                     public void didPickDocumentURLs(UIDocumentBrowserViewController controller, NSArray<NSURL> documentURLs){
 
@@ -50,7 +56,10 @@ public class IOSLauncher extends IOSApplication.Delegate{
 
                     @Override
                     public void didPickDocumentsAtURLs(UIDocumentBrowserViewController controller, NSArray<NSURL> documentURLs){
+                        if(documentURLs.size() < 1) return;
 
+                        cont.dismissViewController(true, () -> {});
+                        cons.accept(Core.files.absolute(documentURLs.get(0).getPath()));
                     }
 
                     @Override
@@ -77,7 +86,9 @@ public class IOSLauncher extends IOSApplication.Delegate{
                     public void willPresentActivityViewController(UIDocumentBrowserViewController controller, UIActivityViewController activityViewController){
 
                     }
-                });
+                }
+
+                cont.setDelegate(new ChooserDelegate());
                 UIApplication.getSharedApplication().getKeyWindow().getRootViewController().presentViewController(cont, true, () -> {
 
                 });