for iPhone X

iTofu · Oct 10, 2017 · 960a5a7 · 960a5a7
1 parent dea5e88
commit 960a5a7
Show file tree

Hide file tree

Showing 14 changed files with 378 additions and 280 deletions.
diff --git a/Demo/LCActionSheetDemo/Base.lproj/Main.storyboard b/Demo/LCActionSheetDemo/Base.lproj/Main.storyboard
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12118" systemVersion="16E195" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="fnb-B0-0i1">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="fnb-B0-0i1">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12086"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -74,7 +74,7 @@
                             <constraint firstAttribute="trailing" secondItem="kT3-kg-cxE" secondAttribute="trailing" constant="15" id="KvB-BY-CTc"/>
                             <constraint firstItem="0nt-03-dUh" firstAttribute="leading" secondItem="8bC-Xf-vdC" secondAttribute="leading" constant="15" id="Odj-ER-b44"/>
                             <constraint firstAttribute="trailing" secondItem="M7K-vo-zgu" secondAttribute="trailing" id="Q4B-y3-YYp"/>
-                            <constraint firstItem="wfy-db-euE" firstAttribute="top" secondItem="M7K-vo-zgu" secondAttribute="bottom" id="bMV-S9-VIW"/>
+                            <constraint firstAttribute="bottom" secondItem="M7K-vo-zgu" secondAttribute="bottom" id="gxq-sR-bca"/>
                             <constraint firstItem="hdE-3Z-g4X" firstAttribute="centerX" secondItem="8bC-Xf-vdC" secondAttribute="centerX" id="iFy-hv-5b2"/>
                             <constraint firstAttribute="trailing" secondItem="0nt-03-dUh" secondAttribute="trailing" constant="15" id="jXv-JF-JMa"/>
                             <constraint firstItem="kT3-kg-cxE" firstAttribute="centerY" secondItem="8bC-Xf-vdC" secondAttribute="centerY" constant="100" id="m0r-kc-BPb"/>
@@ -96,7 +96,7 @@
                 <navigationController automaticallyAdjustsScrollViewInsets="NO" id="fnb-B0-0i1" sceneMemberID="viewController">
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="G14-s3-bIn">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
+                        <rect key="frame" x="0.0" y="20" width="375" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <nil name="viewControllers"/>

diff --git a/Demo/LCActionSheetDemo/Info.plist b/Demo/LCActionSheetDemo/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.3.0</string>
+	<string>3.3.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/Demo/LCActionSheetDemo/ViewController.m b/Demo/LCActionSheetDemo/ViewController.m
@@ -8,6 +8,7 @@
 
 #import "ViewController.h"
 #import <LCActionSheet/LCActionSheet.h>
+#import <LCActionSheet/UIDevice+LCActionSheet.h>
 #import <Masonry/Masonry.h>
 
 #define KEY_WINDOW  [UIApplication sharedApplication].keyWindow
@@ -51,7 +52,7 @@ - (void)viewDidLoad {
     [textField mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.equalTo(self.view).offset(10.0);
         make.right.equalTo(self.view).offset(-10.0);
-        make.top.equalTo(self.view).offset(30.0);
+        make.top.equalTo(self.view).offset(30.0 + ([[UIDevice currentDevice] lc_isX] ? 14.0 : 0));
         make.height.offset(44.0);
     }];
 }

diff --git a/Demo/Podfile.lock b/Demo/Podfile.lock
@@ -1,5 +1,5 @@
 PODS:
-  - LCActionSheet (3.3.0):
+  - LCActionSheet (3.3.1):
     - Masonry (~> 1.1.0)
   - Masonry (1.1.0)
 
@@ -11,7 +11,7 @@ EXTERNAL SOURCES:
     :path: ../
 
 SPEC CHECKSUMS:
-  LCActionSheet: 6d0bd1988bf589f6944720f9a021b07c3ec1ac2a
+  LCActionSheet: c3b4c9029aef65b33e4d89ef371da95787a1fd3b
   Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
 
 PODFILE CHECKSUM: 69168bdd948b94bccadca73ee1fc5a6830365fc0

diff --git a/Demo/Pods/Headers/Private/LCActionSheet/UIDevice+LCActionSheet.h b/Demo/Pods/Headers/Private/LCActionSheet/UIDevice+LCActionSheet.h
diff --git a/Demo/Pods/Headers/Public/LCActionSheet/UIDevice+LCActionSheet.h b/Demo/Pods/Headers/Public/LCActionSheet/UIDevice+LCActionSheet.h
diff --git a/Demo/Pods/Local Podspecs/LCActionSheet.podspec.json b/Demo/Pods/Local Podspecs/LCActionSheet.podspec.json
diff --git a/Demo/Pods/Manifest.lock b/Demo/Pods/Manifest.lock