Skip to content
This repository was archived by the owner on Jul 1, 2022. It is now read-only.

Commit a5160a5

Browse files
Fixes for example project to use safe area insets as well as supporing iPhone X properly
1 parent c19d71b commit a5160a5

File tree

13 files changed

+102
-63
lines changed

13 files changed

+102
-63
lines changed

ALCameraViewController.xcodeproj/project.pbxproj

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
/* Begin PBXBuildFile section */
1010
1F3C56291F701CA7009667E9 /* CroppingParameters.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7AC96FA11F5B5166003E53F4 /* CroppingParameters.swift */; };
1111
7AC96FA21F5B5166003E53F4 /* CroppingParameters.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7AC96FA11F5B5166003E53F4 /* CroppingParameters.swift */; };
12+
7C6AF41F1FB340CA006CB4ED /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7C6AF41E1FB340CA006CB4ED /* LaunchScreen.xib */; };
1213
C40665441C73A47C00EB9751 /* SingleImageSaver.swift in Sources */ = {isa = PBXBuildFile; fileRef = C40665431C73A47C00EB9751 /* SingleImageSaver.swift */; };
1314
C40665461C73A94100EB9751 /* CameraGlobals.swift in Sources */ = {isa = PBXBuildFile; fileRef = C40665451C73A94100EB9751 /* CameraGlobals.swift */; };
1415
C40665481C73B72D00EB9751 /* SingleImageFetcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = C40665471C73B72D00EB9751 /* SingleImageFetcher.swift */; };
@@ -61,6 +62,7 @@
6162

6263
/* Begin PBXFileReference section */
6364
7AC96FA11F5B5166003E53F4 /* CroppingParameters.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CroppingParameters.swift; sourceTree = "<group>"; };
65+
7C6AF41E1FB340CA006CB4ED /* LaunchScreen.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = LaunchScreen.xib; sourceTree = "<group>"; };
6466
C40665431C73A47C00EB9751 /* SingleImageSaver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SingleImageSaver.swift; sourceTree = "<group>"; };
6567
C40665451C73A94100EB9751 /* CameraGlobals.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CameraGlobals.swift; sourceTree = "<group>"; };
6668
C40665471C73B72D00EB9751 /* SingleImageFetcher.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SingleImageFetcher.swift; sourceTree = "<group>"; };
@@ -196,6 +198,7 @@
196198
FAF058421B31618D008E5592 /* Supporting Files */ = {
197199
isa = PBXGroup;
198200
children = (
201+
7C6AF41E1FB340CA006CB4ED /* LaunchScreen.xib */,
199202
FAF0584B1B31618D008E5592 /* Images.xcassets */,
200203
FAF058431B31618D008E5592 /* Info.plist */,
201204
);
@@ -322,6 +325,7 @@
322325
files = (
323326
FA52EE0B1B44129B00E16B6F /* ViewController.xib in Resources */,
324327
FA8231381B3BF8F700A837BE /* CameraView.strings in Resources */,
328+
7C6AF41F1FB340CA006CB4ED /* LaunchScreen.xib in Resources */,
325329
FA5FA3451B3AFEB300497C62 /* CameraViewAssets.xcassets in Resources */,
326330
FAF0584C1B31618D008E5592 /* Images.xcassets in Resources */,
327331
FA778A411B8319D8005807E7 /* image.jpg in Resources */,
@@ -543,11 +547,10 @@
543547
isa = XCBuildConfiguration;
544548
buildSettings = {
545549
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
546-
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
547550
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
548551
DEVELOPMENT_TEAM = 2466624KEK;
549552
INFOPLIST_FILE = "Example/Supporting Files/Info.plist";
550-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
553+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
551554
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
552555
PRODUCT_BUNDLE_IDENTIFIER = com.alx.zero.CameraViewController;
553556
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -560,11 +563,10 @@
560563
isa = XCBuildConfiguration;
561564
buildSettings = {
562565
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
563-
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
564566
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
565567
DEVELOPMENT_TEAM = 2466624KEK;
566568
INFOPLIST_FILE = "Example/Supporting Files/Info.plist";
567-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
569+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
568570
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
569571
PRODUCT_BUNDLE_IDENTIFIER = com.alx.zero.CameraViewController;
570572
PRODUCT_NAME = "$(TARGET_NAME)";

Example/Supporting Files/Images.xcassets/AppIcon.appiconset/Contents.json

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
{
22
"images" : [
3+
{
4+
"idiom" : "iphone",
5+
"size" : "20x20",
6+
"scale" : "2x"
7+
},
8+
{
9+
"idiom" : "iphone",
10+
"size" : "20x20",
11+
"scale" : "3x"
12+
},
313
{
414
"size" : "29x29",
515
"idiom" : "iphone",
@@ -25,8 +35,8 @@
2535
"scale" : "3x"
2636
},
2737
{
28-
"idiom" : "iphone",
2938
"size" : "60x60",
39+
"idiom" : "iphone",
3040
"filename" : "icon@120.png",
3141
"scale" : "2x"
3242
},
@@ -35,10 +45,15 @@
3545
"idiom" : "iphone",
3646
"filename" : "icon@180.png",
3747
"scale" : "3x"
48+
},
49+
{
50+
"idiom" : "ios-marketing",
51+
"size" : "1024x1024",
52+
"scale" : "1x"
3853
}
3954
],
4055
"info" : {
4156
"version" : 1,
4257
"author" : "xcode"
4358
}
44-
}
59+
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"info" : {
3+
"version" : 1,
4+
"author" : "xcode"
5+
}
6+
}
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"scale" : "1x"
6+
},
7+
{
8+
"idiom" : "universal",
9+
"filename" : "icon@180.png",
10+
"scale" : "2x"
11+
},
12+
{
13+
"idiom" : "universal",
14+
"scale" : "3x"
15+
}
16+
],
17+
"info" : {
18+
"version" : 1,
19+
"author" : "xcode"
20+
}
21+
}
5.08 KB
Loading

Example/Supporting Files/Images.xcassets/LaunchImage.launchimage/Contents.json

Lines changed: 0 additions & 43 deletions
This file was deleted.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)