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

Merge branch 'master' into formatting

Browse Source
This commit is contained in:
Anuken
2020-10-30 09:26:51 -04:00
committed by GitHub
parent 2918a0ea86 513ccfe581
commit 73035b9211
44 changed files with 508 additions and 382 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ios/Info.plist.xml
View File

@@ -20,6 +20,8 @@
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>${app.version}</string>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>CFBundleIconName</key>
<string>AppIcon</string>
<key>CFBundleSignature</key>
@@ -53,6 +55,7 @@
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationPortraitUpsideDown</string>
</array>
<key>CFBundleDocumentTypes</key>

7
ios/build.gradle
View File

@@ -45,4 +45,11 @@ createIPA.dependsOn build
robovm{
archs = "thumbv7:arm64"
if(project.hasProperty("signIdentity")) println "iOS Sign Identity: " + project.property("signIdentity")
if(project.hasProperty("provisioningProfile")) println "iOS Provisioning Profile: " + project.property("provisioningProfile")
iosSignIdentity = project.properties["signIdentity"]
iosProvisioningProfile = project.properties["provisioningProfile"]
iosSkipSigning = false
}

36
ios/data/Base.lproj/LaunchScreen.storyboard Normal file
View File

@@ -0,0 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--View Controller-->
<scene sceneID="EHf-IW-A2E">
<objects>
<viewController id="01J-lp-oVM" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="Logo" translatesAutoresizingMaskIntoConstraints="NO" id="hN2-E0-Tu8">
<rect key="frame" x="120" y="402" width="172" height="93"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
</imageView>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="52.173913043478265" y="375"/>
</scene>
</scenes>
<resources>
<image name="Logo" width="243" height="41"/>
</resources>
</document>

4
ios/robovm.xml
View File

@@ -22,6 +22,7 @@
<pattern>arc.scene.**</pattern>
<pattern>mindustry.gen.Call</pattern>
<pattern>mindustry.net.**</pattern>
<pattern>mindustry.world.blocks.**</pattern>
<pattern>com.android.okhttp.HttpHandler</pattern>
<pattern>com.android.okhttp.HttpsHandler</pattern>
<pattern>com.android.org.conscrypt.**</pattern>
@@ -37,6 +38,9 @@
</forceLinkClasses>
<libs>
<lib>z</lib>
<lib>libs/libObjectAL.a</lib>
<lib>libs/libarc.a</lib>
<lib>libs/libarc-freetype.a</lib>
</libs>
<frameworks>
<framework>UIKit</framework>

2
ios/src/mindustry/ios/IOSLauncher.java
View File

@@ -205,7 +205,7 @@ public class IOSLauncher extends IOSApplication.Delegate{
UIInterfaceOrientation o = UIApplication.getSharedApplication().getStatusBarOrientation();
return forced && (o == UIInterfaceOrientation.Portrait || o == UIInterfaceOrientation.PortraitUpsideDown);
});
t.add("Please rotate the device to landscape orientation to use the editor.").wrap().grow();
t.add("Rotate the device to landscape orientation to use the editor.").wrap().grow();
});
}));
});