Skip to content

Commit 1bdf200

Browse files
committed
1. Removed placeHolderLeftMargin attribute. Use textView.textContainer.lineFragmentPadding instead.
2. All 3 examples now support iPhoneX.
1 parent 994aa53 commit 1bdf200

10 files changed

Lines changed: 160 additions & 135 deletions

File tree

Example/GrowingTextView.xcodeproj/project.pbxproj

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
607FACE01AFB9204008FA782 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 607FACDE1AFB9204008FA782 /* LaunchScreen.xib */; };
1616
607FACEC1AFB9204008FA782 /* Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607FACEB1AFB9204008FA782 /* Tests.swift */; };
1717
9F77765A1F2CD24600D984BD /* Example3.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F7776591F2CD24600D984BD /* Example3.swift */; };
18+
9FE995421FE64DB00040D091 /* MainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FE995411FE64DB00040D091 /* MainViewController.swift */; };
1819
A2C291FF1CD5335036A7799C /* Pods_GrowingTextView_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6901721E071F59387C8307F5 /* Pods_GrowingTextView_Example.framework */; };
1920
E8F6685B1E7A2374008DC918 /* Example2.swift in Sources */ = {isa = PBXBuildFile; fileRef = E8F6685A1E7A2374008DC918 /* Example2.swift */; };
2021
/* End PBXBuildFile section */
@@ -48,6 +49,7 @@
4849
82A00AE736E8DB33E4C51BCF /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = "<group>"; };
4950
99E7D461BB194BB44BEA6391 /* Pods-GrowingTextView_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GrowingTextView_Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-GrowingTextView_Tests/Pods-GrowingTextView_Tests.debug.xcconfig"; sourceTree = "<group>"; };
5051
9F7776591F2CD24600D984BD /* Example3.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Example3.swift; sourceTree = "<group>"; };
52+
9FE995411FE64DB00040D091 /* MainViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainViewController.swift; sourceTree = "<group>"; };
5153
B0107F8A265D1912F5F00A58 /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = "<group>"; };
5254
E1CD2345DF65C90D2105BD90 /* GrowingTextView.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = GrowingTextView.podspec; path = ../GrowingTextView.podspec; sourceTree = "<group>"; };
5355
E8F6685A1E7A2374008DC918 /* Example2.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Example2.swift; sourceTree = "<group>"; };
@@ -101,6 +103,7 @@
101103
607FACD71AFB9204008FA782 /* Example1.swift */,
102104
E8F6685A1E7A2374008DC918 /* Example2.swift */,
103105
9F7776591F2CD24600D984BD /* Example3.swift */,
106+
9FE995411FE64DB00040D091 /* MainViewController.swift */,
104107
607FACD91AFB9204008FA782 /* Main.storyboard */,
105108
607FACDE1AFB9204008FA782 /* LaunchScreen.xib */,
106109
607FACDC1AFB9204008FA782 /* Images.xcassets */,
@@ -372,6 +375,7 @@
372375
607FACD81AFB9204008FA782 /* Example1.swift in Sources */,
373376
E8F6685B1E7A2374008DC918 /* Example2.swift in Sources */,
374377
607FACD61AFB9204008FA782 /* AppDelegate.swift in Sources */,
378+
9FE995421FE64DB00040D091 /* MainViewController.swift in Sources */,
375379
);
376380
runOnlyForDeploymentPostprocessing = 0;
377381
};
@@ -458,7 +462,7 @@
458462
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
459463
GCC_WARN_UNUSED_FUNCTION = YES;
460464
GCC_WARN_UNUSED_VARIABLE = YES;
461-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
465+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
462466
MTL_ENABLE_DEBUG_INFO = YES;
463467
ONLY_ACTIVE_ARCH = YES;
464468
SDKROOT = iphoneos;
@@ -504,7 +508,7 @@
504508
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
505509
GCC_WARN_UNUSED_FUNCTION = YES;
506510
GCC_WARN_UNUSED_VARIABLE = YES;
507-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
511+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
508512
MTL_ENABLE_DEBUG_INFO = NO;
509513
SDKROOT = iphoneos;
510514
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";

Example/GrowingTextView/Base.lproj/LaunchScreen.xib

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="10117" systemVersion="15G31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
3+
<device id="retina4_7" orientation="portrait">
4+
<adaptation id="fullscreen"/>
5+
</device>
36
<dependencies>
47
<deployment identifier="iOS"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
8+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
69
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
10+
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
11+
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
712
</dependencies>
813
<objects>
914
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -25,7 +30,7 @@
2530
<nil key="highlightedColor"/>
2631
</label>
2732
</subviews>
28-
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
33+
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
2934
<constraints>
3035
<constraint firstItem="kId-c2-rCX" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="bottom" multiplier="1/3" constant="1" id="5cJ-9S-tgC"/>
3136
<constraint firstAttribute="centerX" secondItem="kId-c2-rCX" secondAttribute="centerX" id="Koa-jz-hwk"/>
@@ -36,6 +41,7 @@
3641
</constraints>
3742
<nil key="simulatedStatusBarMetrics"/>
3843
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
44+
<viewLayoutGuide key="safeArea" id="b1g-0M-8zY"/>
3945
<point key="canvasLocation" x="548" y="455"/>
4046
</view>
4147
</objects>

0 commit comments

Comments
 (0)