forked from organicmaps/organicmaps
[iOS] Added swipe gesture to close PP on ipad
https://jira.mail.ru/browse/MAPSME-13480
This commit is contained in:
Alexander Boriskov
Vladimir Byko-Ianko
parent
d3898d5600
commit
c0af2c0c8e
9 changed files with 230 additions and 99 deletions
16
iphone/Maps/Categories/UIViewController+alternative.swift
Normal file
16
iphone/Maps/Categories/UIViewController+alternative.swift
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
extension UIViewController {
|
||||
func alternativeSizeClass<T>(iPhone: @autoclosure () -> T, iPad: @autoclosure () -> T) -> T {
|
||||
if traitCollection.verticalSizeClass == .regular && traitCollection.horizontalSizeClass == .regular {
|
||||
return iPad()
|
||||
}
|
||||
return iPhone()
|
||||
}
|
||||
|
||||
func alternativeSizeClass(iPhone: () -> Void, iPad: () -> Void) {
|
||||
if traitCollection.verticalSizeClass == .regular && traitCollection.horizontalSizeClass == .regular {
|
||||
iPad()
|
||||
} else {
|
||||
iPhone()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -91,12 +91,12 @@ class PlacePageStyleSheet: IStyleSheet {
|
|||
s.clip = true
|
||||
}
|
||||
|
||||
theme.add(styleName: "PPNavigationBarView") { (s) -> (Void) in
|
||||
theme.add(styleName: "PPNavigationShadowView") { (s) -> (Void) in
|
||||
s.backgroundColor = colors.white
|
||||
s.shadowColor = UIColor.black
|
||||
s.shadowOffset = CGSize(width: 0, height: -1)
|
||||
s.shadowOpacity = 1
|
||||
s.shadowOpacity = 0.6
|
||||
s.shadowOffset = CGSize(width: 0, height: 1)
|
||||
s.shadowOpacity = 0.4
|
||||
s.shadowRadius = 1
|
||||
s.clip = false
|
||||
}
|
||||
|
||||
|
|
@ -107,6 +107,13 @@ class PlacePageStyleSheet: IStyleSheet {
|
|||
s.shadowOffset = CGSize(width: 0, height: 1)
|
||||
s.shadowOpacity = 0.6
|
||||
s.shadowRadius = 2
|
||||
s.clip = false
|
||||
}
|
||||
|
||||
theme.add(styleName: "PPView") { (s) -> (Void) in
|
||||
s.backgroundColor = colors.clear
|
||||
s.cornerRadius = 10
|
||||
s.clip = true
|
||||
}
|
||||
|
||||
theme.add(styleName: "PPCloseButton") { (s) -> (Void) in
|
||||
|
|
|
|||
|
|
@ -533,6 +533,7 @@
|
|||
67B78B551E42333C0018E590 /* AdSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 67B78B541E42333C0018E590 /* AdSupport.framework */; };
|
||||
6B9978361C89A316003B8AA0 /* editor.config in Resources */ = {isa = PBXBuildFile; fileRef = 6B9978341C89A316003B8AA0 /* editor.config */; };
|
||||
7BD07E4A8D71CA41F082BEC7 /* Pods_MAPS_ME.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 58E5736C23FC4E77509C9946 /* Pods_MAPS_ME.framework */; };
|
||||
99012847243F0D6900C72B10 /* UIViewController+alternative.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99012846243F0D6900C72B10 /* UIViewController+alternative.swift */; };
|
||||
9917D17D2396793A00A7E06E /* PaidRoutesSubscriptionCampaign.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9917D17C2396793A00A7E06E /* PaidRoutesSubscriptionCampaign.swift */; };
|
||||
9917D17F2397B1D600A7E06E /* IPadModalPresentationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9917D17E2397B1D600A7E06E /* IPadModalPresentationController.swift */; };
|
||||
991CE2BF2371D349009EB02A /* PromoCampaignManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 991CE2BA2371D349009EB02A /* PromoCampaignManager.swift */; };
|
||||
|
|
@ -1598,6 +1599,7 @@
|
|||
8D1107310486CEB800E47090 /* MAPSME.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = MAPSME.plist; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = "<group>"; };
|
||||
978D4A30199A11E600D72CA7 /* faq.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = faq.html; path = ../../data/faq.html; sourceTree = "<group>"; };
|
||||
97A5967E19B9CD47007A963F /* copyright.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = copyright.html; path = ../../data/copyright.html; sourceTree = "<group>"; };
|
||||
99012846243F0D6900C72B10 /* UIViewController+alternative.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIViewController+alternative.swift"; sourceTree = "<group>"; };
|
||||
9917D17C2396793A00A7E06E /* PaidRoutesSubscriptionCampaign.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaidRoutesSubscriptionCampaign.swift; sourceTree = "<group>"; };
|
||||
9917D17E2397B1D600A7E06E /* IPadModalPresentationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IPadModalPresentationController.swift; sourceTree = "<group>"; };
|
||||
991CE2BA2371D349009EB02A /* PromoCampaignManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PromoCampaignManager.swift; sourceTree = "<group>"; };
|
||||
|
|
@ -2775,6 +2777,7 @@
|
|||
34F7422F1E0834F400AC1FD6 /* UIViewController+Navigation.h */,
|
||||
34F742301E0834F400AC1FD6 /* UIViewController+Navigation.m */,
|
||||
33E905452180C40900868CAC /* UIViewController+Authorization.swift */,
|
||||
99012846243F0D6900C72B10 /* UIViewController+alternative.swift */,
|
||||
347E03981FAC5F1D00426032 /* UIWindow+InputLanguage.swift */,
|
||||
4767CDA320AAF66B00BD8166 /* NSAttributedString+HTML.swift */,
|
||||
47699A0621F08E37009E6585 /* NSDate+TimeDistance.h */,
|
||||
|
|
@ -5562,6 +5565,7 @@
|
|||
4716EABA21A325310029B886 /* IPaidRouteStatistics.swift in Sources */,
|
||||
3490D2E11CE9DD2500D0B838 /* MWMSideButtonsView.mm in Sources */,
|
||||
47F4F21523A6F06F0022FD56 /* AvailableMapsDataSource.swift in Sources */,
|
||||
99012847243F0D6900C72B10 /* UIViewController+alternative.swift in Sources */,
|
||||
995739062355CAC40019AEE7 /* ImageViewCrossDisolve.swift in Sources */,
|
||||
47B9065221C7FA400079C85E /* MWMWebImage.m in Sources */,
|
||||
F6E2FE7C1E097BA00083EBEC /* MWMPlacePageOpeningHoursCell.mm in Sources */,
|
||||
|
|
|
|||
|
|
@ -36,11 +36,11 @@ extension PlacePageHeaderPresenter: PlacePageHeaderPresenterProtocol {
|
|||
view?.setTitle(placePagePreviewData.title ?? "")
|
||||
switch headerType {
|
||||
case .flexible:
|
||||
view?.setViewStyle("PPHeaderView")
|
||||
view?.setExpandViewEnabled(true)
|
||||
view?.isExpandViewHidden = false
|
||||
view?.isShadowViewHidden = true
|
||||
case .fixed:
|
||||
view?.setViewStyle("PPNavigationBarView")
|
||||
view?.setExpandViewEnabled(false)
|
||||
view?.isExpandViewHidden = true
|
||||
view?.isShadowViewHidden = false
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,9 @@
|
|||
protocol PlacePageHeaderViewProtocol: class {
|
||||
var presenter: PlacePageHeaderPresenterProtocol? { get set }
|
||||
var isExpandViewHidden: Bool { get set }
|
||||
var isShadowViewHidden: Bool { get set }
|
||||
|
||||
func setTitle(_ title: String)
|
||||
func setViewStyle(_ style: String)
|
||||
func setExpandViewEnabled(_ val: Bool)
|
||||
}
|
||||
|
||||
class PlacePageHeaderViewController: UIViewController {
|
||||
|
|
@ -10,6 +11,7 @@ class PlacePageHeaderViewController: UIViewController {
|
|||
|
||||
@IBOutlet private var titleLabel: UILabel!
|
||||
@IBOutlet private var expandView: UIView!
|
||||
@IBOutlet private var shadowView: UIView!
|
||||
|
||||
override func viewDidLoad() {
|
||||
super.viewDidLoad()
|
||||
|
|
@ -28,15 +30,25 @@ class PlacePageHeaderViewController: UIViewController {
|
|||
}
|
||||
|
||||
extension PlacePageHeaderViewController: PlacePageHeaderViewProtocol {
|
||||
var isExpandViewHidden: Bool {
|
||||
get {
|
||||
expandView.isHidden
|
||||
}
|
||||
set {
|
||||
expandView.isHidden = newValue
|
||||
}
|
||||
}
|
||||
|
||||
var isShadowViewHidden: Bool {
|
||||
get {
|
||||
shadowView.isHidden
|
||||
}
|
||||
set {
|
||||
shadowView.isHidden = newValue
|
||||
}
|
||||
}
|
||||
|
||||
func setTitle(_ title: String) {
|
||||
titleLabel.text = title
|
||||
}
|
||||
|
||||
func setViewStyle(_ style: String) {
|
||||
view.setStyleAndApply(style)
|
||||
}
|
||||
|
||||
func setExpandViewEnabled(_ val: Bool) {
|
||||
expandView.isHidden = !val
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,12 +18,20 @@
|
|||
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
<subviews>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TtY-w3-kOi">
|
||||
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
|
||||
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="PPBackgroundView"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
<scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" bounces="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" bouncesZoom="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dJ0-97-CDh" customClass="PlacePageScrollView" customModule="maps_me" customModuleProvider="target">
|
||||
<rect key="frame" x="0.0" y="0.0" width="375" height="617"/>
|
||||
<subviews>
|
||||
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="bsv-S8-EiF">
|
||||
<rect key="frame" x="0.0" y="0.0" width="375" height="617"/>
|
||||
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
|
||||
<gestureRecognizers/>
|
||||
</stackView>
|
||||
</subviews>
|
||||
<constraints>
|
||||
|
|
@ -36,6 +44,9 @@
|
|||
</constraints>
|
||||
<viewLayoutGuide key="contentLayoutGuide" id="VD0-9k-Kda"/>
|
||||
<viewLayoutGuide key="frameLayoutGuide" id="fDP-bR-gGe"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="PPView"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
<connections>
|
||||
<outlet property="delegate" destination="bX8-ZQ-XDA" id="ASo-bI-N1l"/>
|
||||
</connections>
|
||||
|
|
@ -59,29 +70,44 @@
|
|||
</view>
|
||||
</subviews>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<gestureRecognizers/>
|
||||
<constraints>
|
||||
<constraint firstItem="inM-UW-vpv" firstAttribute="bottom" secondItem="WOB-EV-vjA" secondAttribute="bottom" id="4Rb-yo-7re"/>
|
||||
<constraint firstItem="dJ0-97-CDh" firstAttribute="top" secondItem="gXh-A8-hCx" secondAttribute="top" id="6c7-Ms-Eds"/>
|
||||
<constraint firstItem="RZh-69-00e" firstAttribute="leading" secondItem="WOB-EV-vjA" secondAttribute="leading" id="CGh-aB-3sF"/>
|
||||
<constraint firstItem="TtY-w3-kOi" firstAttribute="trailing" secondItem="bsv-S8-EiF" secondAttribute="trailing" id="CWc-Ra-Blp"/>
|
||||
<constraint firstAttribute="trailing" secondItem="RZh-69-00e" secondAttribute="trailing" id="E3X-vD-uKf"/>
|
||||
<constraint firstItem="inM-UW-vpv" firstAttribute="top" secondItem="RZh-69-00e" secondAttribute="bottom" id="NBm-e9-pWh"/>
|
||||
<constraint firstItem="dJ0-97-CDh" firstAttribute="leading" secondItem="WOB-EV-vjA" secondAttribute="leading" id="QIH-SU-FfF"/>
|
||||
<constraint firstAttribute="trailing" secondItem="dJ0-97-CDh" secondAttribute="trailing" id="RTC-Oh-LAb"/>
|
||||
<constraint firstItem="TtY-w3-kOi" firstAttribute="top" relation="greaterThanOrEqual" secondItem="gXh-A8-hCx" secondAttribute="top" id="YA4-hx-rBz"/>
|
||||
<constraint firstItem="inM-UW-vpv" firstAttribute="leading" secondItem="WOB-EV-vjA" secondAttribute="leading" id="apX-d6-VvF"/>
|
||||
<constraint firstItem="TtY-w3-kOi" firstAttribute="leading" secondItem="bsv-S8-EiF" secondAttribute="leading" id="hQh-bC-doW"/>
|
||||
<constraint firstItem="gXh-A8-hCx" firstAttribute="bottom" secondItem="TtY-w3-kOi" secondAttribute="bottom" id="iT0-Pn-Zue"/>
|
||||
<constraint firstItem="RZh-69-00e" firstAttribute="top" secondItem="dJ0-97-CDh" secondAttribute="bottom" id="mk3-a2-JVy"/>
|
||||
<constraint firstAttribute="trailing" secondItem="inM-UW-vpv" secondAttribute="trailing" id="oNS-yS-5VJ"/>
|
||||
<constraint firstItem="TtY-w3-kOi" firstAttribute="top" secondItem="bsv-S8-EiF" secondAttribute="top" priority="250" id="r8L-A7-Fbc"/>
|
||||
<constraint firstItem="gXh-A8-hCx" firstAttribute="bottom" secondItem="dJ0-97-CDh" secondAttribute="bottom" constant="50" id="xwz-cT-wns"/>
|
||||
</constraints>
|
||||
<viewLayoutGuide key="safeArea" id="gXh-A8-hCx"/>
|
||||
<connections>
|
||||
<outletCollection property="gestureRecognizers" destination="ma4-y4-Clu" appends="YES" id="j1q-OJ-cqS"/>
|
||||
</connections>
|
||||
</view>
|
||||
<connections>
|
||||
<outlet property="actionBarContainerView" destination="inM-UW-vpv" id="Jph-SJ-GHF"/>
|
||||
<outlet property="actionBarHeightConstraint" destination="xwz-cT-wns" id="Gpq-zW-Lcu"/>
|
||||
<outlet property="panGesture" destination="ma4-y4-Clu" id="Tjl-gC-I8Q"/>
|
||||
<outlet property="scrollView" destination="dJ0-97-CDh" id="8Wc-yy-2yF"/>
|
||||
<outlet property="stackView" destination="bsv-S8-EiF" id="zK0-FZ-JXe"/>
|
||||
</connections>
|
||||
</viewController>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="RZo-DQ-6ys" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
|
||||
<panGestureRecognizer minimumNumberOfTouches="1" id="ma4-y4-Clu">
|
||||
<connections>
|
||||
<action selector="onPanWithGesture:" destination="bX8-ZQ-XDA" id="mzY-87-bkt"/>
|
||||
</connections>
|
||||
</panGestureRecognizer>
|
||||
</objects>
|
||||
<point key="canvasLocation" x="217.39130434782609" y="-267.1875"/>
|
||||
</scene>
|
||||
|
|
@ -3235,85 +3261,112 @@
|
|||
<rect key="frame" x="0.0" y="0.0" width="375" height="59"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
<subviews>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="XDI-4A-1Xp">
|
||||
<rect key="frame" x="0.0" y="0.0" width="329" height="59"/>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
</view>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ysM-7b-O4g">
|
||||
<rect key="frame" x="175.5" y="16" width="24" height="4"/>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.1218428938" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="4" id="3og-WQ-JCH"/>
|
||||
<constraint firstAttribute="width" constant="24" id="sIX-Jz-Z8O"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
|
||||
<integer key="value" value="2"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="750" text="Хинкальная" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="19H-pJ-DHW">
|
||||
<rect key="frame" x="16" y="28" width="313" height="24"/>
|
||||
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="20"/>
|
||||
<nil key="textColor"/>
|
||||
<nil key="highlightedColor"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium20:blackPrimaryText"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="nOV-hF-ri0">
|
||||
<rect key="frame" x="333" y="12" width="30" height="30"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="30" id="ppW-Jc-2oS"/>
|
||||
<constraint firstAttribute="height" constant="30" id="yKe-vK-R4v"/>
|
||||
</constraints>
|
||||
<state key="normal" image="ic_clear_24"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="PPCloseButton"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
<connections>
|
||||
<action selector="onCloseButtonPressed:" destination="aB1-Yk-7p4" eventType="touchUpInside" id="GuL-s0-v1j"/>
|
||||
</connections>
|
||||
</button>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="9yD-7s-dW6">
|
||||
<rect key="frame" x="0.0" y="58" width="375" height="1"/>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="spW-XI-KSY" customClass="PlacePageHeaderView" customModule="maps_me" customModuleProvider="target">
|
||||
<rect key="frame" x="0.0" y="49" width="375" height="10"/>
|
||||
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="1" id="FrJ-eq-aeA"/>
|
||||
<constraint firstAttribute="height" constant="10" id="aON-3f-qnX"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="PPNavigationShadowView"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fqh-H3-eji" customClass="PlacePageHeaderView" customModule="maps_me" customModuleProvider="target">
|
||||
<rect key="frame" x="0.0" y="0.0" width="375" height="59"/>
|
||||
<subviews>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Gdy-g5-gbM">
|
||||
<rect key="frame" x="0.0" y="0.0" width="329" height="59"/>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
</view>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3HJ-WD-nF5">
|
||||
<rect key="frame" x="175.5" y="16" width="24" height="4"/>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.1218428938" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="4" id="nBr-SJ-QG9"/>
|
||||
<constraint firstAttribute="width" constant="24" id="wI8-kZ-awL"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
|
||||
<integer key="value" value="2"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="750" text="Хинкальная" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lR4-to-4wX">
|
||||
<rect key="frame" x="16" y="28" width="313" height="24"/>
|
||||
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="20"/>
|
||||
<nil key="textColor"/>
|
||||
<nil key="highlightedColor"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium20:blackPrimaryText"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yZT-ea-Kac">
|
||||
<rect key="frame" x="333" y="12" width="30" height="30"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="30" id="IYz-Cb-KoJ"/>
|
||||
<constraint firstAttribute="height" constant="30" id="Vhf-Uv-h3C"/>
|
||||
</constraints>
|
||||
<state key="normal" image="ic_clear_24"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="PPCloseButton"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
<connections>
|
||||
<action selector="onCloseButtonPressed:" destination="aB1-Yk-7p4" eventType="touchUpInside" id="uaQ-Fr-c1K"/>
|
||||
</connections>
|
||||
</button>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="DHT-jj-Idk">
|
||||
<rect key="frame" x="0.0" y="58" width="375" height="1"/>
|
||||
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="1" id="9IC-go-aaZ"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="PPHeaderView"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
</subviews>
|
||||
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<constraints>
|
||||
<constraint firstItem="lR4-to-4wX" firstAttribute="top" secondItem="3HJ-WD-nF5" secondAttribute="bottom" constant="8" id="6Qx-yE-NrV"/>
|
||||
<constraint firstAttribute="trailing" secondItem="Gdy-g5-gbM" secondAttribute="trailing" constant="46" id="6o4-Rh-3AV"/>
|
||||
<constraint firstItem="yZT-ea-Kac" firstAttribute="leading" secondItem="lR4-to-4wX" secondAttribute="trailing" constant="4" id="9GI-tG-JCC"/>
|
||||
<constraint firstItem="lR4-to-4wX" firstAttribute="leading" secondItem="fqh-H3-eji" secondAttribute="leading" constant="16" id="C3V-7B-Vcg"/>
|
||||
<constraint firstItem="DHT-jj-Idk" firstAttribute="bottom" secondItem="fqh-H3-eji" secondAttribute="bottom" id="E48-Ph-MaM"/>
|
||||
<constraint firstItem="Gdy-g5-gbM" firstAttribute="top" secondItem="fqh-H3-eji" secondAttribute="top" id="K6g-z6-xFi"/>
|
||||
<constraint firstItem="Gdy-g5-gbM" firstAttribute="leading" secondItem="fqh-H3-eji" secondAttribute="leading" id="LKl-Yx-giI"/>
|
||||
<constraint firstItem="DHT-jj-Idk" firstAttribute="top" secondItem="lR4-to-4wX" secondAttribute="bottom" constant="6" id="PfY-4y-KhQ"/>
|
||||
<constraint firstItem="3HJ-WD-nF5" firstAttribute="top" secondItem="fqh-H3-eji" secondAttribute="top" constant="16" id="Ux6-Nu-CQs"/>
|
||||
<constraint firstItem="DHT-jj-Idk" firstAttribute="leading" secondItem="fqh-H3-eji" secondAttribute="leading" id="ayy-gO-9FO"/>
|
||||
<constraint firstItem="3HJ-WD-nF5" firstAttribute="centerX" secondItem="fqh-H3-eji" secondAttribute="centerX" id="eSH-HU-aAz"/>
|
||||
<constraint firstItem="yZT-ea-Kac" firstAttribute="top" secondItem="fqh-H3-eji" secondAttribute="top" constant="12" id="fKb-5I-FLD"/>
|
||||
<constraint firstAttribute="bottom" secondItem="Gdy-g5-gbM" secondAttribute="bottom" id="jk7-BL-0eZ"/>
|
||||
<constraint firstAttribute="trailing" secondItem="DHT-jj-Idk" secondAttribute="trailing" id="nQM-pQ-Y4F"/>
|
||||
<constraint firstAttribute="trailing" secondItem="yZT-ea-Kac" secondAttribute="trailing" constant="12" id="vhs-5f-yFk"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="PPHeaderView"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
</subviews>
|
||||
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<constraints>
|
||||
<constraint firstItem="ysM-7b-O4g" firstAttribute="centerX" secondItem="My8-Gu-lky" secondAttribute="centerX" id="0Xo-fd-9IQ"/>
|
||||
<constraint firstItem="19H-pJ-DHW" firstAttribute="top" secondItem="ysM-7b-O4g" secondAttribute="bottom" constant="8" id="1T0-Sf-aK9"/>
|
||||
<constraint firstItem="XDI-4A-1Xp" firstAttribute="leading" secondItem="My8-Gu-lky" secondAttribute="leading" id="72i-Ah-HuU"/>
|
||||
<constraint firstAttribute="trailing" secondItem="9yD-7s-dW6" secondAttribute="trailing" id="CPo-N6-i9z"/>
|
||||
<constraint firstItem="nOV-hF-ri0" firstAttribute="top" secondItem="My8-Gu-lky" secondAttribute="top" constant="12" id="Iej-t0-L4p"/>
|
||||
<constraint firstItem="19H-pJ-DHW" firstAttribute="leading" secondItem="My8-Gu-lky" secondAttribute="leading" constant="16" id="Mnq-9Y-mqW"/>
|
||||
<constraint firstItem="My8-Gu-lky" firstAttribute="bottom" secondItem="XDI-4A-1Xp" secondAttribute="bottom" id="T3g-Kf-WU1"/>
|
||||
<constraint firstItem="9yD-7s-dW6" firstAttribute="leading" secondItem="xTs-NP-HcT" secondAttribute="leading" id="ZZ5-9n-Za6"/>
|
||||
<constraint firstItem="9yD-7s-dW6" firstAttribute="bottom" secondItem="xTs-NP-HcT" secondAttribute="bottom" id="fEq-qx-FsB"/>
|
||||
<constraint firstItem="My8-Gu-lky" firstAttribute="trailing" secondItem="XDI-4A-1Xp" secondAttribute="trailing" constant="46" id="kR9-Wo-IOe"/>
|
||||
<constraint firstItem="ysM-7b-O4g" firstAttribute="top" secondItem="xTs-NP-HcT" secondAttribute="top" constant="16" id="lLa-Ek-sSF"/>
|
||||
<constraint firstItem="nOV-hF-ri0" firstAttribute="leading" secondItem="19H-pJ-DHW" secondAttribute="trailing" constant="4" id="lao-6I-EeY"/>
|
||||
<constraint firstItem="My8-Gu-lky" firstAttribute="trailing" secondItem="nOV-hF-ri0" secondAttribute="trailing" constant="12" id="nMU-BO-O1C"/>
|
||||
<constraint firstItem="XDI-4A-1Xp" firstAttribute="top" secondItem="My8-Gu-lky" secondAttribute="top" id="nRE-GG-4YO"/>
|
||||
<constraint firstItem="9yD-7s-dW6" firstAttribute="top" secondItem="19H-pJ-DHW" secondAttribute="bottom" constant="6" id="zVt-Xc-9Lm"/>
|
||||
<constraint firstItem="fqh-H3-eji" firstAttribute="trailing" secondItem="My8-Gu-lky" secondAttribute="trailing" id="4KM-ef-rAJ"/>
|
||||
<constraint firstItem="spW-XI-KSY" firstAttribute="trailing" secondItem="My8-Gu-lky" secondAttribute="trailing" id="CCn-tS-A3D"/>
|
||||
<constraint firstItem="spW-XI-KSY" firstAttribute="leading" secondItem="My8-Gu-lky" secondAttribute="leading" id="GGu-BS-02R"/>
|
||||
<constraint firstAttribute="height" secondItem="fqh-H3-eji" secondAttribute="height" id="ViY-4k-xbU"/>
|
||||
<constraint firstItem="spW-XI-KSY" firstAttribute="bottom" secondItem="My8-Gu-lky" secondAttribute="bottom" id="lTq-ZH-9JB"/>
|
||||
<constraint firstItem="fqh-H3-eji" firstAttribute="leading" secondItem="My8-Gu-lky" secondAttribute="leading" id="oeF-o5-e7z"/>
|
||||
<constraint firstItem="fqh-H3-eji" firstAttribute="top" secondItem="My8-Gu-lky" secondAttribute="top" id="oeY-ni-33F"/>
|
||||
<constraint firstItem="fqh-H3-eji" firstAttribute="bottom" secondItem="My8-Gu-lky" secondAttribute="bottom" id="zkf-gE-4vs"/>
|
||||
</constraints>
|
||||
<viewLayoutGuide key="safeArea" id="My8-Gu-lky"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="PPHeaderView"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
<size key="freeformSize" width="375" height="59"/>
|
||||
<connections>
|
||||
<outlet property="expandView" destination="XDI-4A-1Xp" id="XSW-S9-QHV"/>
|
||||
<outlet property="titleLabel" destination="19H-pJ-DHW" id="PYH-4G-zxO"/>
|
||||
<outlet property="expandView" destination="Gdy-g5-gbM" id="rzi-mb-hUi"/>
|
||||
<outlet property="shadowView" destination="spW-XI-KSY" id="kLc-R7-Rij"/>
|
||||
<outlet property="titleLabel" destination="lR4-to-4wX" id="l4F-JL-aNb"/>
|
||||
<outlet property="view" destination="xTs-NP-HcT" id="jQF-X9-Xlv"/>
|
||||
</connections>
|
||||
</viewController>
|
||||
|
|
|
|||
|
|
@ -147,10 +147,6 @@ extension PlacePagePresenter: PlacePagePresenterProtocol {
|
|||
}
|
||||
|
||||
func closeAnimated() {
|
||||
view.scrollTo(CGPoint(x: 0, y: -self.view.scrollView.height + 1),
|
||||
animated: true,
|
||||
forced: true) {
|
||||
self.view.scrollTo(CGPoint(x: 0, y: -self.view.scrollView.height), animated: false, forced: true)
|
||||
}
|
||||
view.closeAnimated()
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ protocol PlacePageViewProtocol: class {
|
|||
func addNavigationBar(_ header: UIViewController)
|
||||
func scrollTo(_ point: CGPoint, animated: Bool, forced: Bool, completion: (()->())?)
|
||||
func layoutIfNeeded()
|
||||
func closeAnimated()
|
||||
}
|
||||
|
||||
extension PlacePageViewProtocol {
|
||||
|
|
@ -30,6 +31,7 @@ final class PlacePageScrollView: UIScrollView {
|
|||
@IBOutlet var stackView: UIStackView!
|
||||
@IBOutlet var actionBarContainerView: UIView!
|
||||
@IBOutlet var actionBarHeightConstraint: NSLayoutConstraint!
|
||||
@IBOutlet var panGesture: UIPanGestureRecognizer!
|
||||
|
||||
var presenter: PlacePagePresenterProtocol!
|
||||
|
||||
|
|
@ -57,10 +59,11 @@ final class PlacePageScrollView: UIScrollView {
|
|||
override func viewDidLayoutSubviews() {
|
||||
super.viewDidLayoutSubviews()
|
||||
if previousTraitCollection == nil {
|
||||
scrollView.contentInset = alternative(iPhone: UIEdgeInsets(top: scrollView.height, left: 0, bottom: 0, right: 0),
|
||||
iPad: UIEdgeInsets.zero)
|
||||
scrollView.contentInset = alternativeSizeClass(iPhone: UIEdgeInsets(top: scrollView.height, left: 0, bottom: 0, right: 0),
|
||||
iPad: UIEdgeInsets.zero)
|
||||
presenter.updateSteps()
|
||||
}
|
||||
panGesture.isEnabled = alternativeSizeClass(iPhone: false, iPad: true)
|
||||
self.previousTraitCollection = self.traitCollection
|
||||
}
|
||||
|
||||
|
|
@ -75,8 +78,29 @@ final class PlacePageScrollView: UIScrollView {
|
|||
DispatchQueue.main.async {
|
||||
self.presenter.updateSteps()
|
||||
self.presenter.showLastStop()
|
||||
self.scrollView.contentInset = alternative(iPhone: UIEdgeInsets(top: self.scrollView.height, left: 0, bottom: 0, right: 0),
|
||||
iPad: UIEdgeInsets.zero)
|
||||
self.scrollView.contentInset = self.alternativeSizeClass(iPhone: UIEdgeInsets(top: self.scrollView.height, left: 0, bottom: 0, right: 0),
|
||||
iPad: UIEdgeInsets.zero)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@IBAction func onPan(gesture: UIPanGestureRecognizer){
|
||||
let xOffset = gesture.translation(in: view.superview).x
|
||||
gesture.setTranslation(CGPoint.zero, in: view.superview)
|
||||
view.minX += xOffset
|
||||
view.minX = min(view.minX, 0)
|
||||
let alpha = view.maxX / view.width
|
||||
self.view.alpha = alpha
|
||||
|
||||
let state = gesture.state
|
||||
if state == .ended || state == .cancelled {
|
||||
if alpha < 0.8 {
|
||||
self.closeAnimated()
|
||||
} else {
|
||||
UIView.animate(withDuration: kDefaultAnimationDuration) {
|
||||
self.view.minX = 0;
|
||||
self.view.alpha = 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -131,7 +155,7 @@ extension PlacePageViewController: PlacePageViewProtocol {
|
|||
}
|
||||
|
||||
func scrollTo(_ point: CGPoint, animated: Bool, forced: Bool, completion: (()->())?) {
|
||||
if alternative(iPhone: beginDragging, iPad: true) && !forced {
|
||||
if alternativeSizeClass(iPhone: beginDragging, iPad: true) && !forced {
|
||||
return
|
||||
}
|
||||
if forced {
|
||||
|
|
@ -141,6 +165,7 @@ extension PlacePageViewController: PlacePageViewProtocol {
|
|||
if animated {
|
||||
UIView.animate(withDuration: kDefaultAnimationDuration, animations: { [weak scrollView] in
|
||||
scrollView?.contentOffset = scrollPosition
|
||||
self.layoutIfNeeded()
|
||||
}) { (complete) in
|
||||
if complete {
|
||||
completion?()
|
||||
|
|
@ -155,6 +180,25 @@ extension PlacePageViewController: PlacePageViewProtocol {
|
|||
func layoutIfNeeded() {
|
||||
view.layoutIfNeeded()
|
||||
}
|
||||
|
||||
func closeAnimated() {
|
||||
alternativeSizeClass(iPhone: {
|
||||
self.scrollTo(CGPoint(x: 0, y: -self.scrollView.height + 1),
|
||||
animated: true,
|
||||
forced: true) {
|
||||
self.rootViewController.dismissPlacePage()
|
||||
}
|
||||
}, iPad: {
|
||||
UIView.animate(withDuration: kDefaultAnimationDuration,
|
||||
animations: {
|
||||
let frame = self.view.frame
|
||||
self.view.minX = frame.minX - frame.width
|
||||
self.view.alpha = 0
|
||||
}) { (complete) in
|
||||
self.rootViewController.dismissPlacePage()
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - UIScrollViewDelegate
|
||||
|
|
|
|||
|
|
@ -108,17 +108,12 @@
|
|||
</mask>
|
||||
</variation>
|
||||
</view>
|
||||
<view hidden="YES" clipsSubviews="YES" contentMode="scaleToFill" placeholderIntrinsicWidth="infinite" placeholderIntrinsicHeight="500" translatesAutoresizingMaskIntoConstraints="NO" id="rbx-Oj-jeo" customClass="TouchTransparentView" customModule="maps_me" customModuleProvider="target">
|
||||
<view hidden="YES" contentMode="scaleToFill" placeholderIntrinsicWidth="infinite" placeholderIntrinsicHeight="500" translatesAutoresizingMaskIntoConstraints="NO" id="rbx-Oj-jeo" customClass="TouchTransparentView" customModule="maps_me" customModuleProvider="target">
|
||||
<rect key="frame" x="0.0" y="20" width="350" height="355"/>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="350" id="6h8-a6-LWn"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
|
||||
<integer key="value" value="10"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
</userDefinedRuntimeAttributes>
|
||||
<variation key="default">
|
||||
<mask key="constraints">
|
||||
<exclude reference="6h8-a6-LWn"/>
|
||||
|
|
@ -160,6 +155,7 @@
|
|||
<constraint firstItem="utd-Jy-pE5" firstAttribute="trailing" secondItem="rL1-9E-4b7" secondAttribute="trailing" id="QdS-Yx-ADV"/>
|
||||
<constraint firstItem="utd-Jy-pE5" firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="xJx-UU-IdV" secondAttribute="bottom" id="SDX-4J-Jz5"/>
|
||||
<constraint firstItem="utd-Jy-pE5" firstAttribute="bottom" secondItem="xJx-UU-IdV" secondAttribute="bottom" priority="100" id="VfU-Zk-8IU"/>
|
||||
<constraint firstItem="rbx-Oj-jeo" firstAttribute="leading" secondItem="utd-Jy-pE5" secondAttribute="leading" constant="8" id="W0l-NG-7lt"/>
|
||||
<constraint firstItem="utd-Jy-pE5" firstAttribute="top" secondItem="QKu-4A-UgP" secondAttribute="top" priority="100" id="X96-y7-5oI"/>
|
||||
<constraint firstItem="aPn-pa-nCx" firstAttribute="leading" secondItem="USG-6L-Uhw" secondAttribute="leading" id="YFX-ma-vAf"/>
|
||||
<constraint firstItem="utd-Jy-pE5" firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="FFY-Dy-Wou" secondAttribute="bottom" id="YUs-MJ-9w8"/>
|
||||
|
|
@ -177,6 +173,7 @@
|
|||
<variation key="default">
|
||||
<mask key="constraints">
|
||||
<exclude reference="u9s-KY-yCt"/>
|
||||
<exclude reference="W0l-NG-7lt"/>
|
||||
</mask>
|
||||
</variation>
|
||||
<variation key="heightClass=compact-widthClass=compact">
|
||||
|
|
@ -193,7 +190,9 @@
|
|||
<mask key="constraints">
|
||||
<exclude reference="9M9-8P-Hzb"/>
|
||||
<include reference="u9s-KY-yCt"/>
|
||||
<exclude reference="5Sh-l6-Icd"/>
|
||||
<exclude reference="9rR-QQ-c1P"/>
|
||||
<include reference="W0l-NG-7lt"/>
|
||||
</mask>
|
||||
</variation>
|
||||
</view>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue