diff options
author | Mikkel Krautz <mikkel@krautz.dk> | 2017-08-27 23:19:55 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-27 23:19:55 +0300 |
commit | d7a85521a8f3d32262dc50b6f4cf102cfa971aed (patch) | |
tree | 81323e2351bd3435e4a09c3bfb1a3708ddc5b3ad | |
parent | 7e5f406e932e2f950a119399dde08a8e869305a4 (diff) | |
parent | 926292021ae0941ecd1e7a62aa6aeb2781fddc20 (diff) |
Merge PR #108: Add .xib-based launch screen
-rwxr-xr-x | Mumble.xcodeproj/project.pbxproj | 4 | ||||
-rw-r--r-- | Source/Classes/LaunchScreen.storyboard | 75 | ||||
-rw-r--r-- | Source/Info.plist | 2 |
3 files changed, 81 insertions, 0 deletions
diff --git a/Mumble.xcodeproj/project.pbxproj b/Mumble.xcodeproj/project.pbxproj index 7915a97..80730f9 100755 --- a/Mumble.xcodeproj/project.pbxproj +++ b/Mumble.xcodeproj/project.pbxproj @@ -112,6 +112,7 @@ 28A2AEC114788BE300F3B83F /* MUColor.m in Sources */ = {isa = PBXBuildFile; fileRef = 28A2AEC014788BE300F3B83F /* MUColor.m */; }; 28AD733F0D9D9553002E5188 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 28AD733E0D9D9553002E5188 /* MainWindow.xib */; }; 28ADA303148A3E3B00C55E51 /* MUAudioQualityPreferencesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 28ADA302148A3E3B00C55E51 /* MUAudioQualityPreferencesViewController.m */; }; + 28B034961F5354C3008E51C7 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 28B034951F5354C3008E51C7 /* LaunchScreen.storyboard */; }; 28BE998018CFA83800910551 /* BlackToolbarPatterniOS7@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 28BE997F18CFA83800910551 /* BlackToolbarPatterniOS7@2x.png */; }; 28BE998218CFA8B900910551 /* BlackToolbarPatterniOS7.png in Resources */ = {isa = PBXBuildFile; fileRef = 28BE998118CFA8B900910551 /* BlackToolbarPatterniOS7.png */; }; 28BE998518CFB96A00910551 /* MUHorizontalFlipTransitionDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 28BE998418CFB96A00910551 /* MUHorizontalFlipTransitionDelegate.m */; }; @@ -376,6 +377,7 @@ 28AD733E0D9D9553002E5188 /* MainWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = MainWindow.xib; path = ../MainWindow.xib; sourceTree = "<group>"; }; 28ADA301148A3E3B00C55E51 /* MUAudioQualityPreferencesViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MUAudioQualityPreferencesViewController.h; sourceTree = "<group>"; }; 28ADA302148A3E3B00C55E51 /* MUAudioQualityPreferencesViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MUAudioQualityPreferencesViewController.m; sourceTree = "<group>"; }; + 28B034951F5354C3008E51C7 /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = "<group>"; }; 28BE997F18CFA83800910551 /* BlackToolbarPatterniOS7@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "BlackToolbarPatterniOS7@2x.png"; path = "Resources/BlackToolbarPatterniOS7@2x.png"; sourceTree = "<group>"; }; 28BE998118CFA8B900910551 /* BlackToolbarPatterniOS7.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = BlackToolbarPatterniOS7.png; path = Resources/BlackToolbarPatterniOS7.png; sourceTree = "<group>"; }; 28BE998318CFB96A00910551 /* MUHorizontalFlipTransitionDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MUHorizontalFlipTransitionDelegate.h; sourceTree = "<group>"; }; @@ -520,6 +522,7 @@ 2838EA0C1293165700035C5D /* Preferences */, 28AD733E0D9D9553002E5188 /* MainWindow.xib */, 286A3CAE158CEB5A00C817D1 /* MainWindow~iPad.xib */, + 28B034951F5354C3008E51C7 /* LaunchScreen.storyboard */, 2882857B18CE39B40034F319 /* MUOperatingSystem.h */, 2882857C18CE39B40034F319 /* MUOperatingSystem.m */, 2861C25D116BE905002B8514 /* MUApplicationDelegate.h */, @@ -1120,6 +1123,7 @@ 28BE999A18CFED9A00910551 /* Balloon_2_Right@2x.png in Resources */, 2879528514C2687D00567430 /* Balloon_Blue@2x.png in Resources */, 2879528A14C3874C00567430 /* LeftBalloonSelected.png in Resources */, + 28B034961F5354C3008E51C7 /* LaunchScreen.storyboard in Resources */, 2879528B14C3874C00567430 /* LeftBalloonSelected@2x.png in Resources */, 2879528C14C3874C00567430 /* RightBalloonSelected.png in Resources */, 2879528D14C3874C00567430 /* RightBalloonSelected@2x.png in Resources */, diff --git a/Source/Classes/LaunchScreen.storyboard b/Source/Classes/LaunchScreen.storyboard new file mode 100644 index 0000000..560b85e --- /dev/null +++ b/Source/Classes/LaunchScreen.storyboard @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11542" systemVersion="16D32" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="ZhA-oE-R7j"> + <device id="retina4_7" orientation="portrait"> + <adaptation id="fullscreen"/> + </device> + <dependencies> + <deployment identifier="iOS"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11524"/> + <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> + </dependencies> + <scenes> + <!--Root View Controller--> + <scene sceneID="87X-Tz-1bt"> + <objects> + <navigationController title="Root View Controller" id="ZhA-oE-R7j" sceneMemberID="viewController"> + <simulatedNavigationBarMetrics key="simulatedTopBarMetrics" translucent="NO" prompted="NO"/> + <navigationBar key="navigationBar" contentMode="scaleToFill" misplaced="YES" barStyle="black" translucent="NO" id="Q0J-3S-9rV"> + <rect key="frame" x="0.0" y="0.0" width="375" height="44"/> + <autoresizingMask key="autoresizingMask"/> + <color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/> + </navigationBar> + <toolbar key="toolbar" opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="LfF-u6-Sck"> + <rect key="frame" x="0.0" y="623" width="375" height="44"/> + <autoresizingMask key="autoresizingMask"/> + </toolbar> + <connections> + <segue destination="01J-lp-oVM" kind="relationship" relationship="rootViewController" id="k6H-4y-oDs"/> + </connections> + </navigationController> + <placeholder placeholderIdentifier="IBFirstResponder" id="HOq-ti-gqm" userLabel="First Responder" sceneMemberID="firstResponder"/> + </objects> + <point key="canvasLocation" x="-1562" y="419"/> + </scene> + <!--Mumble--> + <scene sceneID="EHf-IW-A2E"> + <objects> + <viewController title="Mumble" id="01J-lp-oVM" sceneMemberID="viewController"> + <layoutGuides> + <viewControllerLayoutGuide type="top" id="Llm-lL-Icb"/> + <viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/> + </layoutGuides> + <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3"> + <rect key="frame" x="0.0" y="64" width="375" height="603"/> + <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> + <subviews> + <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="obG-Y5-kRd"> + <rect key="frame" x="20" y="583" width="335" height="0.0"/> + <fontDescription key="fontDescription" type="system" pointSize="17"/> + <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> + <nil key="highlightedColor"/> + </label> + <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="WelcomeScreenIcon" translatesAutoresizingMaskIntoConstraints="NO" id="hok-U1-muZ"> + <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> + <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> + </imageView> + </subviews> + <color key="backgroundColor" red="0.10980392156862745" green="0.10980392156862745" blue="0.10980392156862745" alpha="1" colorSpace="calibratedRGB"/> + <constraints> + <constraint firstAttribute="centerX" secondItem="obG-Y5-kRd" secondAttribute="centerX" id="5cz-MP-9tL"/> + <constraint firstItem="obG-Y5-kRd" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" constant="20" symbolic="YES" id="SfN-ll-jLj"/> + <constraint firstAttribute="bottom" secondItem="obG-Y5-kRd" secondAttribute="bottom" constant="20" id="Y44-ml-fuU"/> + </constraints> + </view> + <navigationItem key="navigationItem" title="Mumble" id="vdx-n0-PWB"/> + <simulatedNavigationBarMetrics key="simulatedTopBarMetrics" translucent="NO" prompted="NO"/> + </viewController> + <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/> + </objects> + <point key="canvasLocation" x="-727" y="419"/> + </scene> + </scenes> + <resources> + <image name="WelcomeScreenIcon" width="16" height="16"/> + </resources> +</document> diff --git a/Source/Info.plist b/Source/Info.plist index e839f77..3f2b906 100644 --- a/Source/Info.plist +++ b/Source/Info.plist @@ -96,6 +96,8 @@ <string>{320, 568}</string> </dict> </array> + <key>UILaunchStoryboardName</key> + <string>LaunchScreen</string> <key>UIPrerenderedIcon</key> <true/> <key>UIStatusBarStyle</key> |