RedAuburn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[ios] refactor the PP's header and add the share button

Browse source 
- increase grabber size
- move the share button to the PP's and Layers header trailing-top corner
- add a new color for the close/share icons on the pp
- crate a new button class with rounded image
Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>
This commit is contained in:
Kiryl Kaveryn 2024-07-03 23:19:52 +04:00 • committed by Roman Tsisyk
parent 7b1365af4b
commit 43c46beb0f
16 changed files with 145 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
iphone/Maps/Core/Theme/Colors.swift
View file

@ -59,6 +59,8 @@ class DayColors: IColors {
var outdoorColor = UIColor(red: 0.235, green: 0.549, blue: 0.235, alpha: 1)
var lonelyPlanetLogoColor = UIColor(red: 0, green: 0.286, blue: 0.565, alpha: 1)
var carplayPlaceholderBackground = UIColor(221, 221, 205, alpha100)
var iconOpaqueGrayTint = UIColor(117, 117, 117, alpha100)
var iconOpaqueGrayBackground = UIColor(231, 231, 231, alpha100)
}
class NightColors: IColors {
@ -122,4 +124,6 @@ class NightColors: IColors {
var outdoorColor = UIColor(147, 191, 57, alpha100)
var lonelyPlanetLogoColor = UIColor(red: 1, green: 1, blue: 1, alpha: 0.7)
var carplayPlaceholderBackground = UIColor(50, 54, 58, alpha100)
var iconOpaqueGrayTint = UIColor(197, 197, 197, alpha100)
var iconOpaqueGrayBackground = UIColor(84, 86, 90, alpha100)
}

2
iphone/Maps/Core/Theme/Components/IColors.swift
View file

@ -69,4 +69,6 @@ let alpha100: CGFloat = 1.0
var outdoorColor: UIColor { get }
var lonelyPlanetLogoColor: UIColor { get }
var carplayPlaceholderBackground: UIColor { get }
var iconOpaqueGrayTint: UIColor { get }
var iconOpaqueGrayBackground: UIColor { get }
}

5
iphone/Maps/Core/Theme/PlacePageStyleSheet.swift
View file

@ -111,8 +111,9 @@ class PlacePageStyleSheet: IStyleSheet {
s.clip = true
}
theme.add(styleName: "PPCloseButton") { (s) -> (Void) in
s.tintColor = colors.blackDividers
theme.add(styleName: "PPHeaderCircleIcon") { (s) -> (Void) in
s.tintColor = colors.iconOpaqueGrayTint
s.backgroundColor = colors.iconOpaqueGrayBackground
}
theme.add(styleName: "ChartView") { (s) -> (Void) in

4
iphone/Maps/Maps.xcodeproj/project.pbxproj
View file

@ -485,6 +485,7 @@
ED79A5D72BDF8D6100952D1F /* SynchronizationStateManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED79A5CF2BDF8D6100952D1F /* SynchronizationStateManager.swift */; };
ED79A5D82BDF8D6100952D1F /* DefaultLocalDirectoryMonitor.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED79A5D02BDF8D6100952D1F /* DefaultLocalDirectoryMonitor.swift */; };
ED7CCC4F2C1362E300E2A737 /* FileType.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED7CCC4E2C1362E300E2A737 /* FileType.swift */; };
ED808D0F2C38407800D52585 /* CircleImageButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED808D0E2C38407800D52585 /* CircleImageButton.swift */; };
ED8270F02C2071A3005966DA /* SettingsTableViewDetailedSwitchCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED8270EF2C2071A3005966DA /* SettingsTableViewDetailedSwitchCell.swift */; };
ED9857082C4ED02D00694F6C /* MailComposer.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED9857072C4ED02D00694F6C /* MailComposer.swift */; };
ED9966802B94FBC20083CE55 /* ColorPicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED99667D2B94FBC20083CE55 /* ColorPicker.swift */; };
@ -1404,6 +1405,7 @@
ED79A5CF2BDF8D6100952D1F /* SynchronizationStateManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SynchronizationStateManager.swift; sourceTree = "<group>"; };
ED79A5D02BDF8D6100952D1F /* DefaultLocalDirectoryMonitor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DefaultLocalDirectoryMonitor.swift; sourceTree = "<group>"; };
ED7CCC4E2C1362E300E2A737 /* FileType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileType.swift; sourceTree = "<group>"; };
ED808D0E2C38407800D52585 /* CircleImageButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CircleImageButton.swift; sourceTree = "<group>"; };
ED8270EF2C2071A3005966DA /* SettingsTableViewDetailedSwitchCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsTableViewDetailedSwitchCell.swift; sourceTree = "<group>"; };
ED9857072C4ED02D00694F6C /* MailComposer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MailComposer.swift; sourceTree = "<group>"; };
ED99667D2B94FBC20083CE55 /* ColorPicker.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ColorPicker.swift; sourceTree = "<group>"; };
@ -2943,6 +2945,7 @@
99C964252428C0F700E41723 /* PlacePageHeaderViewController.swift */,
99C964262428C0F700E41723 /* PlacePageHeaderBuilder.swift */,
99C9642F2428C27A00E41723 /* PlacePageHeaderView.swift */,
ED808D0E2C38407800D52585 /* CircleImageButton.swift */,
);
path = PlacePageHeader;
sourceTree = "<group>";
@ -4503,6 +4506,7 @@
FA8E808925F412E2002A1434 /* FirstSession.mm in Sources */,
F6E2FF691E097BA00083EBEC /* MWMUnitsController.mm in Sources */,
6741AA031BF340DE002C974C /* MWMActivityViewController.mm in Sources */,
ED808D0F2C38407800D52585 /* CircleImageButton.swift in Sources */,
CDCA27382237F1BD00167D87 /* BookmarkInfo.swift in Sources */,
993DF11A23F6BDB100AC231A /* UIBarButtonItemRenderer.swift in Sources */,
34AB668C1FC5AA330078E451 /* NavigationStreetNameView.swift in Sources */,

14
iphone/Maps/UI/BottomMenu/Menu/BottomMenuInteractor.swift
View file

@ -4,7 +4,6 @@ protocol BottomMenuInteractorProtocol: AnyObject {
func downloadMaps()
func donate()
func openSettings()
func shareLocation(cell: BottomMenuItemCell)
}
@objc protocol BottomMenuDelegate {
@ -61,17 +60,4 @@ extension BottomMenuInteractor: BottomMenuInteractorProtocol {
close()
mapViewController?.performSegue(withIdentifier: "Map2Settings", sender: nil)
}
func shareLocation(cell: BottomMenuItemCell) {
let lastLocation = LocationManager.lastLocation()
guard let coordinates = lastLocation?.coordinate else {
let alert = UIAlertController(title: L("unknown_current_position"), message: nil, preferredStyle: .alert)
alert.addAction(UIAlertAction(title: L("ok"), style: .default, handler: nil))
viewController?.present(alert, animated: true, completion: nil)
return;
}
guard let viewController = viewController else { return }
let vc = ActivityViewController.share(forMyPosition: coordinates)
vc?.present(inParentViewController: viewController, anchorView: cell.anchorView)
}
}

10
iphone/Maps/UI/BottomMenu/Menu/BottomMenuPresenter.swift
View file

@ -8,7 +8,6 @@ class BottomMenuPresenter: NSObject {
case downloadMaps
case donate
case settings
case share
}
enum Sections: Int {
case layers
@ -80,11 +79,6 @@ extension BottomMenuPresenter {
title: L("settings"),
badgeCount: 0,
enabled: true)
case .share:
cell.configure(imageName: "ic_menu_share",
title: L("share_my_location"),
badgeCount: 0,
enabled: true)
}
return cell
}
@ -108,10 +102,6 @@ extension BottomMenuPresenter {
interactor.donate()
case .settings:
interactor.openSettings()
case .share:
if let cell = tableView.cellForRow(at: indexPath) as? BottomMenuItemCell {
interactor.shareLocation(cell: cell)
}
}
}
}

3
iphone/Maps/UI/BottomMenu/Menu/Cells/BottomMenuLayersCell.swift
View file

@ -1,6 +1,8 @@
import UIKit
class BottomMenuLayersCell: UITableViewCell {
@IBOutlet weak var closeButton: CircleImageButton!
@IBOutlet private var subwayButton: BottomMenuLayerButton! {
didSet {
updateSubwayButton()
@ -22,6 +24,7 @@ class BottomMenuLayersCell: UITableViewCell {
override func awakeFromNib() {
super.awakeFromNib()
MapOverlayManager.add(self)
closeButton.setImage(UIImage(named: "ic_close"))
}
deinit {

16
iphone/Maps/UI/BottomMenu/Menu/Cells/BottomMenuLayersCell.xib
View file

@ -3,7 +3,7 @@
<device id="ipad9_7" orientation="landscape" layout="fullscreen" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
@ -30,16 +30,12 @@
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="layers_title"/>
</userDefinedRuntimeAttributes>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2xW-dK-D9y">
<rect key="frame" x="294" y="10" width="30" height="30"/>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2xW-dK-D9y" customClass="CircleImageButton" customModule="Organic_Maps" customModuleProvider="target">
<rect key="frame" x="296" y="11" width="28" height="28"/>
<constraints>
<constraint firstAttribute="height" constant="30" id="BD2-bz-n13"/>
<constraint firstAttribute="width" constant="30" id="Thu-MY-dQm"/>
<constraint firstAttribute="height" constant="28" id="BD2-bz-n13"/>
<constraint firstAttribute="width" constant="28" id="Thu-MY-dQm" customClass="I"/>
</constraints>
<state key="normal" image="ic_clear_24"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="PPCloseButton"/>
</userDefinedRuntimeAttributes>
<connections>
<action selector="onCloseButtonPressed:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="8vd-Pg-Suh"/>
</connections>
@ -189,6 +185,7 @@
<constraint firstItem="njF-e1-oar" firstAttribute="leading" secondItem="75k-vD-FSR" secondAttribute="leading" id="nhe-Sa-Mlo"/>
</constraints>
<connections>
<outlet property="closeButton" destination="2xW-dK-D9y" id="RQI-hb-JpS"/>
<outlet property="isoLinesButton" destination="edA-Mo-3Vx" id="qoC-8w-EqY"/>
<outlet property="outdoorButton" destination="g13-pK-Eig" id="ib1-aw-Qv9"/>
<outlet property="subwayButton" destination="4US-fZ-cyg" id="eQB-HR-Wgl"/>
@ -200,6 +197,5 @@
<image name="btn_menu_isomaps" width="151" height="151"/>
<image name="btn_menu_outdoors" width="151" height="151"/>
<image name="btn_menu_subway" width="151" height="151"/>
<image name="ic_clear_24" width="20" height="20"/>
</resources>
</document>

5
iphone/Maps/UI/PlacePage/Components/ActionBarViewController.swift
View file

@ -151,10 +151,7 @@ class ActionBarViewController: UIViewController {
}
private func configButton4() {
if additionalButtons.isEmpty {
visibleButtons.append(.share)
} else {
additionalButtons.append(.share)
if !additionalButtons.isEmpty {
visibleButtons.append(.more)
}
}

52
iphone/Maps/UI/PlacePage/Components/PlacePageHeader/CircleImageButton.swift Normal file
View file

@ -0,0 +1,52 @@
final class CircleImageButton: UIButton {
private let circleImageView = UIImageView()
override init(frame: CGRect) {
super.init(frame: frame)
setupView()
}
@available(*, unavailable)
required init?(coder: NSCoder) {
super.init(coder: coder)
setupView()
}
override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
super.traitCollectionDidChange(previousTraitCollection)
if #available(iOS 13.0, *), traitCollection.hasDifferentColorAppearance(comparedTo: previousTraitCollection) {
circleImageView.applyTheme()
}
}
private func setupView() {
backgroundColor = .clear
circleImageView.styleName = "PPHeaderCircleIcon"
circleImageView.contentMode = .scaleAspectFill
circleImageView.clipsToBounds = true
circleImageView.isUserInteractionEnabled = false
circleImageView.layer.masksToBounds = true
circleImageView.translatesAutoresizingMaskIntoConstraints = false
addSubview(circleImageView)
let aspectRatioConstraint = circleImageView.widthAnchor.constraint(equalTo: circleImageView.heightAnchor)
aspectRatioConstraint.priority = .defaultHigh
NSLayoutConstraint.activate([
circleImageView.centerXAnchor.constraint(equalTo: centerXAnchor),
circleImageView.centerYAnchor.constraint(equalTo: centerYAnchor),
circleImageView.widthAnchor.constraint(lessThanOrEqualTo: widthAnchor),
circleImageView.heightAnchor.constraint(lessThanOrEqualTo: heightAnchor),
aspectRatioConstraint
])
}
override func layoutSubviews() {
super.layoutSubviews()
circleImageView.layer.cornerRadius = circleImageView.bounds.width / 2.0
}
func setImage(_ image: UIImage?) {
circleImageView.image = image
}
}

6
iphone/Maps/UI/PlacePage/Components/PlacePageHeader/PlacePageHeaderPresenter.swift
View file

@ -2,11 +2,13 @@ protocol PlacePageHeaderPresenterProtocol: AnyObject {
func configure()
func onClosePress()
func onExpandPress()
func onShareButtonPress(from sourceView: UIView)
}
protocol PlacePageHeaderViewControllerDelegate: AnyObject {
func previewDidPressClose()
func previewDidPressExpand()
func previewDidPressShare(from sourceView: UIView)
}
class PlacePageHeaderPresenter {
@ -51,4 +53,8 @@ extension PlacePageHeaderPresenter: PlacePageHeaderPresenterProtocol {
func onExpandPress() {
delegate?.previewDidPressExpand()
}
func onShareButtonPress(from sourceView: UIView) {
delegate?.previewDidPressShare(from: sourceView)
}
}

9
iphone/Maps/UI/PlacePage/Components/PlacePageHeader/PlacePageHeaderViewController.swift
View file

@ -15,6 +15,9 @@ class PlacePageHeaderViewController: UIViewController {
@IBOutlet private var shadowView: UIView!
@IBOutlet private var grabberView: UIView!
@IBOutlet weak var closeButton: CircleImageButton!
@IBOutlet weak var shareButton: CircleImageButton!
private var titleText: String?
private var secondaryText: String?
@ -27,6 +30,8 @@ class PlacePageHeaderViewController: UIViewController {
iPadSpecific { [weak self] in
self?.grabberView.isHidden = true
}
closeButton.setImage(UIImage(named: "ic_close")!)
shareButton.setImage(UIImage(named: "ic_share")!)
}
@objc func onExpandPressed(sender: UITapGestureRecognizer) {
@ -37,6 +42,10 @@ class PlacePageHeaderViewController: UIViewController {
presenter?.onClosePress()
}
@IBAction func onShareButtonPressed(_ sender: Any) {
presenter?.onShareButtonPress(from: shareButton)
}
override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
super.traitCollectionDidChange(previousTraitCollection)
guard traitCollection.userInterfaceStyle != previousTraitCollection?.userInterfaceStyle else { return }

81
iphone/Maps/UI/PlacePage/PlacePage.storyboard
View file

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" 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="32700.99.1234" 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="21679"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="Stack View standard spacing" minToolsVersion="9.0"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
@ -1403,14 +1403,14 @@
<scene sceneID="0yF-nr-ALU">
<objects>
<viewController storyboardIdentifier="ElevationProfileViewController" id="d1y-Na-lDm" customClass="ElevationProfileViewController" customModule="Organic_Maps" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="7Mx-au-yIa">
<view key="view" contentMode="scaleToFill" ambiguous="YES" id="7Mx-au-yIa">
<rect key="frame" x="0.0" y="0.0" width="375" height="319"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jKi-gT-ZfM">
<view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="jKi-gT-ZfM">
<rect key="frame" x="0.0" y="20" width="375" height="156"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jIS-0e-Ztd" customClass="ChartView" customModule="Chart">
<view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="jIS-0e-Ztd" customClass="ChartView" customModule="Chart">
<rect key="frame" x="16" y="0.0" width="343" height="156"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
</view>
@ -1424,7 +1424,7 @@
<constraint firstAttribute="height" constant="176" id="utH-YA-2pe"/>
</constraints>
</view>
<collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="Xc9-ED-V4K">
<collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" ambiguous="YES" scrollEnabled="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="Xc9-ED-V4K">
<rect key="frame" x="16" y="192" width="343" height="68"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
@ -1499,7 +1499,7 @@
</collectionViewCell>
</cells>
</collectionView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="250" text="Difficulty" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FIo-No-CbK">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="250" ambiguous="YES" text="Difficulty" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FIo-No-CbK">
<rect key="frame" x="16" y="281" width="68" height="20.5"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
@ -1509,7 +1509,7 @@
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/>
</userDefinedRuntimeAttributes>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bc9-z0-p88" customClass="DifficultyView" customModule="Organic_Maps" customModuleProvider="target">
<view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="bc9-z0-p88" customClass="DifficultyView" customModule="Organic_Maps" customModuleProvider="target">
<rect key="frame" x="91" y="287" width="40" height="10"/>
<color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
@ -1517,7 +1517,7 @@
<constraint firstAttribute="width" constant="40" id="Sor-5l-zjy"/>
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1h 10m" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dQJ-fW-QVh">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="1h 10m" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dQJ-fW-QVh">
<rect key="frame" x="301" y="281" width="58" height="20.5"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
<nil key="textColor"/>
@ -1526,7 +1526,7 @@
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="bold17:blackPrimaryText"/>
</userDefinedRuntimeAttributes>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Time:" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hoy-lg-Wl9">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Time:" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hoy-lg-Wl9">
<rect key="frame" x="249" y="280.5" width="43" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
@ -1536,13 +1536,13 @@
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium14:blackSecondaryText"/>
</userDefinedRuntimeAttributes>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="g6D-fD-0Ug">
<button opaque="NO" contentMode="scaleToFill" ambiguous="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="g6D-fD-0Ug">
<rect key="frame" x="133" y="276.5" width="30" height="30"/>
<connections>
<action selector="onExtendedDifficultyButtonPressed:" destination="d1y-Na-lDm" eventType="touchUpInside" id="4zH-m2-OSE"/>
</connections>
</button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="S1" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GPk-XR-oL1" customClass="InsetsLabel" customModule="Organic_Maps" customModuleProvider="target">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="S1" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GPk-XR-oL1" customClass="InsetsLabel" customModule="Organic_Maps" customModuleProvider="target">
<rect key="frame" x="138.5" y="281" width="19" height="20.5"/>
<color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
@ -1706,39 +1706,49 @@
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3HJ-WD-nF5" userLabel="Grabber">
<rect key="frame" x="175.5" y="16" width="24" height="4"/>
<rect key="frame" x="169.5" y="5" width="36" height="5"/>
<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"/>
<constraint firstAttribute="height" constant="5" id="nBr-SJ-QG9"/>
<constraint firstAttribute="width" constant="36" id="wI8-kZ-awL"/>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
<integer key="value" value="2"/>
<real key="value" value="2.5"/>
</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="17"/>
<rect key="frame" x="16" y="20" width="267" height="25"/>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="20"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" horizontalCompressionResistancePriority="1000" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yZT-ea-Kac">
<rect key="frame" x="333" y="12" width="30" height="30"/>
<button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" horizontalCompressionResistancePriority="1000" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yZT-ea-Kac" userLabel="Close Buton" customClass="CircleImageButton" customModule="Organic_Maps" customModuleProvider="target">
<rect key="frame" x="331" y="16" width="28" height="28"/>
<constraints>
<constraint firstAttribute="width" constant="30" id="IYz-Cb-KoJ"/>
<constraint firstAttribute="height" constant="30" id="Vhf-Uv-h3C"/>
<constraint firstAttribute="width" constant="28" id="IYz-Cb-KoJ"/>
<constraint firstAttribute="height" constant="28" id="Vhf-Uv-h3C"/>
</constraints>
<state key="normal" image="ic_clear_24"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="PPCloseButton"/>
</userDefinedRuntimeAttributes>
<fontDescription key="fontDescription" type="system" pointSize="18"/>
<color key="tintColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<connections>
<action selector="onCloseButtonPressed:" destination="aB1-Yk-7p4" eventType="touchUpInside" id="uaQ-Fr-c1K"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" horizontalCompressionResistancePriority="1000" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="apG-SB-14M" userLabel="Share Button" customClass="CircleImageButton" customModule="Organic_Maps" customModuleProvider="target">
<rect key="frame" x="293" y="16" width="28" height="28"/>
<constraints>
<constraint firstAttribute="width" constant="28" id="BGG-zy-6QM"/>
<constraint firstAttribute="height" constant="28" id="jQ6-ST-FeW"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="18"/>
<color key="tintColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<connections>
<action selector="onShareButtonPressed:" destination="aB1-Yk-7p4" eventType="touchUpInside" id="USe-Mw-cbA"/>
</connections>
</button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="DHT-jj-Idk">
<rect key="frame" x="0.0" y="51" width="375" height="1"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
@ -1752,23 +1762,25 @@
</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 firstItem="lR4-to-4wX" firstAttribute="firstBaseline" secondItem="yZT-ea-Kac" secondAttribute="bottom" constant="-5" id="6Qx-yE-NrV">
<variation key="heightClass=regular-widthClass=regular" constant="0.0"/>
</constraint>
<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="apG-SB-14M" firstAttribute="leading" secondItem="lR4-to-4wX" secondAttribute="trailing" constant="10" 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="3HJ-WD-nF5" firstAttribute="top" secondItem="fqh-H3-eji" secondAttribute="top" constant="5" 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 firstItem="yZT-ea-Kac" firstAttribute="top" secondItem="fqh-H3-eji" secondAttribute="top" constant="16" id="fKb-5I-FLD"/>
<constraint firstItem="yZT-ea-Kac" firstAttribute="leading" secondItem="apG-SB-14M" secondAttribute="trailing" constant="10" id="j5g-Vk-Yxu"/>
<constraint firstAttribute="bottom" secondItem="Gdy-g5-gbM" secondAttribute="bottom" id="jk7-BL-0eZ"/>
<constraint firstItem="apG-SB-14M" firstAttribute="centerY" secondItem="yZT-ea-Kac" secondAttribute="centerY" id="kpT-St-QOy"/>
<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"/>
<constraint firstAttribute="trailing" secondItem="yZT-ea-Kac" secondAttribute="trailing" constant="16" id="vhs-5f-yFk"/>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="PPHeaderView"/>
@ -1789,10 +1801,12 @@
</view>
<size key="freeformSize" width="375" height="72"/>
<connections>
<outlet property="closeButton" destination="yZT-ea-Kac" id="9QV-2E-Gg4"/>
<outlet property="expandView" destination="Gdy-g5-gbM" id="rzi-mb-hUi"/>
<outlet property="grabberView" destination="3HJ-WD-nF5" id="zG2-Fu-BAH"/>
<outlet property="headerView" destination="fqh-H3-eji" id="Z2K-Wd-hRO"/>
<outlet property="shadowView" destination="spW-XI-KSY" id="kLc-R7-Rij"/>
<outlet property="shareButton" destination="apG-SB-14M" id="pCj-pl-Oxa"/>
<outlet property="titleLabel" destination="lR4-to-4wX" id="l4F-JL-aNb"/>
<outlet property="view" destination="xTs-NP-HcT" id="jQF-X9-Xlv"/>
</connections>
@ -1805,21 +1819,20 @@
<resources>
<image name="dialog_btn_press" width="280" height="44"/>
<image name="ic_arrow_gray_down" width="28" height="28"/>
<image name="ic_clear_24" width="20" height="20"/>
<image name="ic_operator" width="28" height="28"/>
<image name="ic_placepage_open_hours" width="28" height="28"/>
<image name="img_direction_light" width="32" height="32"/>
<systemColor name="opaqueSeparatorColor">
<color red="0.77647058823529413" green="0.77647058823529413" blue="0.78431372549019607" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color red="0.77647058820000003" green="0.77647058820000003" blue="0.7843137255" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</systemColor>
<systemColor name="separatorColor">
<color red="0.23529411764705882" green="0.23529411764705882" blue="0.2627450980392157" alpha="0.28999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
<color red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.28999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
</systemColor>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
<systemColor name="systemRedColor">
<color red="1" green="0.23137254901960785" blue="0.18823529411764706" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color red="1" green="0.23137254900000001" blue="0.18823529410000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</systemColor>
</resources>
</document>

12
iphone/Maps/UI/PlacePage/PlacePageInteractor.swift
View file

@ -220,10 +220,6 @@ extension PlacePageInteractor: ActionBarViewControllerDelegate {
MWMPlacePageManagerHelper.routeRemoveStop(placePageData)
case .routeTo:
MWMPlacePageManagerHelper.route(to: placePageData)
case .share:
if let shareVC = ActivityViewController.share(forPlacePage: placePageData), let mvc = MapViewController.shared() {
shareVC.present(inParentViewController: mvc, anchorView: actionBar.popoverSourceView)
}
case .avoidToll:
MWMPlacePageManagerHelper.avoidToll()
case .avoidDirty:
@ -260,6 +256,14 @@ extension PlacePageInteractor: PlacePageHeaderViewControllerDelegate {
func previewDidPressExpand() {
presenter?.showNextStop()
}
func previewDidPressShare(from sourceView: UIView) {
guard let shareViewController = ActivityViewController.share(forPlacePage: placePageData), let mapViewController else {
LOG(.error, "Failed to instantiate ActivityViewController.")
return
}
shareViewController.present(inParentViewController: mapViewController, anchorView: sourceView)
}
}
// MARK: - BookmarksObserver

1
iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMActionBarButton.h
View file

@ -10,7 +10,6 @@ typedef NS_ENUM(NSInteger, MWMActionBarButtonType) {
MWMActionBarButtonTypeRouteFrom,
MWMActionBarButtonTypeRouteRemoveStop,
MWMActionBarButtonTypeRouteTo,
MWMActionBarButtonTypeShare,
MWMActionBarButtonTypeAvoidToll,
MWMActionBarButtonTypeAvoidDirty,
MWMActionBarButtonTypeAvoidFerry

5
iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMActionBarButton.m
View file

@ -22,8 +22,6 @@ NSString *titleForButton(MWMActionBarButtonType type, BOOL isSelected) {
return L(@"p2p_from_here");
case MWMActionBarButtonTypeRouteTo:
return L(@"p2p_to_here");
case MWMActionBarButtonTypeShare:
return L(@"share");
case MWMActionBarButtonTypeMore:
return L(@"placepage_more_button");
case MWMActionBarButtonTypeRouteAddStop:
@ -113,9 +111,6 @@ NSString *titleForButton(MWMActionBarButtonType type, BOOL isSelected) {
if ([self needsToHighlightRouteToButton])
self.button.coloring = MWMButtonColoringBlue;
break;
case MWMActionBarButtonTypeShare:
[self.button setImage:[UIImage imageNamed:@"ic_menu_share"] forState:UIControlStateNormal];
break;
case MWMActionBarButtonTypeMore:
[self.button setImage:[UIImage imageNamed:@"ic_placepage_more"] forState:UIControlStateNormal];
break;