forked from organicmaps/organicmaps-tmp
[iOS] Added direction view in full screen
https://jira.mail.ru/browse/MAPSME-13434
This commit is contained in:
Alexander Boriskov
Aleksey Belousov
parent
4224763e6a
commit
3d4ce5cca8
10 changed files with 308 additions and 281 deletions
|
|
@ -1,4 +1,8 @@
|
|||
extension Bundle {
|
||||
func load<T:UIView>(viewClass: T.Type, owner: Any? = nil, options: [AnyHashable: Any]? = nil) -> T? {
|
||||
return loadNibNamed(String(describing: viewClass), owner: owner, options: options as? [UINib.OptionsKey : Any])?.first as? T
|
||||
}
|
||||
|
||||
@objc func load(viewClass: AnyClass, owner: Any? = nil, options: [AnyHashable: Any]? = nil) -> [Any]? {
|
||||
return loadNibNamed(toString(viewClass), owner: owner, options: options as? [UINib.OptionsKey : Any])
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#import "EAGLView.h"
|
||||
#import "iosOGLContextFactory.h"
|
||||
#import "MWMDirectionView.h"
|
||||
#import "MWMMapWidgets.h"
|
||||
#import "SwiftBridge.h"
|
||||
|
||||
#import "3party/Alohalytics/src/alohalytics_objc.h"
|
||||
|
||||
|
|
@ -184,19 +184,6 @@ double getExactDPI(double contentScaleFactor)
|
|||
LOG(LINFO, ("CreateDrapeEngine Finished"));
|
||||
}
|
||||
|
||||
- (void)addSubview:(UIView *)view
|
||||
{
|
||||
[super addSubview:view];
|
||||
for (UIView * v in self.subviews)
|
||||
{
|
||||
if ([v isKindOfClass:[MWMDirectionView class]])
|
||||
{
|
||||
[self bringSubviewToFront:v];
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
- (CGSize)pixelSize
|
||||
{
|
||||
CGSize const s = self.bounds.size;
|
||||
|
|
|
|||
|
|
@ -627,6 +627,8 @@
|
|||
995739082355CB660019AEE7 /* AllPassSubscriptionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 995739072355CB660019AEE7 /* AllPassSubscriptionViewController.swift */; };
|
||||
995F1613244F0AA50060631D /* BottomMenuLayersCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 995F1611244F0AA40060631D /* BottomMenuLayersCell.swift */; };
|
||||
995F1614244F0AA50060631D /* BottomMenuLayersCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 995F1612244F0AA40060631D /* BottomMenuLayersCell.xib */; };
|
||||
9959C75624582DA2008FD4FD /* DirectionView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9959C75524582DA2008FD4FD /* DirectionView.xib */; };
|
||||
9959C75C24599CCD008FD4FD /* DirectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9959C75B24599CCC008FD4FD /* DirectionView.swift */; };
|
||||
9977E6A12480E1EE0073780C /* BottomMenuLayerButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9977E6A02480E1EE0073780C /* BottomMenuLayerButton.swift */; };
|
||||
9977E69C247BFB510073780C /* MWMSearchTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9977E69B247BFB510073780C /* MWMSearchTextField.swift */; };
|
||||
9977E6A32480F9BF0073780C /* BottomMenuLayerButtonRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9977E6A22480F9BF0073780C /* BottomMenuLayerButtonRenderer.swift */; };
|
||||
|
|
@ -847,8 +849,6 @@
|
|||
F6E2FE2B1E097BA00083EBEC /* MWMStreetEditorEditTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FC841E097B9F0083EBEC /* MWMStreetEditorEditTableViewCell.m */; };
|
||||
F6E2FE2E1E097BA00083EBEC /* MWMStreetEditorEditTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FC851E097B9F0083EBEC /* MWMStreetEditorEditTableViewCell.xib */; };
|
||||
F6E2FE311E097BA00083EBEC /* MWMStreetEditorViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FC871E097B9F0083EBEC /* MWMStreetEditorViewController.mm */; };
|
||||
F6E2FE431E097BA00083EBEC /* MWMDirectionView.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FC951E097B9F0083EBEC /* MWMDirectionView.mm */; };
|
||||
F6E2FE461E097BA00083EBEC /* MWMDirectionView.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FC961E097B9F0083EBEC /* MWMDirectionView.xib */; };
|
||||
F6E2FE4C1E097BA00083EBEC /* MWMPlacePageManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FC9A1E097B9F0083EBEC /* MWMPlacePageManager.mm */; };
|
||||
F6E2FE4F1E097BA00083EBEC /* MWMActionBarButton.m in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FC9F1E097B9F0083EBEC /* MWMActionBarButton.m */; };
|
||||
F6E2FE521E097BA00083EBEC /* MWMActionBarButton.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FCA01E097B9F0083EBEC /* MWMActionBarButton.xib */; };
|
||||
|
|
@ -1716,6 +1716,8 @@
|
|||
9957FAE0237AE04900855F48 /* MWMMapViewControlsManager+AddPlace.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "MWMMapViewControlsManager+AddPlace.h"; sourceTree = "<group>"; };
|
||||
995F1610244F07F90060631D /* MWMBottomMenuState.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMBottomMenuState.h; sourceTree = "<group>"; };
|
||||
995F1611244F0AA40060631D /* BottomMenuLayersCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomMenuLayersCell.swift; sourceTree = "<group>"; };
|
||||
9959C75524582DA2008FD4FD /* DirectionView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = DirectionView.xib; sourceTree = "<group>"; };
|
||||
9959C75B24599CCC008FD4FD /* DirectionView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DirectionView.swift; sourceTree = "<group>"; };
|
||||
995F1612244F0AA40060631D /* BottomMenuLayersCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BottomMenuLayersCell.xib; sourceTree = "<group>"; };
|
||||
9977E6A02480E1EE0073780C /* BottomMenuLayerButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomMenuLayerButton.swift; sourceTree = "<group>"; };
|
||||
9977E69B247BFB510073780C /* MWMSearchTextField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MWMSearchTextField.swift; sourceTree = "<group>"; };
|
||||
|
|
@ -2075,9 +2077,6 @@
|
|||
F6E2FC851E097B9F0083EBEC /* MWMStreetEditorEditTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMStreetEditorEditTableViewCell.xib; sourceTree = "<group>"; };
|
||||
F6E2FC861E097B9F0083EBEC /* MWMStreetEditorViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMStreetEditorViewController.h; sourceTree = "<group>"; };
|
||||
F6E2FC871E097B9F0083EBEC /* MWMStreetEditorViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMStreetEditorViewController.mm; sourceTree = "<group>"; };
|
||||
F6E2FC941E097B9F0083EBEC /* MWMDirectionView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMDirectionView.h; sourceTree = "<group>"; };
|
||||
F6E2FC951E097B9F0083EBEC /* MWMDirectionView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = MWMDirectionView.mm; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
|
||||
F6E2FC961E097B9F0083EBEC /* MWMDirectionView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMDirectionView.xib; sourceTree = "<group>"; };
|
||||
F6E2FC991E097B9F0083EBEC /* MWMPlacePageManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMPlacePageManager.h; sourceTree = "<group>"; };
|
||||
F6E2FC9A1E097B9F0083EBEC /* MWMPlacePageManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMPlacePageManager.mm; sourceTree = "<group>"; };
|
||||
F6E2FC9B1E097B9F0083EBEC /* MWMPlacePageProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMPlacePageProtocol.h; sourceTree = "<group>"; };
|
||||
|
|
@ -4625,9 +4624,8 @@
|
|||
F6E2FC931E097B9F0083EBEC /* DirectionView */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
F6E2FC941E097B9F0083EBEC /* MWMDirectionView.h */,
|
||||
F6E2FC951E097B9F0083EBEC /* MWMDirectionView.mm */,
|
||||
F6E2FC961E097B9F0083EBEC /* MWMDirectionView.xib */,
|
||||
9959C75B24599CCC008FD4FD /* DirectionView.swift */,
|
||||
9959C75524582DA2008FD4FD /* DirectionView.xib */,
|
||||
);
|
||||
path = DirectionView;
|
||||
sourceTree = "<group>";
|
||||
|
|
@ -5104,10 +5102,10 @@
|
|||
349D1AD51E2E325B004A2006 /* BottomMenuItemCell.xib in Resources */,
|
||||
349D1AE11E2E325C004A2006 /* BottomTabBarViewController.xib in Resources */,
|
||||
34D3B01E1E389D05004100F9 /* MWMButtonCell.xib in Resources */,
|
||||
9959C75624582DA2008FD4FD /* DirectionView.xib in Resources */,
|
||||
6741A98B1BF340DE002C974C /* MWMCircularProgress.xib in Resources */,
|
||||
CD96C71122A6820800DB7CFE /* DiscoveryGuideCollectionHolderCell.xib in Resources */,
|
||||
6741A94F1BF340DE002C974C /* MWMDefaultAlert.xib in Resources */,
|
||||
F6E2FE461E097BA00083EBEC /* MWMDirectionView.xib in Resources */,
|
||||
6741A9951BF340DE002C974C /* MWMDownloaderDialogCell.xib in Resources */,
|
||||
6741A9511BF340DE002C974C /* MWMDownloaderDialogHeader.xib in Resources */,
|
||||
6741A96C1BF340DE002C974C /* MWMDownloadTransitMapAlert.xib in Resources */,
|
||||
|
|
@ -5601,7 +5599,6 @@
|
|||
34E776141F14B17F003040B3 /* AvailableArea.swift in Sources */,
|
||||
34AB66081FC5AA320078E451 /* MWMNavigationDashboardManager.mm in Sources */,
|
||||
991CE2BF2371D349009EB02A /* PromoCampaignManager.swift in Sources */,
|
||||
F6E2FE431E097BA00083EBEC /* MWMDirectionView.mm in Sources */,
|
||||
470F5A5B2181DE7500754295 /* PaidRouteViewController.swift in Sources */,
|
||||
3486B50D1E27A6DA0069C126 /* MWMPushNotifications.mm in Sources */,
|
||||
3404F490202898CC0090E401 /* BMCModels.swift in Sources */,
|
||||
|
|
@ -5621,6 +5618,7 @@
|
|||
993DF11723F6BDB100AC231A /* UINavigationBarRenderer.swift in Sources */,
|
||||
6741A9E71BF340DE002C974C /* MWMCircularProgressView.m in Sources */,
|
||||
34AC8FDB1EFC07FE00E7F910 /* UILabel+NumberOfVisibleLines.swift in Sources */,
|
||||
9959C75C24599CCD008FD4FD /* DirectionView.swift in Sources */,
|
||||
99B6A77F23684573002C94CB /* PromoDiscoveryBuilder.swift in Sources */,
|
||||
4767CD9F20AAD48A00BD8166 /* Checkmark.swift in Sources */,
|
||||
F6E2FD981E097BA00083EBEC /* MWMBookmarkTitleCell.m in Sources */,
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
class DirectionView: UIView {
|
||||
class PlacePageDirectionView: UIView {
|
||||
@IBOutlet var imageView: UIImageView!
|
||||
@IBOutlet var label: UILabel!
|
||||
}
|
||||
|
|
@ -32,10 +32,13 @@ class PlacePagePreviewViewController: UIViewController {
|
|||
@IBOutlet var scheduleContainerView: UIStackView!
|
||||
@IBOutlet var searchSimilarContainerView: UIStackView!
|
||||
|
||||
@IBOutlet var subtitleDirectionView: DirectionView!
|
||||
@IBOutlet var addressDirectionView: DirectionView!
|
||||
@IBOutlet var subtitleDirectionView: PlacePageDirectionView!
|
||||
@IBOutlet var addressDirectionView: PlacePageDirectionView!
|
||||
|
||||
var directionView: DirectionView?
|
||||
var placePageDirectionView: PlacePageDirectionView?
|
||||
lazy var fullScreenDirectionView: DirectionView = {
|
||||
return Bundle.main.load(viewClass: DirectionView.self)!
|
||||
}()
|
||||
lazy var adView: AdBannerView = {
|
||||
let view = Bundle.main.load(viewClass: AdBannerView.self)?.first as! AdBannerView
|
||||
view.isHidden = true
|
||||
|
|
@ -72,11 +75,11 @@ class PlacePagePreviewViewController: UIViewController {
|
|||
subtitleLabel.attributedText = subtitleString
|
||||
}
|
||||
|
||||
directionView = subtitleDirectionView
|
||||
placePageDirectionView = subtitleDirectionView
|
||||
|
||||
if let address = placePagePreviewData.address {
|
||||
addressLabel.text = address
|
||||
directionView = addressDirectionView
|
||||
placePageDirectionView = addressDirectionView
|
||||
} else {
|
||||
addressContainerView.isHidden = true
|
||||
}
|
||||
|
|
@ -92,14 +95,14 @@ class PlacePagePreviewViewController: UIViewController {
|
|||
ugcContainerView.isHidden = !placePagePreviewData.isBookingPlace
|
||||
|
||||
if let distance = distance {
|
||||
directionView?.isHidden = false
|
||||
directionView?.label.text = distance
|
||||
placePageDirectionView?.isHidden = false
|
||||
placePageDirectionView?.label.text = distance
|
||||
}
|
||||
|
||||
if let heading = heading {
|
||||
updateHeading(heading)
|
||||
} else {
|
||||
directionView?.imageView.isHidden = true
|
||||
placePageDirectionView?.imageView.isHidden = true
|
||||
}
|
||||
|
||||
stackView.addArrangedSubview(adView)
|
||||
|
|
@ -166,19 +169,21 @@ class PlacePagePreviewViewController: UIViewController {
|
|||
|
||||
func updateDistance(_ distance: String) {
|
||||
self.distance = distance
|
||||
directionView?.isHidden = false
|
||||
directionView?.label.text = distance
|
||||
placePageDirectionView?.isHidden = false
|
||||
placePageDirectionView?.label.text = distance
|
||||
fullScreenDirectionView.updateDistance(distance)
|
||||
}
|
||||
|
||||
func updateHeading(_ angle: CGFloat) {
|
||||
heading = angle
|
||||
directionView?.imageView.isHidden = false
|
||||
placePageDirectionView?.imageView.isHidden = false
|
||||
UIView.animate(withDuration: kDefaultAnimationDuration,
|
||||
delay: 0,
|
||||
options: [.beginFromCurrentState, .curveEaseInOut],
|
||||
animations: { [unowned self] in
|
||||
self.directionView?.imageView.transform = CGAffineTransform(rotationAngle: CGFloat.pi / 2 - angle)
|
||||
self.placePageDirectionView?.imageView.transform = CGAffineTransform(rotationAngle: CGFloat.pi / 2 - angle)
|
||||
})
|
||||
fullScreenDirectionView.updateHeading(angle)
|
||||
}
|
||||
|
||||
func updateSpeedAndAltitude(_ speedAndAltitude: String) {
|
||||
|
|
@ -193,6 +198,18 @@ class PlacePagePreviewViewController: UIViewController {
|
|||
@IBAction func onSimilarHotels(_ sender: UIButton) {
|
||||
delegate?.previewDidPressSimilarHotels()
|
||||
}
|
||||
|
||||
@IBAction func onDirectionPressed(_ sender: Any) {
|
||||
guard let heading = heading else {
|
||||
return
|
||||
}
|
||||
|
||||
fullScreenDirectionView.updateTitle(placePagePreviewData.title,
|
||||
subtitle: placePagePreviewData.subtitle ?? placePagePreviewData.coordinates)
|
||||
fullScreenDirectionView.updateHeading(heading)
|
||||
fullScreenDirectionView.updateDistance(distance)
|
||||
fullScreenDirectionView.show()
|
||||
}
|
||||
// MARK: private
|
||||
|
||||
private func configSchedule() {
|
||||
|
|
|
|||
72
iphone/Maps/UI/PlacePage/DirectionView/DirectionView.swift
Normal file
72
iphone/Maps/UI/PlacePage/DirectionView/DirectionView.swift
Normal file
|
|
@ -0,0 +1,72 @@
|
|||
import UIKit
|
||||
|
||||
class DirectionView: SolidTouchView {
|
||||
@IBOutlet private var titleLabel: UILabel!
|
||||
@IBOutlet private var typeLabel: UILabel!
|
||||
@IBOutlet private var distanceLabel :UILabel!
|
||||
@IBOutlet private var directionArrow: UIImageView!
|
||||
@IBOutlet private var contentView: UIView!
|
||||
|
||||
override func awakeFromNib() {
|
||||
distanceLabel.font = alternative(iPhone: .regular32(), iPad: .regular52())
|
||||
typeLabel.font = alternative(iPhone: .regular16(), iPad: .regular24())
|
||||
}
|
||||
|
||||
override func didMoveToSuperview() {
|
||||
super.didMoveToSuperview()
|
||||
let manager = MWMMapViewControlsManager.manager()
|
||||
let app = MapsAppDelegate.theApp()
|
||||
if superview != nil {
|
||||
app.disableStandby()
|
||||
manager?.isDirectionViewHidden = false
|
||||
} else {
|
||||
app.enableStandby()
|
||||
manager?.isDirectionViewHidden = true
|
||||
}
|
||||
app.mapViewController.updateStatusBarStyle()
|
||||
}
|
||||
|
||||
override func layoutSubviews() {
|
||||
var textAlignment = NSTextAlignment.center
|
||||
if UIDevice.current.orientation == .landscapeLeft || UIDevice.current.orientation == .landscapeRight {
|
||||
textAlignment = alternative(iPhone: .left, iPad: .center)
|
||||
}
|
||||
titleLabel.textAlignment = textAlignment
|
||||
typeLabel.textAlignment = textAlignment
|
||||
distanceLabel.textAlignment = textAlignment
|
||||
|
||||
super.layoutSubviews()
|
||||
}
|
||||
|
||||
func show() {
|
||||
guard let superview = MapViewController.shared()?.view else {
|
||||
assertionFailure()
|
||||
return
|
||||
}
|
||||
superview.addSubview(self)
|
||||
self.alignToSuperview()
|
||||
setNeedsLayout()
|
||||
}
|
||||
|
||||
func updateTitle(_ title: String?, subtitle: String?) {
|
||||
self.titleLabel.text = title
|
||||
self.typeLabel.text = subtitle
|
||||
}
|
||||
|
||||
func updateDistance(_ distance: String?) {
|
||||
distanceLabel?.text = distance
|
||||
}
|
||||
|
||||
func updateHeading(_ angle: CGFloat) {
|
||||
UIView.animate(withDuration: kDefaultAnimationDuration,
|
||||
delay: 0,
|
||||
options: [.beginFromCurrentState, .curveEaseInOut],
|
||||
animations: { [unowned self] in
|
||||
self.directionArrow?.transform = CGAffineTransform(rotationAngle: CGFloat.pi / 2 - angle)
|
||||
})
|
||||
}
|
||||
|
||||
@IBAction func onTap(_ sender: Any) {
|
||||
removeFromSuperview()
|
||||
}
|
||||
}
|
||||
176
iphone/Maps/UI/PlacePage/DirectionView/DirectionView.xib
Normal file
176
iphone/Maps/UI/PlacePage/DirectionView/DirectionView.xib
Normal file
|
|
@ -0,0 +1,176 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
|
||||
<device id="retina6_5" orientation="portrait" appearance="light"/>
|
||||
<dependencies>
|
||||
<deployment identifier="iOS"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
|
||||
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
|
||||
</dependencies>
|
||||
<objects>
|
||||
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
|
||||
<view contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iN0-l3-epB" customClass="DirectionView" customModule="maps_me" customModuleProvider="target">
|
||||
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
|
||||
<subviews>
|
||||
<view autoresizesSubviews="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="yXW-1V-PEL">
|
||||
<rect key="frame" x="134.33333333333337" y="284" width="145.66666666666663" height="328"/>
|
||||
<subviews>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Аэропорт " textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mMN-to-Xnd" userLabel="Аэропорт" propertyAccessControl="none">
|
||||
<rect key="frame" x="0.0" y="0.0" width="145.66666666666666" height="38.333333333333336"/>
|
||||
<fontDescription key="fontDescription" type="system" weight="light" pointSize="32"/>
|
||||
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="метро" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="AnD-rO-bOm">
|
||||
<rect key="frame" x="0.0" y="46.333333333333314" width="145.66666666666666" height="19.333333333333329"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="16"/>
|
||||
<color key="textColor" red="1" green="1" blue="1" alpha="0.54000000000000004" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="direction_mini" translatesAutoresizingMaskIntoConstraints="NO" id="yQx-g1-ALQ">
|
||||
<rect key="frame" x="-7.3333333333333428" y="97.666666666666686" width="160" height="160"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="260" id="DPQ-m6-2rE"/>
|
||||
<constraint firstAttribute="width" constant="160" id="Itv-S8-i8O"/>
|
||||
<constraint firstAttribute="height" constant="160" id="Lqf-lc-Q24"/>
|
||||
<constraint firstAttribute="width" constant="260" id="mLL-K1-KUx"/>
|
||||
</constraints>
|
||||
<variation key="default">
|
||||
<mask key="constraints">
|
||||
<exclude reference="DPQ-m6-2rE"/>
|
||||
<exclude reference="mLL-K1-KUx"/>
|
||||
</mask>
|
||||
</variation>
|
||||
<variation key="heightClass=regular-widthClass=regular" image="direction_big">
|
||||
<mask key="constraints">
|
||||
<include reference="DPQ-m6-2rE"/>
|
||||
<exclude reference="Itv-S8-i8O"/>
|
||||
<exclude reference="Lqf-lc-Q24"/>
|
||||
<include reference="mLL-K1-KUx"/>
|
||||
</mask>
|
||||
</variation>
|
||||
</imageView>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="749" text="200" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Dty-4K-t4Q" propertyAccessControl="none">
|
||||
<rect key="frame" x="44" y="289.66666666666663" width="57.333333333333343" height="38.333333333333314"/>
|
||||
<fontDescription key="fontDescription" type="system" weight="light" pointSize="32"/>
|
||||
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
</subviews>
|
||||
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<constraints>
|
||||
<constraint firstItem="AnD-rO-bOm" firstAttribute="leading" secondItem="yXW-1V-PEL" secondAttribute="leading" id="31W-qL-IEa"/>
|
||||
<constraint firstItem="yQx-g1-ALQ" firstAttribute="top" secondItem="AnD-rO-bOm" secondAttribute="bottom" constant="32" id="3OY-Ra-BkM"/>
|
||||
<constraint firstItem="mMN-to-Xnd" firstAttribute="top" secondItem="yXW-1V-PEL" secondAttribute="top" id="8kg-GW-rzb"/>
|
||||
<constraint firstAttribute="trailing" secondItem="mMN-to-Xnd" secondAttribute="trailing" id="GfH-sE-U19"/>
|
||||
<constraint firstItem="Dty-4K-t4Q" firstAttribute="centerX" secondItem="yXW-1V-PEL" secondAttribute="centerX" id="Htg-sT-i06"/>
|
||||
<constraint firstItem="mMN-to-Xnd" firstAttribute="leading" secondItem="yQx-g1-ALQ" secondAttribute="trailing" constant="40" id="Ien-Fu-Zsx"/>
|
||||
<constraint firstItem="Dty-4K-t4Q" firstAttribute="top" secondItem="yQx-g1-ALQ" secondAttribute="bottom" constant="80" id="Ode-yk-1hC"/>
|
||||
<constraint firstAttribute="trailing" secondItem="mMN-to-Xnd" secondAttribute="trailing" id="PS8-J1-Ejw"/>
|
||||
<constraint firstItem="Dty-4K-t4Q" firstAttribute="leading" secondItem="AnD-rO-bOm" secondAttribute="leading" id="RXz-0g-mBe"/>
|
||||
<constraint firstItem="AnD-rO-bOm" firstAttribute="centerX" secondItem="yXW-1V-PEL" secondAttribute="centerX" id="SNX-wh-gXF"/>
|
||||
<constraint firstItem="yQx-g1-ALQ" firstAttribute="centerY" secondItem="yXW-1V-PEL" secondAttribute="centerY" id="TRr-fs-ngi"/>
|
||||
<constraint firstItem="Dty-4K-t4Q" firstAttribute="top" secondItem="yQx-g1-ALQ" secondAttribute="bottom" constant="32" id="YwQ-Oo-qlI"/>
|
||||
<constraint firstAttribute="trailing" secondItem="AnD-rO-bOm" secondAttribute="trailing" id="ax9-hz-vY8"/>
|
||||
<constraint firstItem="yQx-g1-ALQ" firstAttribute="top" secondItem="AnD-rO-bOm" secondAttribute="bottom" constant="80" id="c6v-le-4cJ"/>
|
||||
<constraint firstItem="yQx-g1-ALQ" firstAttribute="centerX" secondItem="yXW-1V-PEL" secondAttribute="centerX" id="nch-yT-8QH"/>
|
||||
<constraint firstItem="AnD-rO-bOm" firstAttribute="top" secondItem="mMN-to-Xnd" secondAttribute="bottom" constant="12" id="q2a-dg-BlX"/>
|
||||
<constraint firstAttribute="bottom" secondItem="Dty-4K-t4Q" secondAttribute="bottom" id="s21-Ou-6RT"/>
|
||||
<constraint firstItem="AnD-rO-bOm" firstAttribute="top" secondItem="mMN-to-Xnd" secondAttribute="bottom" constant="8" id="vHI-bP-i2E"/>
|
||||
<constraint firstItem="Dty-4K-t4Q" firstAttribute="top" secondItem="AnD-rO-bOm" secondAttribute="bottom" constant="24" id="vc5-pN-Pif"/>
|
||||
<constraint firstItem="yQx-g1-ALQ" firstAttribute="leading" secondItem="yXW-1V-PEL" secondAttribute="leading" id="wZx-W2-VNr"/>
|
||||
<constraint firstAttribute="trailing" secondItem="AnD-rO-bOm" secondAttribute="trailing" id="xD1-Og-f6n"/>
|
||||
<constraint firstItem="AnD-rO-bOm" firstAttribute="leading" secondItem="mMN-to-Xnd" secondAttribute="leading" id="xyV-hl-wt9"/>
|
||||
<constraint firstItem="mMN-to-Xnd" firstAttribute="leading" secondItem="yXW-1V-PEL" secondAttribute="leading" id="zHl-6e-hKr"/>
|
||||
</constraints>
|
||||
<variation key="default">
|
||||
<mask key="constraints">
|
||||
<exclude reference="Ien-Fu-Zsx"/>
|
||||
<exclude reference="PS8-J1-Ejw"/>
|
||||
<exclude reference="zHl-6e-hKr"/>
|
||||
<exclude reference="31W-qL-IEa"/>
|
||||
<exclude reference="SNX-wh-gXF"/>
|
||||
<exclude reference="ax9-hz-vY8"/>
|
||||
<exclude reference="q2a-dg-BlX"/>
|
||||
<exclude reference="xD1-Og-f6n"/>
|
||||
<exclude reference="xyV-hl-wt9"/>
|
||||
<exclude reference="TRr-fs-ngi"/>
|
||||
<exclude reference="c6v-le-4cJ"/>
|
||||
<exclude reference="wZx-W2-VNr"/>
|
||||
<exclude reference="Htg-sT-i06"/>
|
||||
<exclude reference="Ode-yk-1hC"/>
|
||||
<exclude reference="RXz-0g-mBe"/>
|
||||
<exclude reference="vc5-pN-Pif"/>
|
||||
</mask>
|
||||
</variation>
|
||||
<variation key="heightClass=compact">
|
||||
<mask key="constraints">
|
||||
<include reference="Ien-Fu-Zsx"/>
|
||||
<include reference="xD1-Og-f6n"/>
|
||||
<include reference="xyV-hl-wt9"/>
|
||||
<exclude reference="3OY-Ra-BkM"/>
|
||||
<include reference="TRr-fs-ngi"/>
|
||||
<exclude reference="nch-yT-8QH"/>
|
||||
<include reference="wZx-W2-VNr"/>
|
||||
<include reference="RXz-0g-mBe"/>
|
||||
<exclude reference="YwQ-Oo-qlI"/>
|
||||
<include reference="vc5-pN-Pif"/>
|
||||
</mask>
|
||||
</variation>
|
||||
<variation key="heightClass=regular">
|
||||
<mask key="constraints">
|
||||
<include reference="PS8-J1-Ejw"/>
|
||||
<include reference="zHl-6e-hKr"/>
|
||||
<include reference="SNX-wh-gXF"/>
|
||||
<include reference="ax9-hz-vY8"/>
|
||||
<include reference="Htg-sT-i06"/>
|
||||
</mask>
|
||||
</variation>
|
||||
<variation key="heightClass=regular-widthClass=compact">
|
||||
<mask key="constraints">
|
||||
<include reference="31W-qL-IEa"/>
|
||||
</mask>
|
||||
</variation>
|
||||
<variation key="heightClass=regular-widthClass=regular">
|
||||
<mask key="constraints">
|
||||
<include reference="q2a-dg-BlX"/>
|
||||
<exclude reference="vHI-bP-i2E"/>
|
||||
<exclude reference="3OY-Ra-BkM"/>
|
||||
<include reference="c6v-le-4cJ"/>
|
||||
<include reference="Ode-yk-1hC"/>
|
||||
<exclude reference="YwQ-Oo-qlI"/>
|
||||
</mask>
|
||||
</variation>
|
||||
</view>
|
||||
</subviews>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.89824493838028174" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<gestureRecognizers/>
|
||||
<constraints>
|
||||
<constraint firstItem="yXW-1V-PEL" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="centerY" id="4E6-bS-m07"/>
|
||||
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="yXW-1V-PEL" secondAttribute="trailing" constant="40" id="99u-oH-BKQ"/>
|
||||
<constraint firstItem="yXW-1V-PEL" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="DQR-jC-ais"/>
|
||||
<constraint firstItem="yXW-1V-PEL" firstAttribute="top" relation="greaterThanOrEqual" secondItem="iN0-l3-epB" secondAttribute="top" constant="40" id="naI-CL-ySn"/>
|
||||
<constraint firstItem="yXW-1V-PEL" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="iN0-l3-epB" secondAttribute="leading" constant="40" id="phe-dZ-nRc"/>
|
||||
<constraint firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="yXW-1V-PEL" secondAttribute="bottom" constant="40" id="q7Y-mD-MX3"/>
|
||||
</constraints>
|
||||
<connections>
|
||||
<outlet property="contentView" destination="yXW-1V-PEL" id="0aM-CO-ndr"/>
|
||||
<outlet property="directionArrow" destination="yQx-g1-ALQ" id="60a-Lr-OyJ"/>
|
||||
<outlet property="distanceLabel" destination="Dty-4K-t4Q" id="CZu-VQ-R6X"/>
|
||||
<outlet property="titleLabel" destination="mMN-to-Xnd" id="M5A-9k-lvB"/>
|
||||
<outlet property="typeLabel" destination="AnD-rO-bOm" id="r3h-vk-AKk"/>
|
||||
<outletCollection property="gestureRecognizers" destination="jon-c0-OXb" appends="YES" id="rIw-dp-vZt"/>
|
||||
</connections>
|
||||
<point key="canvasLocation" x="140.625" y="153.62318840579712"/>
|
||||
</view>
|
||||
<tapGestureRecognizer id="jon-c0-OXb">
|
||||
<connections>
|
||||
<action selector="onTap:" destination="iN0-l3-epB" id="oCQ-ok-hyw"/>
|
||||
</connections>
|
||||
</tapGestureRecognizer>
|
||||
</objects>
|
||||
<resources>
|
||||
<image name="direction_big" width="260" height="260"/>
|
||||
<image name="direction_mini" width="160" height="160"/>
|
||||
</resources>
|
||||
</document>
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
#import <UIKit/UIKit.h>
|
||||
|
||||
@class MWMPlacePageViewManager;
|
||||
|
||||
@interface MWMDirectionView : UIView
|
||||
|
||||
@property (weak, nonatomic) IBOutlet UILabel * titleLabel;
|
||||
@property (weak, nonatomic) IBOutlet UILabel * typeLabel;
|
||||
@property (weak, nonatomic) IBOutlet UILabel * distanceLabel;
|
||||
@property (weak, nonatomic) IBOutlet UIImageView * directionArrow;
|
||||
@property (weak, nonatomic) IBOutlet UIView * contentView;
|
||||
|
||||
- (void)setDirectionArrowTransform:(CGAffineTransform)transform;
|
||||
|
||||
- (void)show;
|
||||
|
||||
- (instancetype)initWithCoder:(NSCoder *)aDecoder __attribute__((unavailable("initWithCoder is not available")));
|
||||
- (instancetype)initWithFrame:(CGRect)frame __attribute__((unavailable("initWithFrame is not available")));
|
||||
|
||||
@end
|
||||
|
|
@ -1,157 +0,0 @@
|
|||
#import "MWMDirectionView.h"
|
||||
#import "MWMMapViewControlsManager.h"
|
||||
#import "MapViewController.h"
|
||||
#import "MapsAppDelegate.h"
|
||||
|
||||
static NSString * const kDirectionViewNibName = @"MWMDirectionView";
|
||||
static CGFloat const kDirectionArrowSide = IPAD ? 260. : 160.;
|
||||
|
||||
@interface MWMDirectionView ()
|
||||
|
||||
@property (nonatomic) CGSize defaultSize;
|
||||
|
||||
@end
|
||||
|
||||
@implementation MWMDirectionView
|
||||
|
||||
- (instancetype)init
|
||||
{
|
||||
self = [NSBundle.mainBundle loadNibNamed:kDirectionViewNibName owner:nil options:nil].firstObject;
|
||||
[self setup];
|
||||
return self;
|
||||
}
|
||||
|
||||
- (void)setup
|
||||
{
|
||||
self.directionArrow.size = CGSizeMake(kDirectionArrowSide, kDirectionArrowSide);
|
||||
self.directionArrow.image = [UIImage imageNamed:IPAD ? @"direction_big" : @"direction_mini"];
|
||||
|
||||
self.distanceLabel.font = IPAD ? [UIFont regular52] : [UIFont regular32];
|
||||
self.typeLabel.font = IPAD ? [UIFont regular24] : [UIFont regular16];
|
||||
|
||||
self.autoresizingMask = self.contentView.autoresizingMask = UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
|
||||
self.directionArrow.autoresizingMask = UIViewAutoresizingNone;
|
||||
}
|
||||
|
||||
- (void)show
|
||||
{
|
||||
UIView * superview = [MapsAppDelegate theApp].mapViewController.controlsView;
|
||||
[superview addSubview:self];
|
||||
[superview endEditing:YES];
|
||||
[self setNeedsLayout];
|
||||
}
|
||||
|
||||
- (void)didMoveToSuperview
|
||||
{
|
||||
[super didMoveToSuperview];
|
||||
|
||||
MapsAppDelegate * app = [MapsAppDelegate theApp];
|
||||
|
||||
MWMMapViewControlsManager * manager = [MWMMapViewControlsManager manager];
|
||||
|
||||
if (self.superview)
|
||||
{
|
||||
[app disableStandby];
|
||||
manager.isDirectionViewHidden = NO;
|
||||
}
|
||||
else
|
||||
{
|
||||
[app enableStandby];
|
||||
manager.isDirectionViewHidden = YES;
|
||||
}
|
||||
|
||||
[app.mapViewController updateStatusBarStyle];
|
||||
}
|
||||
|
||||
- (void)layoutSubviews
|
||||
{
|
||||
UIView * superview = self.superview;
|
||||
self.frame = superview.bounds;
|
||||
CGSize const size = self.superview.size;
|
||||
self.size = size;
|
||||
CGFloat const minimumBorderOffset = 40.;
|
||||
BOOL const isLandscape = size.width > size.height;
|
||||
if (isLandscape)
|
||||
{
|
||||
CGFloat const defaultWidth = size.width - 2. * minimumBorderOffset - kDirectionArrowSide;
|
||||
[self resizeTitleWithWidth:defaultWidth];
|
||||
[self resizeTypeAndDistanceWithWidth:defaultWidth];
|
||||
CGFloat const titleOffset = 8.;
|
||||
CGFloat const typeOffset = 24.;
|
||||
CGFloat const arrowOffset = 24.;
|
||||
CGFloat const contentViewHeight = size.height - 2. * minimumBorderOffset;
|
||||
CGFloat const contentViewOffset = (size.width - self.titleLabel.width - minimumBorderOffset - self.directionArrow.width) / 2.;
|
||||
CGFloat const contentViewWidth = self.titleLabel.width + minimumBorderOffset + self.directionArrow.width;
|
||||
self.contentView.frame = CGRectMake(contentViewOffset, minimumBorderOffset, contentViewWidth, contentViewHeight);
|
||||
self.directionArrow.center = CGPointMake(arrowOffset + kDirectionArrowSide / 2., self.contentView.height / 2.);
|
||||
CGFloat const directionArrowOffsetX = self.directionArrow.maxX + minimumBorderOffset;
|
||||
CGFloat const actualLabelsBlockHeight = self.titleLabel.height + titleOffset + self.typeLabel.height + typeOffset + self.distanceLabel.height;
|
||||
CGFloat const labelsBlockTopOffset = (contentViewHeight - actualLabelsBlockHeight) / 2.;
|
||||
self.titleLabel.origin = CGPointMake(directionArrowOffsetX, labelsBlockTopOffset);
|
||||
self.titleLabel.textAlignment = NSTextAlignmentLeft;
|
||||
self.typeLabel.origin = CGPointMake(directionArrowOffsetX, self.titleLabel.maxY + titleOffset);
|
||||
self.typeLabel.textAlignment = NSTextAlignmentLeft;
|
||||
self.distanceLabel.origin = CGPointMake(directionArrowOffsetX, self.typeLabel.maxY + typeOffset);
|
||||
self.distanceLabel.textAlignment = NSTextAlignmentLeft;
|
||||
}
|
||||
else
|
||||
{
|
||||
CGFloat const defaultWidth = size.width - 2. * minimumBorderOffset;
|
||||
[self resizeTitleWithWidth:defaultWidth];
|
||||
[self resizeTypeAndDistanceWithWidth:defaultWidth];
|
||||
CGFloat const titleOffset = IPAD ? 12. : 8.;
|
||||
CGFloat const arrowOffset = IPAD ? 80. : 32.;
|
||||
CGFloat const contentViewActualHeight = self.titleLabel.height + titleOffset + self.typeLabel.height + 2. * arrowOffset + kDirectionArrowSide + self.distanceLabel.height;
|
||||
CGFloat const contentViewSize = size.height > contentViewActualHeight ? contentViewActualHeight : size.height;
|
||||
CGFloat const yOffset = (size.height - contentViewSize) / 2.;
|
||||
self.contentView.frame = CGRectMake(minimumBorderOffset, yOffset, defaultWidth, contentViewSize);
|
||||
CGFloat const xOffset = self.contentView.width / 2.;
|
||||
self.titleLabel.origin = CGPointMake(xOffset - self.titleLabel.width / 2., 0.);
|
||||
self.titleLabel.textAlignment = NSTextAlignmentCenter;
|
||||
self.typeLabel.origin = CGPointMake(xOffset - self.typeLabel.width / 2., self.titleLabel.maxY + titleOffset);
|
||||
self.typeLabel.textAlignment = NSTextAlignmentCenter;
|
||||
self.directionArrow.center = CGPointMake(xOffset, self.typeLabel.maxY + arrowOffset + kDirectionArrowSide / 2.);
|
||||
self.distanceLabel.origin = CGPointMake(xOffset - self.distanceLabel.width / 2., self.directionArrow.maxY + arrowOffset);
|
||||
self.distanceLabel.textAlignment = NSTextAlignmentCenter;
|
||||
}
|
||||
}
|
||||
|
||||
- (void)resizeTitleWithWidth:(CGFloat)width
|
||||
{
|
||||
CGFloat const fontSize = IPAD ? 52.0 : 32.0;
|
||||
CGFloat const minFontSize = IPAD ? 24.0 : 16.0;
|
||||
CGSize const superviewSize = self.superview.size;
|
||||
BOOL const isLandscape = superviewSize.width > superviewSize.height;
|
||||
CGFloat const minHeight = (isLandscape ? 0.6 : 0.3) * superviewSize.height;
|
||||
UIFont * font = self.distanceLabel.font;
|
||||
UILabel * label = self.titleLabel;
|
||||
for (CGFloat size = fontSize; size >= minFontSize; size -= 1.0)
|
||||
{
|
||||
label.font = [font fontWithSize:size];
|
||||
label.width = width;
|
||||
[label sizeToFit];
|
||||
if (label.height <= minHeight)
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
- (void)resizeTypeAndDistanceWithWidth:(CGFloat)width
|
||||
{
|
||||
self.typeLabel.width = self.distanceLabel.width = width;
|
||||
[self.typeLabel sizeToFit];
|
||||
[self.distanceLabel sizeToFit];
|
||||
}
|
||||
|
||||
- (void)setDirectionArrowTransform:(CGAffineTransform)transform
|
||||
{
|
||||
self.directionArrow.transform = transform;
|
||||
}
|
||||
|
||||
- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event
|
||||
{
|
||||
// Prevent super call to stop event propagation
|
||||
// [super touchesBegan:touches withEvent:event];
|
||||
[self removeFromSuperview];
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
@ -1,63 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" colorMatched="YES">
|
||||
<device id="retina4_7" orientation="portrait">
|
||||
<adaptation id="fullscreen"/>
|
||||
</device>
|
||||
<dependencies>
|
||||
<deployment identifier="iOS"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
|
||||
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
|
||||
</dependencies>
|
||||
<objects>
|
||||
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
|
||||
<view contentMode="scaleToFill" id="hge-yy-9dK" customClass="MWMDirectionView" propertyAccessControl="all">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
|
||||
<subviews>
|
||||
<view autoresizesSubviews="NO" contentMode="scaleToFill" id="pOG-zF-o2a">
|
||||
<rect key="frame" x="40" y="120" width="240" height="328"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
|
||||
<subviews>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Аэропорт" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="6QE-ZP-1Wz">
|
||||
<rect key="frame" x="0.0" y="0.0" width="240" height="35"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
|
||||
<fontDescription key="fontDescription" type="system" weight="light" pointSize="32"/>
|
||||
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="метро" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="pJJ-Om-WmO">
|
||||
<rect key="frame" x="0.0" y="41" width="240" height="21"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="16"/>
|
||||
<color key="textColor" red="1" green="1" blue="1" alpha="0.54000000000000004" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="izl-Ei-GSs">
|
||||
<rect key="frame" x="50" y="297" width="140" height="31"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
|
||||
<fontDescription key="fontDescription" type="system" weight="light" pointSize="32"/>
|
||||
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" id="GxV-GV-jxj">
|
||||
<rect key="frame" x="40" y="84" width="160" height="160"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
|
||||
</imageView>
|
||||
</subviews>
|
||||
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
</view>
|
||||
</subviews>
|
||||
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.90000000000000002" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<gestureRecognizers/>
|
||||
<connections>
|
||||
<outlet property="contentView" destination="pOG-zF-o2a" id="WLr-CK-VBZ"/>
|
||||
<outlet property="directionArrow" destination="GxV-GV-jxj" id="aJc-nx-gQO"/>
|
||||
<outlet property="distanceLabel" destination="izl-Ei-GSs" id="I3d-IM-XhG"/>
|
||||
<outlet property="titleLabel" destination="6QE-ZP-1Wz" id="ywn-Qi-Mhf"/>
|
||||
<outlet property="typeLabel" destination="pJJ-Om-WmO" id="9kH-tO-qTP"/>
|
||||
</connections>
|
||||
<point key="canvasLocation" x="360" y="226"/>
|
||||
</view>
|
||||
</objects>
|
||||
</document>
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="bX8-ZQ-XDA">
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="bX8-ZQ-XDA">
|
||||
<device id="retina4_7" orientation="portrait" appearance="light"/>
|
||||
<dependencies>
|
||||
<deployment identifier="iOS"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
|
||||
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
|
||||
<capability name="Stack View standard spacing" minToolsVersion="9.0"/>
|
||||
<capability name="collection view cell content view" minToolsVersion="11.0"/>
|
||||
|
|
@ -176,7 +176,7 @@
|
|||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<view hidden="YES" contentMode="scaleToFill" horizontalHuggingPriority="1000" horizontalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="jaa-Yj-XQR" customClass="DirectionView" customModule="maps_me" customModuleProvider="target">
|
||||
<view hidden="YES" contentMode="scaleToFill" horizontalHuggingPriority="1000" horizontalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="jaa-Yj-XQR" customClass="PlacePageDirectionView" customModule="maps_me" customModuleProvider="target">
|
||||
<rect key="frame" x="0.0" y="0.0" width="70" height="50"/>
|
||||
<subviews>
|
||||
<imageView autoresizesSubviews="NO" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_direction_light" translatesAutoresizingMaskIntoConstraints="NO" id="4kK-Rj-36V">
|
||||
|
|
@ -211,9 +211,11 @@
|
|||
<connections>
|
||||
<outlet property="imageView" destination="4kK-Rj-36V" id="V47-aw-ghM"/>
|
||||
<outlet property="label" destination="rA0-Ik-tcS" id="42G-Eg-nG5"/>
|
||||
<outletCollection property="gestureRecognizers" destination="AFh-Ap-6Aj" appends="YES" id="zAl-MD-vmQ"/>
|
||||
</connections>
|
||||
</view>
|
||||
</subviews>
|
||||
<gestureRecognizers/>
|
||||
<edgeInsets key="layoutMargins" top="0.0" left="12" bottom="0.0" right="12"/>
|
||||
</stackView>
|
||||
<stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fKt-f3-qqN">
|
||||
|
|
@ -243,7 +245,7 @@
|
|||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackPrimaryText"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<view hidden="YES" contentMode="scaleToFill" horizontalHuggingPriority="1000" horizontalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="y54-Rh-kGm" customClass="DirectionView" customModule="maps_me" customModuleProvider="target">
|
||||
<view hidden="YES" contentMode="scaleToFill" horizontalHuggingPriority="1000" horizontalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="y54-Rh-kGm" customClass="PlacePageDirectionView" customModule="maps_me" customModuleProvider="target">
|
||||
<rect key="frame" x="0.0" y="0.0" width="70" height="50"/>
|
||||
<subviews>
|
||||
<imageView autoresizesSubviews="NO" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_direction_light" translatesAutoresizingMaskIntoConstraints="NO" id="cGR-t8-OJR">
|
||||
|
|
@ -278,6 +280,7 @@
|
|||
<connections>
|
||||
<outlet property="imageView" destination="cGR-t8-OJR" id="Cac-AL-9xs"/>
|
||||
<outlet property="label" destination="b5Y-rz-Slv" id="sh4-ay-ktt"/>
|
||||
<outletCollection property="gestureRecognizers" destination="q8Z-W5-IfT" appends="YES" id="H82-UF-dSo"/>
|
||||
</connections>
|
||||
</view>
|
||||
</subviews>
|
||||
|
|
@ -449,6 +452,16 @@
|
|||
</connections>
|
||||
</viewController>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="KiS-ML-wAV" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
|
||||
<tapGestureRecognizer id="AFh-Ap-6Aj">
|
||||
<connections>
|
||||
<action selector="onDirectionPressed:" destination="76G-o4-sUY" id="FWE-0i-329"/>
|
||||
</connections>
|
||||
</tapGestureRecognizer>
|
||||
<tapGestureRecognizer id="q8Z-W5-IfT">
|
||||
<connections>
|
||||
<action selector="onDirectionPressed:" destination="76G-o4-sUY" id="Ebd-8k-DhB"/>
|
||||
</connections>
|
||||
</tapGestureRecognizer>
|
||||
</objects>
|
||||
<point key="canvasLocation" x="929" y="-958"/>
|
||||
</scene>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue