Skip to content

Commit a4c232e

Browse files
vincentneovincentneo
authored
Merge pull request #156 from knorfield/add-storyboard-launch-screen
Convert LaunchScreen.xib to LaunchScreen.storyboard
2 parents b52c33c + be522ee commit a4c232e

File tree

6 files changed

+89
-36
lines changed

6 files changed

+89
-36
lines changed

‎OpenGpxTracker.xcodeproj/project.pbxproj

+18-18
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
0175ABFF23F014C7003323C3 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 0175AC0123F014C7003323C3 /* LaunchScreen.storyboard */; };
1011
120DE71022B274910055C4CB /* GPXSession.swift in Sources */ = {isa = PBXBuildFile; fileRef = 120DE70F22B274910055C4CB /* GPXSession.swift */; };
1112
120DE71122B274A40055C4CB /* GPXSession.swift in Sources */ = {isa = PBXBuildFile; fileRef = 120DE70F22B274910055C4CB /* GPXSession.swift */; };
1213
4588D66B230D23AA009AA75F /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 4588D66D230D23AA009AA75F /* InfoPlist.strings */; };
@@ -21,7 +22,6 @@
2122
898EECE019C49B5800B4B207 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 898EECDF19C49B5800B4B207 /* ViewController.swift */; };
2223
898EECE319C49B5800B4B207 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 898EECE119C49B5800B4B207 /* Main.storyboard */; };
2324
898EECE519C49B5800B4B207 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 898EECE419C49B5800B4B207 /* Images.xcassets */; };
24-
898EECE819C49B5800B4B207 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 898EECE619C49B5800B4B207 /* LaunchScreen.xib */; };
2525
898EECF419C49B5800B4B207 /* OpenGpxTrackerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 898EECF319C49B5800B4B207 /* OpenGpxTrackerTests.swift */; };
2626
898EECFE19C49DC700B4B207 /* MapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 898EECFD19C49DC700B4B207 /* MapKit.framework */; };
2727
898EED0019C4A15E00B4B207 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 898EECFF19C4A15E00B4B207 /* CoreLocation.framework */; };
@@ -136,10 +136,13 @@
136136
/* End PBXCopyFilesBuildPhase section */
137137

138138
/* Begin PBXFileReference section */
139+
0175AC0023F014C7003323C3 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
140+
0175AC0323F014EA003323C3 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/LaunchScreen.strings"; sourceTree = "<group>"; };
141+
0175AC0523F01519003323C3 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/LaunchScreen.strings; sourceTree = "<group>"; };
142+
0175AC0723F01523003323C3 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/LaunchScreen.strings; sourceTree = "<group>"; };
139143
120DE70F22B274910055C4CB /* GPXSession.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GPXSession.swift; sourceTree = "<group>"; };
140144
3C3088B74A230AB1FD234D6F /* Pods_OpenGpxTracker_Watch.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_OpenGpxTracker_Watch.framework; sourceTree = BUILT_PRODUCTS_DIR; };
141145
44E786790A477838358F948C /* Pods-OpenGpxTracker.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OpenGpxTracker.debug.xcconfig"; path = "Pods/Target Support Files/Pods-OpenGpxTracker/Pods-OpenGpxTracker.debug.xcconfig"; sourceTree = "<group>"; };
142-
455F78BD230AA9D6003705F3 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/LaunchScreen.strings; sourceTree = "<group>"; };
143146
455F78BE230AA9D6003705F3 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Main.strings; sourceTree = "<group>"; };
144147
4588D66C230D23AA009AA75F /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/InfoPlist.strings; sourceTree = "<group>"; };
145148
4588D66E230D23AD009AA75F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
@@ -153,7 +156,6 @@
153156
8913CD8D1BDB2477009EC729 /* PreferencesTableViewControllerDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PreferencesTableViewControllerDelegate.swift; sourceTree = "<group>"; };
154157
893BEC8519C7E62200C77354 /* GPXWaypoint+MKAnnotation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "GPXWaypoint+MKAnnotation.swift"; sourceTree = "<group>"; };
155158
895F04B31A7143CE004BEE8A /* GPXExtentCoordinates.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GPXExtentCoordinates.swift; sourceTree = "<group>"; };
156-
898E2BDC23129FDF00DC4E3F /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/LaunchScreen.strings; sourceTree = "<group>"; };
157159
898E2BDD23129FE000DC4E3F /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Main.strings; sourceTree = "<group>"; };
158160
898E2BDE23129FE000DC4E3F /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Interface.strings; sourceTree = "<group>"; };
159161
898E2BDF23129FE000DC4E3F /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Localizable.strings; sourceTree = "<group>"; };
@@ -166,7 +168,6 @@
166168
898EECDF19C49B5800B4B207 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
167169
898EECE219C49B5800B4B207 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
168170
898EECE419C49B5800B4B207 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
169-
898EECE719C49B5800B4B207 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = "<group>"; };
170171
898EECED19C49B5800B4B207 /* OpenGpxTrackerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = OpenGpxTrackerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
171172
898EECF219C49B5800B4B207 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
172173
898EECF319C49B5800B4B207 /* OpenGpxTrackerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenGpxTrackerTests.swift; sourceTree = "<group>"; };
@@ -219,7 +220,6 @@
219220
BF692F6E2209AAFC00F8A0F1 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
220221
BF692F702209AAFC00F8A0F1 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
221222
BFA3CE8122C23B2300A8B965 /* CoreDataAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoreDataAlertView.swift; sourceTree = "<group>"; };
222-
BFF304792312D8A00012D263 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/LaunchScreen.strings"; sourceTree = "<group>"; };
223223
BFF3047A2312D8A00012D263 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Main.strings"; sourceTree = "<group>"; };
224224
BFF3047B2312D8A00012D263 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Interface.strings"; sourceTree = "<group>"; };
225225
BFF3047C2312D8A00012D263 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.strings"; sourceTree = "<group>"; };
@@ -408,7 +408,7 @@
408408
isa = PBXGroup;
409409
children = (
410410
BF1FE1A6230EAB9B00404B59 /* Localizable.strings */,
411-
898EECE619C49B5800B4B207 /* LaunchScreen.xib */,
411+
0175AC0123F014C7003323C3 /* LaunchScreen.storyboard */,
412412
898EECE119C49B5800B4B207 /* Main.storyboard */,
413413
898EECDA19C49B5800B4B207 /* AppDelegate.swift */,
414414
899D678519D354EB00C88A0A /* about.html */,
@@ -619,8 +619,8 @@
619619
BF1FE1A8230EAB9B00404B59 /* Localizable.strings in Resources */,
620620
899D678719D354EB00C88A0A /* about.html in Resources */,
621621
898EECE319C49B5800B4B207 /* Main.storyboard in Resources */,
622-
898EECE819C49B5800B4B207 /* LaunchScreen.xib in Resources */,
623622
898EECE519C49B5800B4B207 /* Images.xcassets in Resources */,
623+
0175ABFF23F014C7003323C3 /* LaunchScreen.storyboard in Resources */,
624624
);
625625
runOnlyForDeploymentPostprocessing = 0;
626626
};
@@ -843,6 +843,17 @@
843843
/* End PBXTargetDependency section */
844844

845845
/* Begin PBXVariantGroup section */
846+
0175AC0123F014C7003323C3 /* LaunchScreen.storyboard */ = {
847+
isa = PBXVariantGroup;
848+
children = (
849+
0175AC0023F014C7003323C3 /* Base */,
850+
0175AC0323F014EA003323C3 /* zh-Hans */,
851+
0175AC0523F01519003323C3 /* de */,
852+
0175AC0723F01523003323C3 /* es */,
853+
);
854+
name = LaunchScreen.storyboard;
855+
sourceTree = "<group>";
856+
};
846857
4588D66D230D23AA009AA75F /* InfoPlist.strings */ = {
847858
isa = PBXVariantGroup;
848859
children = (
@@ -891,17 +902,6 @@
891902
name = Main.storyboard;
892903
sourceTree = "<group>";
893904
};
894-
898EECE619C49B5800B4B207 /* LaunchScreen.xib */ = {
895-
isa = PBXVariantGroup;
896-
children = (
897-
898EECE719C49B5800B4B207 /* Base */,
898-
455F78BD230AA9D6003705F3 /* de */,
899-
898E2BDC23129FDF00DC4E3F /* es */,
900-
BFF304792312D8A00012D263 /* zh-Hans */,
901-
);
902-
name = LaunchScreen.xib;
903-
sourceTree = "<group>";
904-
};
905905
BF1FE1A6230EAB9B00404B59 /* Localizable.strings */ = {
906906
isa = PBXVariantGroup;
907907
children = (

‎OpenGpxTracker/Base.lproj/LaunchScreen.storyboard

+55
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
3+
<device id="retina6_5" orientation="portrait" appearance="light"/>
4+
<dependencies>
5+
<deployment identifier="iOS"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
7+
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
8+
</dependencies>
9+
<scenes>
10+
<!--View Controller-->
11+
<scene sceneID="EHf-IW-A2E">
12+
<objects>
13+
<viewController id="01J-lp-oVM" sceneMemberID="viewController">
14+
<layoutGuides>
15+
<viewControllerLayoutGuide type="top" id="F7k-3Z-aRn"/>
16+
<viewControllerLayoutGuide type="bottom" id="XxK-Sx-dxe"/>
17+
</layoutGuides>
18+
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
19+
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
20+
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
21+
<subviews>
22+
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" insetsLayoutMarginsFromSafeArea="NO" text=" Copyright (c) Juan M. Merlos" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7SI-wk-ECK">
23+
<rect key="frame" x="20" y="821" width="374" height="21"/>
24+
<fontDescription key="fontDescription" type="system" pointSize="17"/>
25+
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.35999999999999999" colorSpace="custom" customColorSpace="sRGB"/>
26+
<nil key="highlightedColor"/>
27+
</label>
28+
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" insetsLayoutMarginsFromSafeArea="NO" text="OPEN GPX TRACKER" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="GJd-Yh-RWb">
29+
<rect key="frame" x="20" y="299" width="374" height="43"/>
30+
<color key="backgroundColor" red="0.33333334329999997" green="0.33333334329999997" blue="0.33333334329999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
31+
<constraints>
32+
<constraint firstAttribute="height" constant="43" id="eZr-kB-Rkx"/>
33+
</constraints>
34+
<fontDescription key="fontDescription" type="boldSystem" pointSize="32"/>
35+
<color key="textColor" red="0.99942404029999998" green="0.98555368190000003" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
36+
<nil key="highlightedColor"/>
37+
</label>
38+
</subviews>
39+
<color key="backgroundColor" red="1" green="1" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
40+
<constraints>
41+
<constraint firstItem="GJd-Yh-RWb" firstAttribute="trailing" secondItem="7SI-wk-ECK" secondAttribute="trailing" id="IWp-sD-PX9"/>
42+
<constraint firstItem="GJd-Yh-RWb" firstAttribute="leading" secondItem="7SI-wk-ECK" secondAttribute="leading" id="SxX-OG-aty"/>
43+
<constraint firstItem="GJd-Yh-RWb" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leadingMargin" id="Ylr-4B-ChJ"/>
44+
<constraint firstItem="XxK-Sx-dxe" firstAttribute="top" secondItem="7SI-wk-ECK" secondAttribute="bottom" constant="20" id="bTx-rs-ihV"/>
45+
<constraint firstItem="GJd-Yh-RWb" firstAttribute="top" secondItem="F7k-3Z-aRn" secondAttribute="bottom" constant="255" id="m6g-g5-DtJ"/>
46+
<constraint firstItem="GJd-Yh-RWb" firstAttribute="trailing" secondItem="Ze5-6b-2t3" secondAttribute="trailingMargin" id="o5n-e7-tt6"/>
47+
</constraints>
48+
</view>
49+
</viewController>
50+
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
51+
</objects>
52+
<point key="canvasLocation" x="50.724637681159422" y="374.33035714285711"/>
53+
</scene>
54+
</scenes>
55+
</document>

‎OpenGpxTracker/Base.lproj/LaunchScreen.xib

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES">
3-
<device id="retina4_7" orientation="portrait">
4-
<adaptation id="fullscreen"/>
5-
</device>
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES">
3+
<device id="retina4_7" orientation="portrait" appearance="light"/>
64
<dependencies>
75
<deployment identifier="iOS"/>
8-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14283.14"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
97
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
108
</dependencies>
119
<objects>
@@ -29,7 +27,7 @@
2927
<color key="highlightedColor" red="0.0" green="0.0" blue="0.0" alpha="0.90000000000000002" colorSpace="custom" customColorSpace="sRGB"/>
3028
</label>
3129
</subviews>
32-
<color key="backgroundColor" red="1" green="1" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
30+
<color key="backgroundColor" red="0.99942404029999998" green="0.98555368190000003" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
3331
<constraints>
3432
<constraint firstItem="kId-c2-rCX" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="bottom" multiplier="1/3" constant="1" id="5cJ-9S-tgC"/>
3533
<constraint firstAttribute="centerX" secondItem="kId-c2-rCX" secondAttribute="centerX" id="Koa-jz-hwk"/>

‎OpenGpxTracker/de.lproj/LaunchScreen.strings

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

2-
/* Class = "UILabel"; text = " Copyright (c) Juan M. Merlos"; ObjectID = "8ie-xW-0ye"; */
3-
"8ie-xW-0ye.text" = " Copyright (c) Juan M. Merlos";
2+
/* Class = "UILabel"; text = "OPEN GPX TRACKER"; ObjectID = "GJd-Yh-RWb"; */
3+
"GJd-Yh-RWb.text" = "OPEN GPX TRACKER";
44

5-
/* Class = "UILabel"; text = "OPEN GPX TRACKER"; ObjectID = "kId-c2-rCX"; */
6-
"kId-c2-rCX.text" = "OPEN GPX TRACKER";
5+
/* Class = "UILabel"; text = "Things"; ObjectID = "WFR-OC-9dl"; */
6+
"WFR-OC-9dl.text" = "Things";

‎OpenGpxTracker/es.lproj/LaunchScreen.strings

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

2-
/* Class = "UILabel"; text = " Copyright (c) Juan M. Merlos"; ObjectID = "8ie-xW-0ye"; */
3-
"8ie-xW-0ye.text" = " Copyright (c) Juan M. Merlos";
2+
/* Class = "UILabel"; text = "OPEN GPX TRACKER"; ObjectID = "GJd-Yh-RWb"; */
3+
"GJd-Yh-RWb.text" = "OPEN GPX TRACKER";
44

5-
/* Class = "UILabel"; text = "OPEN GPX TRACKER"; ObjectID = "kId-c2-rCX"; */
6-
"kId-c2-rCX.text" = "OPEN GPX TRACKER";
5+
/* Class = "UILabel"; text = "Things"; ObjectID = "WFR-OC-9dl"; */
6+
"WFR-OC-9dl.text" = "Things";

‎OpenGpxTracker/zh-Hans.lproj/LaunchScreen.strings

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

2-
/* Class = "UILabel"; text = " Copyright (c) Juan M. Merlos"; ObjectID = "8ie-xW-0ye"; */
3-
"8ie-xW-0ye.text" = " Copyright (c) Juan M. Merlos";
2+
/* Class = "UILabel"; text = "OPEN GPX TRACKER"; ObjectID = "GJd-Yh-RWb"; */
3+
"GJd-Yh-RWb.text" = "OPEN GPX TRACKER";
44

5-
/* Class = "UILabel"; text = "OPEN GPX TRACKER"; ObjectID = "kId-c2-rCX"; */
6-
"kId-c2-rCX.text" = "OPEN GPX TRACKER";
5+
/* Class = "UILabel"; text = "Things"; ObjectID = "WFR-OC-9dl"; */
6+
"WFR-OC-9dl.text" = "Things";

0 commit comments

Comments
 (0)