Skip to content

Commit add57d8

Browse files
LcTwiskLcTwisk
committed
Respect safe area for iPhone X compatibility
1 parent d802593 commit add57d8

File tree

5 files changed

+39
-27
lines changed

5 files changed

+39
-27
lines changed

Diff for: ‎Example/Info.plist

+2
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,7 @@
2424
<string>LaunchScreen</string>
2525
<key>UIMainStoryboardFile</key>
2626
<string>Main</string>
27+
<key>UIViewControllerBasedStatusBarAppearance</key>
28+
<false/>
2729
</dict>
2830
</plist>

Diff for: ‎Example/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json

+5
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,11 @@
8484
"idiom" : "ipad",
8585
"size" : "83.5x83.5",
8686
"scale" : "2x"
87+
},
88+
{
89+
"idiom" : "ios-marketing",
90+
"size" : "1024x1024",
91+
"scale" : "1x"
8792
}
8893
],
8994
"info" : {

Diff for: ‎ImageViewer/Info.plist

+4
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,11 @@
2424
<string>LaunchScreen</string>
2525
<key>UIMainStoryboardFile</key>
2626
<string>Main</string>
27+
<key>UIStatusBarStyle</key>
28+
<string>UIStatusBarStyleLightContent</string>
2729
<key>UISupportedInterfaceOrientations</key>
2830
<array/>
31+
<key>UIViewControllerBasedStatusBarAppearance</key>
32+
<false/>
2933
</dict>
3034
</plist>

Diff for: ‎ImageViewer/Resources/ImageViewerController.xib

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12120" systemVersion="16E195" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
33
<device id="retina4_7" orientation="portrait">
44
<adaptation id="fullscreen"/>
55
</device>
66
<dependencies>
77
<deployment identifier="iOS"/>
8-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12088"/>
8+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
9+
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
910
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
1011
</dependencies>
1112
<objects>
@@ -22,7 +23,7 @@
2223
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
2324
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
2425
<subviews>
25-
<scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" maximumZoomScale="6" translatesAutoresizingMaskIntoConstraints="NO" id="cQD-2Q-pvo">
26+
<scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" contentInsetAdjustmentBehavior="never" maximumZoomScale="6" translatesAutoresizingMaskIntoConstraints="NO" id="cQD-2Q-pvo">
2627
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
2728
<subviews>
2829
<imageView contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="rHA-5m-kkS">
@@ -44,7 +45,7 @@
4445
<rect key="frame" x="169" y="315" width="37" height="37"/>
4546
</activityIndicatorView>
4647
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Wsy-fe-raz">
47-
<rect key="frame" x="0.0" y="0.0" width="44" height="44"/>
48+
<rect key="frame" x="0.0" y="20" width="44" height="44"/>
4849
<constraints>
4950
<constraint firstAttribute="height" constant="44" id="bXU-O2-lam"/>
5051
<constraint firstAttribute="width" constant="44" id="xTg-TJ-eL3"/>
@@ -62,12 +63,12 @@
6263
<constraint firstItem="oPl-2f-Knx" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="centerY" id="4hr-Ua-OMa"/>
6364
<constraint firstItem="cQD-2Q-pvo" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="ErM-q5-uey"/>
6465
<constraint firstItem="Wsy-fe-raz" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="GNz-6j-kdf"/>
66+
<constraint firstItem="Wsy-fe-raz" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="topMargin" id="Tze-CU-2Ab"/>
6567
<constraint firstItem="rHA-5m-kkS" firstAttribute="width" secondItem="iN0-l3-epB" secondAttribute="width" id="Zh5-4A-UbJ"/>
6668
<constraint firstAttribute="trailing" secondItem="cQD-2Q-pvo" secondAttribute="trailing" id="fiR-iH-AGe"/>
6769
<constraint firstAttribute="bottom" secondItem="cQD-2Q-pvo" secondAttribute="bottom" id="kQk-Ie-iGl"/>
6870
<constraint firstItem="oPl-2f-Knx" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="lBh-77-nAV"/>
6971
<constraint firstItem="cQD-2Q-pvo" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="lTy-Fb-3fn"/>
70-
<constraint firstItem="Wsy-fe-raz" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="roJ-BN-i6e"/>
7172
<constraint firstItem="rHA-5m-kkS" firstAttribute="height" secondItem="iN0-l3-epB" secondAttribute="height" id="tGF-Ia-4A0"/>
7273
</constraints>
7374
<point key="canvasLocation" x="33.5" y="54.5"/>

Diff for: ‎SimpleImageViewer.xcodeproj/project.pbxproj

+22-22
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
A07E76D71ECC94A400B77D46 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = A07E76D61ECC94A400B77D46 /* AppDelegate.swift */; };
1717
A07E76D91ECC94A400B77D46 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A07E76D81ECC94A400B77D46 /* ViewController.swift */; };
1818
A07E76DE1ECC94A400B77D46 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A07E76DD1ECC94A400B77D46 /* Assets.xcassets */; };
19-
A07E76E11ECC94A400B77D46 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A07E76DF1ECC94A400B77D46 /* LaunchScreen.storyboard */; };
2019
A07E77171ECE0F3500B77D46 /* ImageCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A07E77161ECE0F3500B77D46 /* ImageCell.swift */; };
2120
A08B781D1EF1684600F8C5BC /* ImageViewerDismissalInteractor.swift in Sources */ = {isa = PBXBuildFile; fileRef = A08B781B1EF1674200F8C5BC /* ImageViewerDismissalInteractor.swift */; };
2221
A0BF70AB1EDC5B1400109F6E /* ImageViewer.h in Headers */ = {isa = PBXBuildFile; fileRef = A0BF70A91EDC5B1400109F6E /* ImageViewer.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -71,7 +70,6 @@
7170
A07E76D81ECC94A400B77D46 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
7271
A07E76DB1ECC94A400B77D46 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
7372
A07E76DD1ECC94A400B77D46 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
74-
A07E76E01ECC94A400B77D46 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
7573
A07E76EB1ECC94EA00B77D46 /* ImageViewerController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageViewerController.swift; sourceTree = "<group>"; };
7674
A07E76ED1ECC959700B77D46 /* ImageViewerController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = ImageViewerController.xib; path = Resources/ImageViewerController.xib; sourceTree = "<group>"; };
7775
A07E77161ECE0F3500B77D46 /* ImageCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageCell.swift; sourceTree = "<group>"; };
@@ -126,7 +124,6 @@
126124
isa = PBXGroup;
127125
children = (
128126
A07E76DD1ECC94A400B77D46 /* Assets.xcassets */,
129-
A07E76DF1ECC94A400B77D46 /* LaunchScreen.storyboard */,
130127
A07E76DA1ECC94A400B77D46 /* Main.storyboard */,
131128
);
132129
path = Resources;
@@ -285,7 +282,7 @@
285282
isa = PBXProject;
286283
attributes = {
287284
LastSwiftUpdateCheck = 0830;
288-
LastUpgradeCheck = 0830;
285+
LastUpgradeCheck = 0900;
289286
ORGANIZATIONNAME = aFrogleap;
290287
TargetAttributes = {
291288
A02EE5D31EF1897D000EAB41 = {
@@ -295,7 +292,7 @@
295292
};
296293
A07E76D21ECC94A400B77D46 = {
297294
CreatedOnToolsVersion = 8.3.2;
298-
DevelopmentTeam = WQEYNHG5C2;
295+
DevelopmentTeam = 44MAY72KU6;
299296
LastSwiftMigration = 0900;
300297
ProvisioningStyle = Manual;
301298
};
@@ -340,7 +337,6 @@
340337
files = (
341338
A02EE5B91EF16E54000EAB41 /* Info.plist in Resources */,
342339
A0BF70B91EDC759A00109F6E /* Main.storyboard in Resources */,
343-
A07E76E11ECC94A400B77D46 /* LaunchScreen.storyboard in Resources */,
344340
A07E76DE1ECC94A400B77D46 /* Assets.xcassets in Resources */,
345341
);
346342
runOnlyForDeploymentPostprocessing = 0;
@@ -412,15 +408,6 @@
412408
path = .;
413409
sourceTree = "<group>";
414410
};
415-
A07E76DF1ECC94A400B77D46 /* LaunchScreen.storyboard */ = {
416-
isa = PBXVariantGroup;
417-
children = (
418-
A07E76E01ECC94A400B77D46 /* Base */,
419-
);
420-
name = LaunchScreen.storyboard;
421-
path = .;
422-
sourceTree = "<group>";
423-
};
424411
/* End PBXVariantGroup section */
425412

426413
/* Begin XCBuildConfiguration section */
@@ -458,15 +445,21 @@
458445
CLANG_CXX_LIBRARY = "libc++";
459446
CLANG_ENABLE_MODULES = YES;
460447
CLANG_ENABLE_OBJC_ARC = YES;
448+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
461449
CLANG_WARN_BOOL_CONVERSION = YES;
450+
CLANG_WARN_COMMA = YES;
462451
CLANG_WARN_CONSTANT_CONVERSION = YES;
463452
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
464453
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
465454
CLANG_WARN_EMPTY_BODY = YES;
466455
CLANG_WARN_ENUM_CONVERSION = YES;
467456
CLANG_WARN_INFINITE_RECURSION = YES;
468457
CLANG_WARN_INT_CONVERSION = YES;
458+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
459+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
469460
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
461+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
462+
CLANG_WARN_STRICT_PROTOTYPES = YES;
470463
CLANG_WARN_SUSPICIOUS_MOVE = YES;
471464
CLANG_WARN_UNREACHABLE_CODE = YES;
472465
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -509,15 +502,21 @@
509502
CLANG_CXX_LIBRARY = "libc++";
510503
CLANG_ENABLE_MODULES = YES;
511504
CLANG_ENABLE_OBJC_ARC = YES;
505+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
512506
CLANG_WARN_BOOL_CONVERSION = YES;
507+
CLANG_WARN_COMMA = YES;
513508
CLANG_WARN_CONSTANT_CONVERSION = YES;
514509
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
515510
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
516511
CLANG_WARN_EMPTY_BODY = YES;
517512
CLANG_WARN_ENUM_CONVERSION = YES;
518513
CLANG_WARN_INFINITE_RECURSION = YES;
519514
CLANG_WARN_INT_CONVERSION = YES;
515+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
516+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
520517
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
518+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
519+
CLANG_WARN_STRICT_PROTOTYPES = YES;
521520
CLANG_WARN_SUSPICIOUS_MOVE = YES;
522521
CLANG_WARN_UNREACHABLE_CODE = YES;
523522
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -548,15 +547,16 @@
548547
buildSettings = {
549548
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
550549
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
551-
DEVELOPMENT_TEAM = WQEYNHG5C2;
550+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
551+
DEVELOPMENT_TEAM = 44MAY72KU6;
552552
INFOPLIST_FILE = "$(SRCROOT)/ImageViewer/Info.plist";
553553
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
554554
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
555555
PRODUCT_BUNDLE_IDENTIFIER = com.afrogleapbv.inhouse.swift.imageviewer;
556556
PRODUCT_NAME = "$(TARGET_NAME)";
557-
PROVISIONING_PROFILE = "231c2846-7859-47ba-9e7e-71eb04889210";
558-
PROVISIONING_PROFILE_SPECIFIER = "AFL Development";
559-
SWIFT_SWIFT3_OBJC_INFERENCE = On;
557+
PROVISIONING_PROFILE = "d5b8f7cb-0120-427a-9ff1-14d28ee0046f";
558+
PROVISIONING_PROFILE_SPECIFIER = "aFrogleap Wildcard Development";
559+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
560560
SWIFT_VERSION = 4.0;
561561
};
562562
name = Debug;
@@ -573,7 +573,7 @@
573573
PRODUCT_BUNDLE_IDENTIFIER = com.afrogleapbv.inhouse.swift.imageviewer;
574574
PRODUCT_NAME = "$(TARGET_NAME)";
575575
PROVISIONING_PROFILE_SPECIFIER = "";
576-
SWIFT_SWIFT3_OBJC_INFERENCE = On;
576+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
577577
SWIFT_VERSION = 4.0;
578578
};
579579
name = Release;
@@ -596,7 +596,7 @@
596596
PRODUCT_NAME = "$(TARGET_NAME)";
597597
PROVISIONING_PROFILE_SPECIFIER = "";
598598
SKIP_INSTALL = YES;
599-
SWIFT_SWIFT3_OBJC_INFERENCE = On;
599+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
600600
SWIFT_VERSION = 4.0;
601601
VERSIONING_SYSTEM = "apple-generic";
602602
VERSION_INFO_PREFIX = "";
@@ -621,7 +621,7 @@
621621
PRODUCT_NAME = "$(TARGET_NAME)";
622622
PROVISIONING_PROFILE_SPECIFIER = "";
623623
SKIP_INSTALL = YES;
624-
SWIFT_SWIFT3_OBJC_INFERENCE = On;
624+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
625625
SWIFT_VERSION = 4.0;
626626
VERSIONING_SYSTEM = "apple-generic";
627627
VERSION_INFO_PREFIX = "";

0 commit comments

Comments
 (0)