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

Commit5d5ec9c

Browse files
authored
Merge pull request#404 from 52inc/2.9.0-alpha
2.9.0 alpha
2 parents9951d86 +d7e859f commit5d5ec9c

File tree

6 files changed

+286
-33
lines changed

6 files changed

+286
-33
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=ENV['LIB_VERSION'] ||'2.8.5'
11+
s.version=ENV['LIB_VERSION'] ||'2.9.0'
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/DrawerContentViewController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ extension DrawerContentViewController: PulleyDrawerViewControllerDelegate {
142142
func drawerDisplayModeDidChange(drawer:PulleyViewController){
143143

144144
print("Drawer:\(drawer.currentDisplayMode)")
145-
gripperTopConstraint.isActive= drawer.currentDisplayMode==.drawer
145+
gripperTopConstraint.isActive=(drawer.currentDisplayMode==.drawer || drawer.currentDisplayMode==.compact)
146146
}
147147
}
148148

‎Pulley/Main.storyboard

Lines changed: 137 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -311,8 +311,145 @@
311311
</objects>
312312
<pointkey="canvasLocation"x="744.79999999999995"y="350.59970014992507"/>
313313
</scene>
314+
<!--Drawer Content View Controller-->
315+
<scenesceneID="7cU-8E-D79">
316+
<objects>
317+
<viewControllerstoryboardIdentifier="SecondaryDrawerContentViewController"id="oOF-Yg-zsX"customClass="DrawerContentViewController"customModule="PulleyDemo"customModuleProvider="target"sceneMemberID="viewController">
318+
<viewkey="view"contentMode="scaleToFill"id="HM8-zF-N4R">
319+
<rectkey="frame"x="0.0"y="0.0"width="375"height="667"/>
320+
<autoresizingMaskkey="autoresizingMask"widthSizable="YES"heightSizable="YES"/>
321+
<subviews>
322+
<viewopaque="NO"clipsSubviews="YES"multipleTouchEnabled="YES"contentMode="center"translatesAutoresizingMaskIntoConstraints="NO"id="Iwb-S9-o91">
323+
<rectkey="frame"x="0.0"y="0.0"width="375"height="677"/>
324+
<subviews>
325+
<viewcontentMode="scaleToFill"translatesAutoresizingMaskIntoConstraints="NO"id="HLZ-nv-uHC">
326+
<rectkey="frame"x="0.0"y="0.0"width="375"height="68"/>
327+
<subviews>
328+
<searchBarcontentMode="redraw"searchBarStyle="minimal"placeholder="Where do you want to go?"translatesAutoresizingMaskIntoConstraints="NO"id="t4F-bi-W1C">
329+
<rectkey="frame"x="0.0"y="6"width="375"height="56"/>
330+
<textInputTraitskey="textInputTraits"/>
331+
<connections>
332+
<outletproperty="delegate"destination="oOF-Yg-zsX"id="5TB-at-bM6"/>
333+
</connections>
334+
</searchBar>
335+
<viewcontentMode="scaleToFill"translatesAutoresizingMaskIntoConstraints="NO"id="wQ8-94-da4">
336+
<rectkey="frame"x="0.0"y="67.5"width="375"height="0.5"/>
337+
<colorkey="backgroundColor"red="0.81960784310000001"green="0.81960784310000001"blue="0.83137254900000002"alpha="1"colorSpace="custom"customColorSpace="sRGB"/>
338+
<constraints>
339+
<constraintfirstAttribute="height"constant="0.5"id="ATX-Tp-WbE"/>
340+
</constraints>
341+
</view>
342+
</subviews>
343+
<colorkey="backgroundColor"red="0.0"green="0.0"blue="0.0"alpha="0.0"colorSpace="custom"customColorSpace="sRGB"/>
344+
<constraints>
345+
<constraintfirstItem="t4F-bi-W1C"firstAttribute="top"secondItem="HLZ-nv-uHC"secondAttribute="top"constant="6"id="2Ys-ga-GRw"/>
346+
<constraintfirstAttribute="height"priority="750"constant="68"id="7tI-yw-nth"/>
347+
<constraintfirstAttribute="bottom"secondItem="wQ8-94-da4"secondAttribute="bottom"id="8qz-au-n7q"/>
348+
<constraintfirstAttribute="trailing"secondItem="t4F-bi-W1C"secondAttribute="trailing"id="fVl-1U-QAR"/>
349+
<constraintfirstItem="t4F-bi-W1C"firstAttribute="leading"secondItem="HLZ-nv-uHC"secondAttribute="leading"id="nwf-Tn-Egr"/>
350+
</constraints>
351+
</view>
352+
<tableViewclipsSubviews="YES"contentMode="scaleToFill"alwaysBounceVertical="YES"dataMode="prototypes"style="plain"separatorStyle="default"rowHeight="68"sectionHeaderHeight="28"sectionFooterHeight="28"translatesAutoresizingMaskIntoConstraints="NO"id="M5r-ES-kot">
353+
<rectkey="frame"x="0.0"y="68"width="375"height="579"/>
354+
<colorkey="backgroundColor"red="0.0"green="0.0"blue="0.0"alpha="0.0"colorSpace="custom"customColorSpace="sRGB"/>
355+
<prototypes>
356+
<tableViewCellclipsSubviews="YES"contentMode="scaleToFill"selectionStyle="default"indentationWidth="10"reuseIdentifier="SampleCell"textLabel="DDg-EP-el3"detailTextLabel="714-6K-xv1"rowHeight="81"style="IBUITableViewCellStyleSubtitle"id="P8T-LG-TaH">
357+
<rectkey="frame"x="0.0"y="28"width="375"height="81"/>
358+
<autoresizingMaskkey="autoresizingMask"/>
359+
<tableViewCellContentViewkey="contentView"opaque="NO"clipsSubviews="YES"multipleTouchEnabled="YES"contentMode="center"tableViewCell="P8T-LG-TaH"id="wR2-4a-7w7">
360+
<rectkey="frame"x="0.0"y="0.0"width="375"height="81"/>
361+
<autoresizingMaskkey="autoresizingMask"/>
362+
<subviews>
363+
<labelopaque="NO"multipleTouchEnabled="YES"contentMode="left"text="New Square"textAlignment="natural"lineBreakMode="tailTruncation"baselineAdjustment="alignBaselines"adjustsFontSizeToFit="NO"id="DDg-EP-el3">
364+
<rectkey="frame"x="16"y="15.5"width="111"height="24"/>
365+
<autoresizingMaskkey="autoresizingMask"flexibleMaxX="YES"flexibleMaxY="YES"/>
366+
<fontDescriptionkey="fontDescription"type="system"weight="semibold"pointSize="20"/>
367+
<nilkey="highlightedColor"/>
368+
</label>
369+
<labelopaque="NO"multipleTouchEnabled="YES"contentMode="left"text="Subtitle"textAlignment="natural"lineBreakMode="tailTruncation"baselineAdjustment="alignBaselines"adjustsFontSizeToFit="NO"id="714-6K-xv1">
370+
<rectkey="frame"x="16"y="43"width="58.5"height="20.5"/>
371+
<autoresizingMaskkey="autoresizingMask"flexibleMaxX="YES"flexibleMaxY="YES"/>
372+
<fontDescriptionkey="fontDescription"type="system"pointSize="17"/>
373+
<colorkey="textColor"systemColor="lightTextColor"/>
374+
<nilkey="highlightedColor"/>
375+
</label>
376+
</subviews>
377+
</tableViewCellContentView>
378+
<colorkey="backgroundColor"red="0.0"green="0.0"blue="0.0"alpha="0.0"colorSpace="custom"customColorSpace="sRGB"/>
379+
</tableViewCell>
380+
</prototypes>
381+
<connections>
382+
<outletproperty="dataSource"destination="oOF-Yg-zsX"id="XJe-qK-GRG"/>
383+
<outletproperty="delegate"destination="oOF-Yg-zsX"id="Yui-mq-4YI"/>
384+
</connections>
385+
</tableView>
386+
</subviews>
387+
<colorkey="backgroundColor"red="0.99607843139999996"green="0.38431372549999998"blue="0.20000000000000001"alpha="0.84705882349999995"colorSpace="calibratedRGB"/>
388+
<constraints>
389+
<constraintfirstAttribute="trailing"secondItem="wQ8-94-da4"secondAttribute="trailing"id="0fv-1S-DhD"/>
390+
<constraintfirstItem="HLZ-nv-uHC"firstAttribute="top"secondItem="Iwb-S9-o91"secondAttribute="top"id="5z7-yB-MFo"/>
391+
<constraintfirstItem="M5r-ES-kot"firstAttribute="leading"secondItem="Iwb-S9-o91"secondAttribute="leading"id="DvF-yo-PWJ"/>
392+
<constraintfirstItem="HLZ-nv-uHC"firstAttribute="leading"secondItem="Iwb-S9-o91"secondAttribute="leading"id="HtO-xS-ZZ9"/>
393+
<constraintfirstAttribute="trailing"secondItem="HLZ-nv-uHC"secondAttribute="trailing"id="LMu-89-PVA"/>
394+
<constraintfirstAttribute="trailing"secondItem="M5r-ES-kot"secondAttribute="trailing"id="Rs0-4z-h6b"/>
395+
<constraintfirstItem="wQ8-94-da4"firstAttribute="leading"secondItem="Iwb-S9-o91"secondAttribute="leading"id="T1y-ys-Bid"/>
396+
<constraintfirstItem="M5r-ES-kot"firstAttribute="top"secondItem="HLZ-nv-uHC"secondAttribute="bottom"id="gaP-Ml-sxZ"/>
397+
</constraints>
398+
</view>
399+
<viewuserInteractionEnabled="NO"contentMode="scaleToFill"translatesAutoresizingMaskIntoConstraints="NO"id="ouo-uI-HsZ">
400+
<rectkey="frame"x="169.5"y="6"width="36"height="5"/>
401+
<colorkey="backgroundColor"red="0.72941176470000002"green="0.72549019609999998"blue="0.71372549019999998"alpha="1"colorSpace="custom"customColorSpace="sRGB"/>
402+
<constraints>
403+
<constraintfirstAttribute="width"constant="36"id="DGd-Ea-dWE"/>
404+
<constraintfirstAttribute="height"constant="5"id="X7y-vS-4c8"/>
405+
</constraints>
406+
</view>
407+
<viewcontentMode="scaleToFill"translatesAutoresizingMaskIntoConstraints="NO"id="9vu-nG-Iin">
408+
<rectkey="frame"x="0.0"y="647"width="375"height="0.5"/>
409+
<colorkey="backgroundColor"red="0.81960784310000001"green="0.81960784310000001"blue="0.83137254900000002"alpha="1"colorSpace="custom"customColorSpace="sRGB"/>
410+
<constraints>
411+
<constraintfirstAttribute="height"constant="0.5"id="B3m-jH-2ys"/>
412+
</constraints>
413+
</view>
414+
</subviews>
415+
<viewLayoutGuidekey="safeArea"id="dDD-8t-P72"/>
416+
<colorkey="backgroundColor"white="0.0"alpha="0.0"colorSpace="calibratedWhite"/>
417+
<constraints>
418+
<constraintfirstItem="ouo-uI-HsZ"firstAttribute="top"secondItem="HLZ-nv-uHC"secondAttribute="top"constant="6"id="1A5-jF-ao2"/>
419+
<constraintfirstItem="ouo-uI-HsZ"firstAttribute="centerX"secondItem="dDD-8t-P72"secondAttribute="centerX"id="6iy-Dq-ciB"/>
420+
<constraintfirstItem="9vu-nG-Iin"firstAttribute="top"secondItem="M5r-ES-kot"secondAttribute="bottom"id="8oX-8I-ztR"/>
421+
<constraintfirstItem="9vu-nG-Iin"firstAttribute="leading"secondItem="HM8-zF-N4R"secondAttribute="leading"id="Bbf-DS-2e5"/>
422+
<constraintfirstItem="ouo-uI-HsZ"firstAttribute="top"secondItem="M5r-ES-kot"secondAttribute="bottom"priority="750"constant="8"id="F1s-Lx-n0y"/>
423+
<constraintfirstItem="Iwb-S9-o91"firstAttribute="top"secondItem="HM8-zF-N4R"secondAttribute="top"id="MJk-PZ-gJS"/>
424+
<constraintfirstItem="Iwb-S9-o91"firstAttribute="leading"secondItem="dDD-8t-P72"secondAttribute="leading"id="UeU-Br-KUs"/>
425+
<constraintfirstItem="dDD-8t-P72"firstAttribute="trailing"secondItem="Iwb-S9-o91"secondAttribute="trailing"id="aHa-Ji-cB6"/>
426+
<constraintfirstAttribute="trailing"secondItem="9vu-nG-Iin"secondAttribute="trailing"id="gIu-eK-qU0"/>
427+
<constraintfirstAttribute="bottom"secondItem="M5r-ES-kot"secondAttribute="bottom"priority="751"constant="20"id="ikD-Wp-6Pw"/>
428+
<constraintfirstAttribute="bottomMargin"secondItem="Iwb-S9-o91"secondAttribute="bottom"constant="-10"id="rSQ-GN-Ig7"/>
429+
</constraints>
430+
</view>
431+
<nilkey="simulatedStatusBarMetrics"/>
432+
<nilkey="simulatedTopBarMetrics"/>
433+
<nilkey="simulatedBottomBarMetrics"/>
434+
<connections>
435+
<outletproperty="bottomSeperatorView"destination="9vu-nG-Iin"id="QcS-Ke-23H"/>
436+
<outletproperty="gripperTopConstraint"destination="1A5-jF-ao2"id="ET5-uB-hga"/>
437+
<outletproperty="gripperView"destination="ouo-uI-HsZ"id="3iF-LN-4Xo"/>
438+
<outletproperty="headerSectionHeightConstraint"destination="7tI-yw-nth"id="7UL-UD-skm"/>
439+
<outletproperty="searchBar"destination="t4F-bi-W1C"id="nGe-ng-qft"/>
440+
<outletproperty="tableView"destination="M5r-ES-kot"id="MyX-SG-74k"/>
441+
<outletproperty="topSeparatorView"destination="wQ8-94-da4"id="t9w-ak-neT"/>
442+
</connections>
443+
</viewController>
444+
<placeholderplaceholderIdentifier="IBFirstResponder"id="CdM-eM-sS8"userLabel="First Responder"sceneMemberID="firstResponder"/>
445+
</objects>
446+
<pointkey="canvasLocation"x="1609"y="845"/>
447+
</scene>
314448
</scenes>
315449
<resources>
450+
<systemColorname="lightTextColor">
451+
<colorwhite="1"alpha="0.59999999999999998"colorSpace="custom"customColorSpace="genericGamma22GrayColorSpace"/>
452+
</systemColor>
316453
<systemColorname="lightTextColor">
317454
<colorwhite="1"alpha="0.59999999999999998"colorSpace="custom"customColorSpace="genericGamma22GrayColorSpace"/>
318455
</systemColor>

‎Pulley/PrimaryTransitionTargetViewController.swift

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,17 @@ import Pulley
1212
classPrimaryTransitionTargetViewController:UIViewController{
1313

1414
@IBActionfunc goBackButtonPressed(sender:AnyObject){
15+
// Uncomment the bellow code to create a secondary drawer content view controller
16+
// and set it's initial position with setDrawerContentViewController(controller, position, animated, completion)
17+
/*
18+
let drawerContent = UIStoryboard(name: "Main", bundle: nil).instantiateViewController(withIdentifier: "SecondaryDrawerContentViewController")
19+
20+
self.pulleyViewController?.setDrawerContentViewController(controller: drawerContent, position: .open, animated: true, completion: nil)
21+
*/
22+
1523
letprimaryContent=UIStoryboard(name:"Main", bundle:nil).instantiateViewController(withIdentifier:"PrimaryContentViewController")
1624

1725
self.pulleyViewController?.setPrimaryContentViewController(controller: primaryContent, animated:true)
26+
1827
}
1928
}

0 commit comments

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