Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit13b02a0

Browse files
authored
Merge pull request#394 from 52inc/xcode12
Xcode12
2 parents893b33d +5a177cd commit13b02a0

File tree

6 files changed

+50
-35
lines changed

6 files changed

+50
-35
lines changed

‎Pulley.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
Pod::Spec.newdo |s|
1010
s.name='Pulley'
11-
s.version='2.8.1'
11+
s.version='2.8.2'
1212
s.summary='A library to imitate the iOS 10 Maps UI.'
1313

1414
# This description is used to generate tags and improve search results.

‎Pulley.xcodeproj/project.pbxproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@
213213
isa = PBXProject;
214214
attributes = {
215215
LastSwiftUpdateCheck = 0730;
216-
LastUpgradeCheck =1020;
216+
LastUpgradeCheck =1200;
217217
ORGANIZATIONNAME = 52inc;
218218
TargetAttributes = {
219219
355DBF121E40EA4300671CDD = {
@@ -392,6 +392,7 @@
392392
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
393393
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
394394
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
395+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
395396
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
396397
CLANG_WARN_STRICT_PROTOTYPES = YES;
397398
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -449,6 +450,7 @@
449450
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
450451
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
451452
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
453+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
452454
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
453455
CLANG_WARN_STRICT_PROTOTYPES = YES;
454456
CLANG_WARN_SUSPICIOUS_MOVE = YES;

‎Pulley.xcodeproj/xcshareddata/xcschemes/Pulley.xcscheme

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion ="1020"
3+
LastUpgradeVersion ="1200"
44
version ="1.3">
55
<BuildAction
66
parallelizeBuildables ="YES"
@@ -29,8 +29,6 @@
2929
shouldUseLaunchSchemeArgsEnv ="YES">
3030
<Testables>
3131
</Testables>
32-
<AdditionalOptions>
33-
</AdditionalOptions>
3432
</TestAction>
3533
<LaunchAction
3634
buildConfiguration ="Debug"
@@ -51,8 +49,6 @@
5149
ReferencedContainer ="container:Pulley.xcodeproj">
5250
</BuildableReference>
5351
</MacroExpansion>
54-
<AdditionalOptions>
55-
</AdditionalOptions>
5652
</LaunchAction>
5753
<ProfileAction
5854
buildConfiguration ="Release"

‎Pulley.xcodeproj/xcshareddata/xcschemes/PulleyDemo.xcscheme

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion ="1020"
3+
LastUpgradeVersion ="1200"
44
version ="1.3">
55
<BuildAction
66
parallelizeBuildables ="YES"
@@ -27,8 +27,6 @@
2727
selectedDebuggerIdentifier ="Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier ="Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv ="YES">
30-
<Testables>
31-
</Testables>
3230
<MacroExpansion>
3331
<BuildableReference
3432
BuildableIdentifier ="primary"
@@ -38,8 +36,8 @@
3836
ReferencedContainer ="container:Pulley.xcodeproj">
3937
</BuildableReference>
4038
</MacroExpansion>
41-
<AdditionalOptions>
42-
</AdditionalOptions>
39+
<Testables>
40+
</Testables>
4341
</TestAction>
4442
<LaunchAction
4543
buildConfiguration ="Debug"
@@ -61,8 +59,12 @@
6159
ReferencedContainer ="container:Pulley.xcodeproj">
6260
</BuildableReference>
6361
</BuildableProductRunnable>
64-
<AdditionalOptions>
65-
</AdditionalOptions>
62+
<CommandLineArguments>
63+
<CommandLineArgument
64+
argument ="-UIViewLayoutFeedbackLoopDebuggingThreshold 100"
65+
isEnabled ="NO">
66+
</CommandLineArgument>
67+
</CommandLineArguments>
6668
</LaunchAction>
6769
<ProfileAction
6870
buildConfiguration ="Release"

‎Pulley/Main.storyboard

Lines changed: 27 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<documenttype="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB"version="3.0"toolsVersion="14810.12"targetRuntime="iOS.CocoaTouch"propertyAccessControl="none"useAutolayout="YES"useTraitCollections="YES"useSafeAreas="YES"colorMatched="YES"initialViewController="eGL-tC-8gT">
2+
<documenttype="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB"version="3.0"toolsVersion="17156"targetRuntime="iOS.CocoaTouch"propertyAccessControl="none"useAutolayout="YES"useTraitCollections="YES"useSafeAreas="YES"colorMatched="YES"initialViewController="eGL-tC-8gT">
33
<deviceid="retina4_7"orientation="portrait"appearance="light"/>
44
<dependencies>
55
<deploymentidentifier="iOS"/>
6-
<plugInidentifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin"version="14766.15"/>
6+
<plugInidentifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin"version="17125"/>
77
<capabilityname="Safe area layout guides"minToolsVersion="9.0"/>
8+
<capabilityname="System colors in document resources"minToolsVersion="11.0"/>
89
<capabilityname="documents saved in the Xcode 8 format"minToolsVersion="8.0"/>
9-
<capabilityname="iOS 13.0 system colors"minToolsVersion="11.0"/>
1010
</dependencies>
1111
<scenes>
1212
<!--Pulley View Controller-->
@@ -30,6 +30,7 @@
3030
</connections>
3131
</containerView>
3232
</subviews>
33+
<viewLayoutGuidekey="safeArea"id="js6-yh-KNb"/>
3334
<colorkey="backgroundColor"red="1"green="1"blue="1"alpha="1"colorSpace="custom"customColorSpace="sRGB"/>
3435
<constraints>
3536
<constraintfirstItem="js6-yh-KNb"firstAttribute="trailing"secondItem="4p9-KZ-WZu"secondAttribute="trailing"id="4wJ-0j-wA7"/>
@@ -41,7 +42,6 @@
4142
<constraintfirstItem="4p9-KZ-WZu"firstAttribute="top"secondItem="wQw-rH-Lx3"secondAttribute="bottom"id="lt5-8C-7qB"/>
4243
<constraintfirstItem="4p9-KZ-WZu"firstAttribute="leading"secondItem="js6-yh-KNb"secondAttribute="leading"id="mXP-yn-fbH"/>
4344
</constraints>
44-
<viewLayoutGuidekey="safeArea"id="js6-yh-KNb"/>
4545
</view>
4646
<connections>
4747
<outletproperty="drawerContentContainerView"destination="4p9-KZ-WZu"id="kbo-IB-fXW"/>
@@ -61,7 +61,7 @@
6161
<autoresizingMaskkey="autoresizingMask"widthSizable="YES"heightSizable="YES"/>
6262
<subviews>
6363
<mapViewclipsSubviews="YES"multipleTouchEnabled="YES"contentMode="scaleToFill"mapType="standard"translatesAutoresizingMaskIntoConstraints="NO"id="BcX-Cl-AEz">
64-
<rectkey="frame"x="0.0"y="0.0"width="375"height="334"/>
64+
<rectkey="frame"x="0.0"y="0.0"width="375"height="333.5"/>
6565
</mapView>
6666
<visualEffectViewopaque="NO"contentMode="scaleToFill"translatesAutoresizingMaskIntoConstraints="NO"id="D1V-M1-B9h">
6767
<rectkey="frame"x="0.0"y="0.0"width="375"height="0.0"/>
@@ -95,7 +95,7 @@
9595
</connections>
9696
</button>
9797
</subviews>
98-
<colorkey="backgroundColor"xcode11CocoaTouchSystemColor="systemBackgroundColor"cocoaTouchSystemColor="whiteColor"/>
98+
<colorkey="backgroundColor"systemColor="systemBackgroundColor"/>
9999
<constraints>
100100
<constraintfirstAttribute="width"constant="44"id="N5g-Hc-iDc"/>
101101
<constraintfirstItem="98f-el-Efz"firstAttribute="centerX"secondItem="S4A-9H-sT4"secondAttribute="centerX"id="SzB-pz-jbS"/>
@@ -107,7 +107,7 @@
107107
</view>
108108
<labelopaque="NO"clipsSubviews="YES"userInteractionEnabled="NO"contentMode="left"horizontalHuggingPriority="251"verticalHuggingPriority="251"text="78°"textAlignment="center"lineBreakMode="tailTruncation"baselineAdjustment="alignBaselines"adjustsFontSizeToFit="NO"translatesAutoresizingMaskIntoConstraints="NO"id="CdD-I4-t3B">
109109
<rectkey="frame"x="325"y="300.5"width="42"height="25"/>
110-
<colorkey="backgroundColor"xcode11CocoaTouchSystemColor="systemBackgroundColor"cocoaTouchSystemColor="whiteColor"/>
110+
<colorkey="backgroundColor"systemColor="systemBackgroundColor"/>
111111
<constraints>
112112
<constraintfirstAttribute="width"constant="42"id="415-8s-sja"/>
113113
<constraintfirstAttribute="height"constant="25"id="iBR-xC-fe1"/>
@@ -117,6 +117,7 @@
117117
<nilkey="highlightedColor"/>
118118
</label>
119119
</subviews>
120+
<viewLayoutGuidekey="safeArea"id="3nf-7A-qvc"/>
120121
<colorkey="backgroundColor"red="1"green="1"blue="1"alpha="1"colorSpace="custom"customColorSpace="sRGB"/>
121122
<constraints>
122123
<constraintfirstItem="BcX-Cl-AEz"firstAttribute="leading"secondItem="wsZ-C5-y4c"secondAttribute="leading"id="1t0-hY-UkU"/>
@@ -132,7 +133,6 @@
132133
<constraintfirstItem="3nf-7A-qvc"firstAttribute="trailing"secondItem="CdD-I4-t3B"secondAttribute="trailing"constant="8"id="oG7-uX-jCF"/>
133134
<constraintfirstAttribute="bottom"secondItem="BcX-Cl-AEz"secondAttribute="bottom"id="xU4-0M-UiS"/>
134135
</constraints>
135-
<viewLayoutGuidekey="safeArea"id="3nf-7A-qvc"/>
136136
</view>
137137
<connections>
138138
<outletproperty="controlsContainer"destination="S4A-9H-sT4"id="1ru-U0-gtK"/>
@@ -153,9 +153,9 @@
153153
<rectkey="frame"x="0.0"y="0.0"width="375"height="667"/>
154154
<autoresizingMaskkey="autoresizingMask"widthSizable="YES"heightSizable="YES"/>
155155
<subviews>
156-
<buttonopaque="NO"contentMode="scaleToFill"contentHorizontalAlignment="center"contentVerticalAlignment="center"buttonType="roundedRect"lineBreakMode="middleTruncation"translatesAutoresizingMaskIntoConstraints="NO"id="JCA-wg-qrc">
156+
<buttonopaque="NO"contentMode="scaleToFill"contentHorizontalAlignment="center"contentVerticalAlignment="center"buttonType="system"lineBreakMode="middleTruncation"translatesAutoresizingMaskIntoConstraints="NO"id="JCA-wg-qrc">
157157
<rectkey="frame"x="20"y="57"width="335"height="114"/>
158-
<colorkey="backgroundColor"cocoaTouchSystemColor="systemGrayColor"/>
158+
<colorkey="backgroundColor"systemColor="systemGrayColor"/>
159159
<constraints>
160160
<constraintfirstAttribute="height"constant="114"id="7fZ-xV-Xe2"/>
161161
</constraints>
@@ -165,13 +165,13 @@
165165
</connections>
166166
</button>
167167
</subviews>
168-
<colorkey="backgroundColor"xcode11CocoaTouchSystemColor="systemBackgroundColor"cocoaTouchSystemColor="whiteColor"/>
168+
<viewLayoutGuidekey="safeArea"id="lxe-wc-Z2x"/>
169+
<colorkey="backgroundColor"systemColor="systemBackgroundColor"/>
169170
<constraints>
170171
<constraintfirstItem="JCA-wg-qrc"firstAttribute="leading"secondItem="lxe-wc-Z2x"secondAttribute="leading"constant="20"id="5Oc-xU-2E0"/>
171172
<constraintfirstItem="lxe-wc-Z2x"firstAttribute="trailing"secondItem="JCA-wg-qrc"secondAttribute="trailing"constant="20"id="B66-EW-02O"/>
172173
<constraintfirstItem="JCA-wg-qrc"firstAttribute="top"secondItem="GtQ-yD-cjm"secondAttribute="topMargin"constant="57"id="xod-DQ-3Nu"/>
173174
</constraints>
174-
<viewLayoutGuidekey="safeArea"id="lxe-wc-Z2x"/>
175175
</view>
176176
</viewController>
177177
<placeholderplaceholderIdentifier="IBFirstResponder"id="Tt9-jM-w71"userLabel="First Responder"sceneMemberID="firstResponder"/>
@@ -228,16 +228,16 @@
228228
<autoresizingMaskkey="autoresizingMask"/>
229229
<subviews>
230230
<labelopaque="NO"multipleTouchEnabled="YES"contentMode="left"text="Neighborhood Market"textAlignment="natural"lineBreakMode="tailTruncation"baselineAdjustment="alignBaselines"adjustsFontSizeToFit="NO"id="lAS-Ae-0Vm">
231-
<rectkey="frame"x="15"y="15.5"width="200"height="24"/>
231+
<rectkey="frame"x="16"y="15.5"width="200.5"height="24"/>
232232
<autoresizingMaskkey="autoresizingMask"flexibleMaxX="YES"flexibleMaxY="YES"/>
233233
<fontDescriptionkey="fontDescription"type="system"weight="semibold"pointSize="20"/>
234234
<nilkey="highlightedColor"/>
235235
</label>
236236
<labelopaque="NO"multipleTouchEnabled="YES"contentMode="left"text="Subtitle"textAlignment="natural"lineBreakMode="tailTruncation"baselineAdjustment="alignBaselines"adjustsFontSizeToFit="NO"id="ehl-PZ-QRy">
237-
<rectkey="frame"x="15"y="43"width="59"height="20.5"/>
237+
<rectkey="frame"x="16"y="43"width="58.5"height="20.5"/>
238238
<autoresizingMaskkey="autoresizingMask"flexibleMaxX="YES"flexibleMaxY="YES"/>
239239
<fontDescriptionkey="fontDescription"type="system"pointSize="17"/>
240-
<colorkey="textColor"cocoaTouchSystemColor="lightTextColor"/>
240+
<colorkey="textColor"systemColor="lightTextColor"/>
241241
<nilkey="highlightedColor"/>
242242
</label>
243243
</subviews>
@@ -278,6 +278,7 @@
278278
</constraints>
279279
</view>
280280
</subviews>
281+
<viewLayoutGuidekey="safeArea"id="Cj5-uX-ZG8"/>
281282
<colorkey="backgroundColor"white="0.0"alpha="0.0"colorSpace="calibratedWhite"/>
282283
<constraints>
283284
<constraintfirstAttribute="bottom"secondItem="njO-tj-uAV"secondAttribute="bottom"priority="751"constant="20"id="12g-tv-OSx"/>
@@ -292,7 +293,6 @@
292293
<constraintfirstItem="2S4-TW-Cpq"firstAttribute="centerX"secondItem="Cj5-uX-ZG8"secondAttribute="centerX"id="sPx-pq-XI3"/>
293294
<constraintfirstItem="JBT-De-7Vh"firstAttribute="top"secondItem="amw-OD-m8D"secondAttribute="top"id="yQQ-sZ-GiV"/>
294295
</constraints>
295-
<viewLayoutGuidekey="safeArea"id="Cj5-uX-ZG8"/>
296296
</view>
297297
<nilkey="simulatedStatusBarMetrics"/>
298298
<nilkey="simulatedTopBarMetrics"/>
@@ -312,4 +312,15 @@
312312
<pointkey="canvasLocation"x="744.79999999999995"y="350.59970014992507"/>
313313
</scene>
314314
</scenes>
315+
<resources>
316+
<systemColorname="lightTextColor">
317+
<colorwhite="1"alpha="0.59999999999999998"colorSpace="custom"customColorSpace="genericGamma22GrayColorSpace"/>
318+
</systemColor>
319+
<systemColorname="systemBackgroundColor">
320+
<colorwhite="1"alpha="1"colorSpace="custom"customColorSpace="genericGamma22GrayColorSpace"/>
321+
</systemColor>
322+
<systemColorname="systemGrayColor">
323+
<colorred="0.55686274509803924"green="0.55686274509803924"blue="0.57647058823529407"alpha="1"colorSpace="custom"customColorSpace="sRGB"/>
324+
</systemColor>
325+
</resources>
315326
</document>

‎PulleyLib/PulleyViewController.swift

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -598,13 +598,14 @@ open class PulleyViewController: UIViewController, PulleyDrawerViewControllerDel
598598
/// The currently rendered display mode for Pulley. This will match displayMode unless you have it set to 'automatic'. This will provide the 'actual' display mode (never automatic).
599599
publicfileprivate(set)varcurrentDisplayMode:PulleyDisplayMode=.automatic{
600600
didSet{
601-
ifself.isViewLoaded
602-
{
603-
self.view.setNeedsLayout()
604-
}
605601

606602
if oldValue!= currentDisplayMode
607603
{
604+
ifself.isViewLoaded
605+
{
606+
self.view.setNeedsLayout()
607+
}
608+
608609
delegate?.drawerDisplayModeDidChange?(drawer:self)
609610
(drawerContentViewControlleras?PulleyDrawerViewControllerDelegate)?.drawerDisplayModeDidChange?(drawer:self)
610611
(primaryContentContaineras?PulleyPrimaryContentControllerDelegate)?.drawerDisplayModeDidChange?(drawer:self)
@@ -995,7 +996,10 @@ open class PulleyViewController: UIViewController, PulleyDrawerViewControllerDel
995996
user of this library), then the corners parameter will be ignored.
996997
*/
997998
privatefunc drawerMaskingPath(byRoundingCorners corners:UIRectCorner)->UIBezierPath{
998-
drawerContentViewController.view.layoutIfNeeded()
999+
// Only layout the drawer content view if the position is not closed. If the position is closed this view is not visable and does not need to be layout for the masking path. This is the root of iOS 14 auto layout feedback loop.
1000+
if drawerPosition!=.closed{
1001+
drawerContentViewController.view.layoutIfNeeded()
1002+
}
9991003

10001004
letpath:UIBezierPath
10011005
iflet customPath=(drawerContentViewController.view.layer.maskas?CAShapeLayer)?.path{

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp