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

[iOS] add new description section to bookmarks list

Browse source
This commit is contained in:
Aleksey Belousov 2020-10-06 18:47:05 +03:00 • committed by Alexander Boriskov
parent db26d6b632
commit 6f98f7f6eb
20 changed files with 677 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarkGroup.h
View file

@ -17,19 +17,20 @@ NS_SWIFT_NAME(BookmarkGroup)
bookmarksManager:(MWMBookmarksManager *)manager;
@property(nonatomic, readonly) MWMMarkGroupID categoryId;
@property(nonatomic, readonly, nullable) NSURL *photoUrl;
@property(nonatomic, readonly) NSString *title;
@property(nonatomic, readonly) NSString *author;
@property(nonatomic, readonly, nullable) NSString *authorIconPath;
@property(nonatomic, readonly) NSString *annotation;
@property(nonatomic, readonly) NSString *detailedAnnotation;
@property(nonatomic, readonly) NSString *serverId;
@property(nonatomic, readonly, nullable) NSURL *imageUrl;
@property(nonatomic, readonly) NSInteger bookmarksCount;
@property(nonatomic, readonly) NSInteger trackCount;
@property(nonatomic, readonly, getter=isVisible) BOOL visible;
@property(nonatomic, readonly, getter=isEmpty) BOOL empty;
@property(nonatomic, readonly, getter=isEditable) BOOL editable;
@property(nonatomic, readonly, getter=isGuide) BOOL guide;
@property(nonatomic, readonly, getter=isLonelyPlanet) BOOL lonelyPlanet;
@property(nonatomic, readonly) BOOL hasDescription;
@property(nonatomic, readonly) MWMBookmarkGroupAccessStatus accessStatus;
@property(nonatomic, readonly) NSArray<MWMBookmark *> *bookmarks;
@property(nonatomic, readonly) NSArray<MWMTrack *> *tracks;

21
iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarkGroup.m
View file

@ -24,19 +24,10 @@
return [self.manager getCategoryName:self.categoryId];
}
- (NSURL *)photoUrl {
return [self.manager getCategoryPhotoUrl:self.categoryId];
}
- (NSString *)author {
return [self.manager getCategoryAuthorName:self.categoryId];
}
- (NSString *)authorIconPath {
// TODO: (boriskov) fixme
return nil;
}
- (NSString *)annotation {
return [self.manager getCategoryAnnotation:self.categoryId];
}
@ -49,6 +40,10 @@
return [self.manager getServerId:self.categoryId];
}
- (NSString *)imageUrl {
return [self.manager getCategoryImageUrl:self.categoryId];
}
- (NSInteger)bookmarksCount {
return [self.manager getCategoryMarksCount:self.categoryId];
}
@ -73,6 +68,14 @@
return [self.manager isGuide:self.categoryId];
}
- (BOOL)isLonelyPlanet {
return [[self.manager getCategoryAuthorId:self.categoryId] isEqualToString: @"28035594-6457-466d-8f6f-8499607df570"];
}
- (BOOL)hasDescription {
return [self.manager hasExtraInfo:self.categoryId];
}
- (MWMBookmarkGroupAccessStatus)accessStatus {
return [self.manager getCategoryAccessStatus:self.categoryId];
}

3
iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.h
View file

@ -50,8 +50,9 @@ NS_SWIFT_NAME(BookmarksManager)
- (NSString *)getCategoryAnnotation:(MWMMarkGroupID)groupId;
- (NSString *)getCategoryDescription:(MWMMarkGroupID)groupId;
- (NSString *)getCategoryAuthorName:(MWMMarkGroupID)groupId;
- (NSURL *)getCategoryPhotoUrl:(MWMMarkGroupID)groupId;
- (NSString *)getCategoryAuthorId:(MWMMarkGroupID)groupId;
- (nullable NSURL *)getCategoryImageUrl:(MWMMarkGroupID)groupId;
- (BOOL)hasExtraInfo:(MWMMarkGroupID)groupId;
- (MWMMarkGroupID)createCategoryWithName:(NSString *)name;
- (void)setCategory:(MWMMarkGroupID)groupId name:(NSString *)name;

18
iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.mm
View file

@ -379,12 +379,12 @@ static BookmarkManager::SortingType convertSortingTypeToCore(MWMBookmarksSorting
}
- (NSString *)getCategoryAnnotation:(MWMMarkGroupID)groupId {
return @(kml::GetDefaultStr(self.bm.GetCategoryData(groupId).m_annotation).c_str());
return @(GetPreferredBookmarkStr(self.bm.GetCategoryData(groupId).m_annotation).c_str());
}
- (NSString *)getCategoryDescription:(MWMMarkGroupID)groupId
{
return @(kml::GetDefaultStr(self.bm.GetCategoryData(groupId).m_description).c_str());
return @(GetPreferredBookmarkStr(self.bm.GetCategoryData(groupId).m_description).c_str());
}
- (NSString *)getCategoryAuthorName:(MWMMarkGroupID)groupId
@ -392,15 +392,21 @@ static BookmarkManager::SortingType convertSortingTypeToCore(MWMBookmarksSorting
return @(self.bm.GetCategoryData(groupId).m_authorName.c_str());
}
- (NSURL *)getCategoryPhotoUrl:(MWMMarkGroupID)groupId {
return [[NSURL alloc] initWithString:@(self.bm.GetCategoryData(groupId).m_imageUrl.c_str())];
}
- (NSString *)getCategoryAuthorId:(MWMMarkGroupID)groupId
{
return @(self.bm.GetCategoryData(groupId).m_authorId.c_str());
}
- (nullable NSURL *)getCategoryImageUrl:(MWMMarkGroupID)groupId {
NSString *urlString = @(self.bm.GetCategoryData(groupId).m_imageUrl.c_str());
return [NSURL URLWithString:urlString];
}
- (BOOL)hasExtraInfo:(MWMMarkGroupID)groupId {
auto data = self.bm.GetCategoryData(groupId);
return !data.m_description.empty() || !data.m_annotation.empty();
}
- (MWMMarkGroupID)createCategoryWithName:(NSString *)name
{
auto groupId = self.bm.CreateBookmarkCategory(name.UTF8String);

49
iphone/Maps/Bookmarks/BookmarksList/BookmarksListInfoViewController.swift Normal file
View file

@ -0,0 +1,49 @@
import UIKit
protocol IBookmakrsListInfoViewModel {
var title: String { get }
var author: String { get }
var hasDescription: Bool { get }
var imageUrl: URL? { get }
var hasLogo: Bool { get } //TODO: maybe replace with logo url or similar
}
protocol BookmarksListInfoViewControllerDelegate: AnyObject {
func didPressDescription()
func didUpdateContent()
}
class BookmarksListInfoViewController: UIViewController {
var info: IBookmakrsListInfoViewModel!
weak var delegate: BookmarksListInfoViewControllerDelegate?
@IBOutlet var titleImageView: UIImageView!
@IBOutlet var titleLabel: UILabel!
@IBOutlet var descriptionButton: UIButton!
@IBOutlet var descriptionButtonView: UIView!
@IBOutlet var authorImageView: UIImageView!
@IBOutlet var authorLabel: UILabel!
@IBOutlet var infoStack: UIStackView!
@IBAction func onDescription(_ sender: UIButton) {
delegate?.didPressDescription()
}
override func viewDidLoad() {
super.viewDidLoad()
descriptionButton.setTitle(L("description_guide").uppercased(), for: .normal)
titleLabel.text = info.title
authorLabel.text = String(coreFormat: L("author_name_by_prefix"), arguments: [info.author])
authorImageView.isHidden = !info.hasLogo
descriptionButtonView.isHidden = !info.hasDescription
titleImageView.isHidden = true
if let imageUrl = info.imageUrl {
titleImageView.wi_setImage(with: imageUrl, transitionDuration: 0) { [weak self] (image, error) in
guard image != nil else { return }
self?.titleImageView.isHidden = false
self?.delegate?.didUpdateContent()
}
}
}
}

175
iphone/Maps/Bookmarks/BookmarksList/BookmarksListInfoViewController.xib Normal file
View file

@ -0,0 +1,175 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17125"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="BookmarksListInfoViewController" customModule="maps_me" customModuleProvider="target">
<connections>
<outlet property="authorImageView" destination="Wss-1i-hZy" id="QEU-QE-qyP"/>
<outlet property="authorLabel" destination="Eqa-1j-puo" id="fNR-7I-wht"/>
<outlet property="descriptionButton" destination="cxc-pt-qei" id="zce-so-aHF"/>
<outlet property="descriptionButtonView" destination="TIy-PU-SzO" id="VBr-Yp-TSd"/>
<outlet property="infoStack" destination="226-gO-8GN" id="f2A-eJ-FGG"/>
<outlet property="titleImageView" destination="dsB-Xh-jOl" id="rsb-lH-MDN"/>
<outlet property="titleLabel" destination="TFR-Qj-pUF" id="D2T-y8-ztA"/>
<outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
</connections>
</placeholder>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5M-Pr-FkT">
<rect key="frame" x="0.0" y="0.0" width="375" height="340"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="KGV-R1-hoS">
<rect key="frame" x="0.0" y="0.0" width="375" height="340"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" insetsLayoutMarginsFromSafeArea="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dsB-Xh-jOl">
<rect key="frame" x="0.0" y="0.0" width="375" height="180"/>
<constraints>
<constraint firstAttribute="height" constant="180" id="9eu-ij-E7g"/>
</constraints>
</imageView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jGS-bD-wyb">
<rect key="frame" x="0.0" y="180" width="375" height="159"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="226-gO-8GN">
<rect key="frame" x="16" y="0.0" width="343" height="159"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Z9F-Yb-cDq">
<rect key="frame" x="0.0" y="0.0" width="343" height="48"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" text="Paris" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TFR-Qj-pUF">
<rect key="frame" x="0.0" y="14" width="343" height="34"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="24"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="bold24:blackPrimaryText"/>
</userDefinedRuntimeAttributes>
</label>
</subviews>
<constraints>
<constraint firstItem="TFR-Qj-pUF" firstAttribute="top" secondItem="Z9F-Yb-cDq" secondAttribute="top" constant="14" id="1Pq-uJ-IXO"/>
<constraint firstAttribute="trailing" secondItem="TFR-Qj-pUF" secondAttribute="trailing" id="9jE-YY-ZE7"/>
<constraint firstItem="TFR-Qj-pUF" firstAttribute="leading" secondItem="Z9F-Yb-cDq" secondAttribute="leading" id="Mqn-yA-iWF"/>
<constraint firstAttribute="bottom" secondItem="TFR-Qj-pUF" secondAttribute="bottom" id="j5w-Th-flQ"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TIy-PU-SzO">
<rect key="frame" x="0.0" y="48" width="343" height="50"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="leading" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cxc-pt-qei">
<rect key="frame" x="0.0" y="0.0" width="343" height="40"/>
<constraints>
<constraint firstAttribute="height" constant="40" id="g6j-hs-K1V"/>
</constraints>
<fontDescription key="fontDescription" type="system" weight="semibold" pointSize="14"/>
<state key="normal" title="DESCRIPTION"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FlatNormalTransButton"/>
</userDefinedRuntimeAttributes>
<connections>
<action selector="onDescription:" destination="-1" eventType="touchUpInside" id="fQR-bp-Mds"/>
</connections>
</button>
</subviews>
<constraints>
<constraint firstItem="cxc-pt-qei" firstAttribute="top" secondItem="TIy-PU-SzO" secondAttribute="top" id="GNA-8E-ru3"/>
<constraint firstAttribute="bottom" secondItem="cxc-pt-qei" secondAttribute="bottom" constant="10" id="NZd-rr-ivd"/>
<constraint firstAttribute="trailing" secondItem="cxc-pt-qei" secondAttribute="trailing" id="Sjc-Nr-PCH"/>
<constraint firstItem="cxc-pt-qei" firstAttribute="leading" secondItem="TIy-PU-SzO" secondAttribute="leading" id="kPL-KQ-ZRX"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="aEi-QI-Tol">
<rect key="frame" x="0.0" y="98" width="343" height="1"/>
<color key="backgroundColor" white="0.0" alpha="0.11852525684931507" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="soU-hC-iDQ"/>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/>
</userDefinedRuntimeAttributes>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bit-FN-ytL">
<rect key="frame" x="0.0" y="99" width="343" height="60"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" spacing="16" translatesAutoresizingMaskIntoConstraints="NO" id="MU1-nd-FMk">
<rect key="frame" x="0.0" y="0.0" width="343" height="60"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" image="img_lp" translatesAutoresizingMaskIntoConstraints="NO" id="Wss-1i-hZy">
<rect key="frame" x="0.0" y="0.0" width="70" height="60"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="LonelyPlanetLogo"/>
</userDefinedRuntimeAttributes>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="Content by Lonely Planet" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Eqa-1j-puo">
<rect key="frame" x="86" y="0.0" width="257" height="60"/>
<constraints>
<constraint firstAttribute="height" constant="60" id="CF2-Jb-Dzd"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" white="0.0" alpha="0.54457405821917804" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/>
</userDefinedRuntimeAttributes>
</label>
</subviews>
</stackView>
</subviews>
<constraints>
<constraint firstItem="MU1-nd-FMk" firstAttribute="leading" secondItem="bit-FN-ytL" secondAttribute="leading" id="5Nw-V9-fI7"/>
<constraint firstAttribute="bottom" secondItem="MU1-nd-FMk" secondAttribute="bottom" id="Gj5-MA-ERI"/>
<constraint firstAttribute="trailing" secondItem="MU1-nd-FMk" secondAttribute="trailing" id="UMa-6G-vfG"/>
<constraint firstItem="MU1-nd-FMk" firstAttribute="top" secondItem="bit-FN-ytL" secondAttribute="top" id="lkc-U7-pxc"/>
</constraints>
</view>
</subviews>
</stackView>
</subviews>
<constraints>
<constraint firstAttribute="trailing" secondItem="226-gO-8GN" secondAttribute="trailing" constant="16" id="Bc0-zj-luu"/>
<constraint firstItem="226-gO-8GN" firstAttribute="leading" secondItem="jGS-bD-wyb" secondAttribute="leading" constant="16" id="CBz-2b-FdW"/>
<constraint firstAttribute="bottom" secondItem="226-gO-8GN" secondAttribute="bottom" id="eCj-gO-9cQ"/>
<constraint firstItem="226-gO-8GN" firstAttribute="top" secondItem="jGS-bD-wyb" secondAttribute="top" id="wIb-n9-mts"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="p5d-oU-wVm">
<rect key="frame" x="0.0" y="339" width="375" height="1"/>
<color key="backgroundColor" white="0.0" alpha="0.11852525680000001" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="GqW-4j-7uM"/>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/>
</userDefinedRuntimeAttributes>
</view>
</subviews>
</stackView>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstAttribute="bottom" secondItem="KGV-R1-hoS" secondAttribute="bottom" id="Mds-pB-3uh"/>
<constraint firstItem="KGV-R1-hoS" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="bKw-en-SqM"/>
<constraint firstItem="KGV-R1-hoS" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" id="j8z-W0-Y6S"/>
<constraint firstAttribute="trailing" secondItem="KGV-R1-hoS" secondAttribute="trailing" id="wv4-3Q-Ihc"/>
</constraints>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/>
</userDefinedRuntimeAttributes>
<point key="canvasLocation" x="111.2" y="-128.63568215892056"/>
</view>
</objects>
<resources>
<image name="img_lp" width="70" height="35"/>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
</resources>
</document>

5
iphone/Maps/Bookmarks/BookmarksList/BookmarksListInteractor.swift
View file

@ -1,5 +1,6 @@
protocol IBookmarksListInteractor {
func getBookmarkGroup() -> BookmarkGroup
func hasDescription() -> Bool
func prepareForSearch()
func search(_ text: String, completion: @escaping ([Bookmark]) -> Void)
func availableSortingTypes(hasMyPosition: Bool) -> [BookmarksListSortingType]
@ -83,6 +84,10 @@ extension BookmarksListInteractor: IBookmarksListInteractor {
bookmarksManager.category(withId: markGroupId)
}
func hasDescription() -> Bool {
bookmarksManager.hasExtraInfo(markGroupId)
}
func prepareForSearch() {
bookmarksManager.prepare(forSearch: markGroupId)
}

28
iphone/Maps/Bookmarks/BookmarksList/BookmarksListPresenter.swift
View file

@ -8,6 +8,7 @@ protocol IBookmarksListPresenter {
func more()
func deleteBookmark(in section: IBookmarksListSectionViewModel, at index: Int)
func viewOnMap(in section: IBookmarksListSectionViewModel, at index: Int)
func showDescription()
}
protocol BookmarksListDelegate: AnyObject {
@ -190,6 +191,13 @@ extension BookmarksListPresenter: IBookmarksListPresenter {
view.setTitle(bookmarkGroup.title)
view.setMoreItemTitle(bookmarkGroup.isEditable ? L("placepage_more_button") : L("view_on_map_bookmarks"))
view.enableEditing(bookmarkGroup.isEditable)
let info = BookmarksListInfo(title: bookmarkGroup.title,
author: bookmarkGroup.author,
hasDescription: bookmarkGroup.hasDescription,
imageUrl: bookmarkGroup.imageUrl,
hasLogo: bookmarkGroup.isLonelyPlanet)
view.setInfo(info)
}
func activateSearch() {
@ -260,6 +268,10 @@ extension BookmarksListPresenter: IBookmarksListPresenter {
fatalError("Wrong section type: \(section.self)")
}
}
func showDescription() {
router.showDescription(bookmarkGroup)
}
}
extension BookmarksListPresenter: BookmarksSharingViewControllerDelegate {
@ -347,3 +359,19 @@ fileprivate struct BookmarksListMenuItem: IBookmarksListMenuItem {
self.action = action
}
}
fileprivate struct BookmarksListInfo: IBookmakrsListInfoViewModel {
let title: String
let author: String
let hasDescription: Bool
let imageUrl: URL?
let hasLogo: Bool
init(title: String, author: String, hasDescription:Bool, imageUrl: URL? = nil, hasLogo: Bool = false) {
self.title = title
self.author = author
self.hasDescription = hasDescription
self.imageUrl = imageUrl
self.hasLogo = hasLogo
}
}

6
iphone/Maps/Bookmarks/BookmarksList/BookmarksListRouter.swift
View file

@ -2,6 +2,7 @@ protocol IBookmarksListRouter {
func listSettings(_ bookmarkGroup: BookmarkGroup, delegate: CategorySettingsViewControllerDelegate?)
func sharingOptions(_ bookmarkGroup: BookmarkGroup)
func viewOnMap(_ bookmarkGroup: BookmarkGroup)
func showDescription(_ bookmarkGroup: BookmarkGroup)
}
final class BookmarksListRouter {
@ -31,4 +32,9 @@ extension BookmarksListRouter: IBookmarksListRouter {
func viewOnMap(_ bookmarkGroup: BookmarkGroup) {
coordinator?.hide(categoryId: bookmarkGroup.categoryId)
}
func showDescription(_ bookmarkGroup: BookmarkGroup) {
let descriptionViewController = GuideDescriptionViewController(category: bookmarkGroup)
mapViewController.navigationController?.pushViewController(descriptionViewController, animated: true)
}
}

39
iphone/Maps/Bookmarks/BookmarksList/BookmarksListViewController.swift
View file

@ -47,6 +47,7 @@ protocol IBookmarksListMenuItem {
protocol IBookmarksListView: AnyObject {
func setTitle(_ title: String)
func setInfo(_ info: IBookmakrsListInfoViewModel)
func setSections(_ sections: [IBookmarksListSectionViewModel])
func setMoreItemTitle(_ itemTitle: String)
func showMenu(_ items: [IBookmarksListMenuItem])
@ -68,6 +69,8 @@ final class BookmarksListViewController: MWMViewController {
@IBOutlet var toolBar: UIToolbar!
@IBOutlet var sortToolbarItem: UIBarButtonItem!
@IBOutlet var moreToolbarItem: UIBarButtonItem!
private var infoViewController: BookmarksListInfoViewController?
override func viewDidLoad() {
super.viewDidLoad()
@ -83,6 +86,22 @@ final class BookmarksListViewController: MWMViewController {
presenter.viewDidLoad()
}
override func viewDidLayoutSubviews() {
super.viewDidLayoutSubviews()
updateInfoSize()
}
private func updateInfoSize() {
guard let infoView = infoViewController?.view else {
return
}
let infoViewSize = infoView.systemLayoutSizeFitting(CGSize(width: view.width, height: 0),
withHorizontalFittingPriority: .required,
verticalFittingPriority: .fittingSizeLevel)
infoView.size = infoViewSize
tableView.tableHeaderView = infoView
}
@IBAction func onSortItem(_ sender: UIBarButtonItem) {
presenter.sort()
}
@ -188,6 +207,16 @@ extension BookmarksListViewController: IBookmarksListView {
self.title = title
}
func setInfo(_ info: IBookmakrsListInfoViewModel) {
let infoViewController = BookmarksListInfoViewController()
infoViewController.info = info
infoViewController.delegate = self
addChild(infoViewController)
tableView.tableHeaderView = infoViewController.view
infoViewController.didMove(toParent: self)
self.infoViewController = infoViewController
}
func setSections(_ sections: [IBookmarksListSectionViewModel]) {
self.sections = sections
tableView.reloadData()
@ -228,3 +257,13 @@ extension BookmarksListViewController: IBookmarksListView {
MWMAlertViewController.activeAlert().presentInfoAlert(title, text: message)
}
}
extension BookmarksListViewController: BookmarksListInfoViewControllerDelegate {
func didPressDescription() {
presenter.showDescription()
}
func didUpdateContent() {
updateInfoSize()
}
}

13
iphone/Maps/Bookmarks/BookmarksList/BookmarksListViewController.xib
View file

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<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="17125"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
@ -42,7 +42,7 @@
</searchBar>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="grouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" translatesAutoresizingMaskIntoConstraints="NO" id="fva-qQ-WqU">
<rect key="frame" x="0.0" y="56" width="375" height="567"/>
<color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
<color key="backgroundColor" systemColor="groupTableViewBackgroundColor"/>
<inset key="separatorInset" minX="56" minY="0.0" maxX="0.0" maxY="0.0"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="TableView:PressBackground"/>
@ -74,6 +74,7 @@
</userDefinedRuntimeAttributes>
</toolbar>
</subviews>
<viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="NbN-CP-W78" secondAttribute="trailing" id="2y5-UT-rDQ"/>
@ -91,11 +92,15 @@
<constraint firstItem="Ue9-xA-QN5" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="qft-2l-dyg"/>
</constraints>
<nil key="simulatedTopBarMetrics"/>
<viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="PressBackground"/>
</userDefinedRuntimeAttributes>
<point key="canvasLocation" x="137.68115942028987" y="95.758928571428569"/>
</view>
</objects>
<resources>
<systemColor name="groupTableViewBackgroundColor">
<color red="0.94901960784313721" green="0.94901960784313721" blue="0.96862745098039216" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</systemColor>
</resources>
</document>

9
iphone/Maps/Bookmarks/GuideDescription/GuideDescriptionViewController.swift
View file

@ -28,7 +28,7 @@ class GuideDescriptionViewController: MWMViewController {
subtitleLabel.attributedText = NSMutableAttributedString(htmlString: category.annotation, baseFont: UIFont.regular16())
descriptionText.attributedText = NSMutableAttributedString(htmlString: category.detailedAnnotation, baseFont: UIFont.regular16())
if FrameworkHelper.isNetworkConnected(), let photoUrl = category.photoUrl {
if let photoUrl = category.imageUrl {
photo.wi_setImage(with: photoUrl, transitionDuration: 0) { [weak self] _, error in
if error != nil {
self?.photoViewContainer.isHidden = true
@ -40,11 +40,6 @@ class GuideDescriptionViewController: MWMViewController {
photoActivityIndicator.stopAnimating()
}
if let authorIconPath = category.authorIconPath,
let authorImage = UIImage(contentsOfFile: authorIconPath) {
providerIcon.image = authorImage
} else {
providerIcon.isHidden = true
}
providerIcon.isHidden = !category.isLonelyPlanet
}
}

48
iphone/Maps/Bookmarks/GuideDescription/GuideDescriptionViewController.xib
View file

@ -1,10 +1,11 @@
<?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">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17125"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
@ -42,7 +43,6 @@
<rect key="frame" x="197" y="80" width="20" height="20"/>
</activityIndicatorView>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<constraints>
<constraint firstItem="OZ0-EB-ayO" firstAttribute="leading" secondItem="vQ9-Cg-9CP" secondAttribute="leading" id="503-Ki-zlR"/>
<constraint firstAttribute="bottom" secondItem="OZ0-EB-ayO" secondAttribute="bottom" id="QHV-d9-Kav"/>
@ -75,7 +75,6 @@
</userDefinedRuntimeAttributes>
</label>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="hh3-UD-FXJ" secondAttribute="trailing" constant="16" id="33S-zf-SgW"/>
<constraint firstAttribute="trailing" secondItem="LbD-yc-cal" secondAttribute="trailing" constant="16" id="FXi-lH-haB"/>
@ -94,7 +93,7 @@
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="QJn-rO-FZg">
<rect key="frame" x="16" y="0.0" width="382" height="1"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="ezx-6w-ZyU"/>
</constraints>
@ -105,15 +104,14 @@
<stackView opaque="NO" contentMode="scaleToFill" spacing="16" translatesAutoresizingMaskIntoConstraints="NO" id="12S-Lx-MCj">
<rect key="frame" x="16" y="12" width="382" height="60"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="fwF-di-rja">
<rect key="frame" x="0.0" y="0.0" width="75" height="60"/>
<constraints>
<constraint firstAttribute="height" constant="60" id="8Cz-vk-nEG"/>
<constraint firstAttribute="width" constant="75" id="rxH-g5-Da1"/>
</constraints>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" image="img_lp" translatesAutoresizingMaskIntoConstraints="NO" id="fwF-di-rja">
<rect key="frame" x="0.0" y="0.0" width="70" height="60"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="LonelyPlanetLogo"/>
</userDefinedRuntimeAttributes>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="CDJ-Rz-hR5">
<rect key="frame" x="91" y="0.0" width="291" height="60"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="CDJ-Rz-hR5">
<rect key="frame" x="86" y="0.0" width="296" height="60"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
@ -125,7 +123,7 @@
</stackView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="SjC-kq-PvM">
<rect key="frame" x="16" y="83" width="382" height="1"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="0qk-Wc-k7F"/>
</constraints>
@ -134,7 +132,6 @@
</userDefinedRuntimeAttributes>
</view>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="12S-Lx-MCj" secondAttribute="trailing" constant="16" id="55h-DV-gQu"/>
<constraint firstItem="QJn-rO-FZg" firstAttribute="top" secondItem="mTg-8a-cqj" secondAttribute="top" id="Fei-fA-xca"/>
@ -153,14 +150,18 @@
<subviews>
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" editable="NO" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="yHI-OK-I24">
<rect key="frame" x="16" y="0.0" width="382" height="526"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<string key="text">Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda.</string>
<color key="textColor" systemColor="labelColor" cocoaTouchSystemColor="darkTextColor"/>
<color key="textColor" systemColor="labelColor"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="blackPrimaryText"/>
<userDefinedRuntimeAttribute type="number" keyPath="textContainer.lineFragmentPadding">
<integer key="value" value="0"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</textView>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<constraints>
<constraint firstAttribute="bottom" secondItem="yHI-OK-I24" secondAttribute="bottom" id="4ic-a2-qlB"/>
<constraint firstAttribute="trailing" secondItem="yHI-OK-I24" secondAttribute="trailing" constant="16" id="97z-gO-IAQ"/>
@ -182,6 +183,7 @@
<viewLayoutGuide key="frameLayoutGuide" id="u3E-ZV-cqZ"/>
</scrollView>
</subviews>
<viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="bottom" secondItem="rLR-PV-Ke6" secondAttribute="bottom" id="6G8-e2-mF3"/>
@ -189,11 +191,19 @@
<constraint firstItem="rLR-PV-Ke6" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="IEh-PI-stC"/>
<constraint firstItem="rLR-PV-Ke6" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" id="NRq-fH-1Xm"/>
</constraints>
<viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/>
</userDefinedRuntimeAttributes>
<point key="canvasLocation" x="137.68115942028987" y="122.54464285714285"/>
</view>
</objects>
<resources>
<image name="img_lp" width="70" height="35"/>
<systemColor name="labelColor">
<color white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
</resources>
</document>

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

@ -18,6 +18,10 @@ class BookmarksStyleSheet: IStyleSheet {
s.tintColor = colors.linkBlue
}
theme.add(styleName: "LonelyPlanetLogo") { (s) -> (Void) in
s.tintColor = colors.lonelyPlanetLogoColor
}
theme.add(styleName: "BookmarkSharingLicense", from: "TermsOfUseLinkText") { (s) -> (Void) in
s.fontColor = colors.blackSecondaryText
s.font = fonts.regular14

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

@ -71,6 +71,7 @@ class DayColors: IColors {
var chartShadow = UIColor(red: 0.118, green: 0.588, blue: 0.941, alpha: 0.12)
var cityColor = UIColor(red: 0.4, green: 0.225, blue: 0.75, alpha: 1)
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)
}
class NightColors: IColors {
@ -146,4 +147,5 @@ class NightColors: IColors {
var chartShadow = UIColor(red: 0.294, green: 0.725, blue: 0.902, alpha: 0.12)
var cityColor = UIColor(152, 103, 252, alpha100)
var outdoorColor = UIColor(147, 191, 57, alpha100)
var lonelyPlanetLogoColor = UIColor(red: 1, green: 1, blue: 1, alpha: 0.7)
}

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

@ -81,4 +81,5 @@ let alpha100: CGFloat = 1.0
var chartShadow: UIColor { get }
var cityColor: UIColor { get }
var outdoorColor: UIColor { get }
var lonelyPlanetLogoColor: UIColor { get }
}

6
iphone/Maps/Images.xcassets/Catalog/Contents.json
View file

@ -1,6 +1,6 @@
{
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
}
}
}

15
iphone/Maps/Images.xcassets/Catalog/img_lp.imageset/Contents.json vendored Normal file
View file

@ -0,0 +1,15 @@
{
"images" : [
{
"filename" : "LP_logo.pdf",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"template-rendering-intent" : "template"
}
}

273
iphone/Maps/Images.xcassets/Catalog/img_lp.imageset/LP_logo.pdf vendored Normal file
View file

@ -0,0 +1,273 @@
%PDF-1.7
1 0 obj
<< /BBox [ 0.000000 0.000000 70.000000 35.000000 ]
/Resources << >>
/Subtype /Form
/Length 2 0 R
/Group << /Type /Group
/S /Transparency
>>
/Type /XObject
>>
stream
/DeviceRGB CS
/DeviceRGB cs
q
1.000000 0.000000 -0.000000 1.000000 0.000000 0.000000 cm
1.000000 1.000000 1.000000 scn
34.882458 32.998676 m
41.535191 32.998676 47.178127 28.729744 49.276306 22.662079 c
50.151699 22.966873 l
51.021687 23.276825 l
48.731209 30.143017 42.375782 35.000000 34.877357 35.000000 c
27.422731 35.000000 21.057688 30.092974 18.730911 23.303812 c
20.468496 22.636303 l
22.580175 28.661812 28.249523 32.998676 34.882458 32.998676 c
h
23.009769 15.737961 m
20.914593 16.057306 l
19.854403 15.245735 18.644814 15.666693 18.261118 16.744843 c
23.351765 16.744843 l
23.351765 13.395449 l
25.881639 13.395449 l
25.881639 15.116848 l
26.300735 13.411522 28.382717 12.831953 29.565905 14.106930 c
29.565905 13.732080 29.527203 13.293247 29.411703 12.932953 c
29.032808 12.011293 27.765026 12.011286 27.108334 12.628454 c
25.616148 10.679598 l
26.567739 9.920797 27.531324 9.554134 28.761612 9.670290 c
29.776203 9.772495 30.420300 9.953854 31.193092 10.657154 c
31.780485 11.321634 32.060078 12.011288 32.097275 12.902014 c
32.097275 21.219088 l
29.611204 21.219088 l
29.611204 16.463095 l
29.611204 15.601788 28.364113 15.593903 28.364113 16.463095 c
28.364113 21.219088 l
25.881639 21.219088 l
25.881639 24.271877 l
23.351765 24.271877 l
23.351765 18.762541 l
22.538174 20.523670 21.000093 21.431686 19.072912 21.157825 c
17.686327 20.844542 16.702637 20.069969 16.169241 18.762541 c
15.689246 20.312592 14.558256 21.132957 12.980272 21.219088 c
11.307789 21.219088 10.061601 20.390533 9.559406 18.762541 c
8.714615 20.640434 7.027730 21.548752 5.016550 21.087162 c
3.808462 20.704426 3.079768 20.061783 2.530474 18.927526 c
2.530474 24.271877 l
0.000000 24.271877 l
0.000000 13.395449 l
2.530474 13.395449 l
2.530474 15.836521 l
3.250467 14.380487 4.451357 13.575901 6.059641 13.543449 c
7.770824 13.645351 8.869113 14.466928 9.559406 16.000904 c
9.559406 13.395449 l
11.996579 13.395449 l
11.996579 18.088053 l
12.090178 19.113129 13.630963 19.144064 13.724863 18.088053 c
13.724863 13.395449 l
16.169241 13.395449 l
16.169241 15.852596 l
16.732935 14.593088 17.615524 13.833378 18.941212 13.489159 c
21.843681 13.211964 22.993568 15.229366 23.009769 15.737961 c
h
5.958842 15.782238 m
5.075651 15.782238 4.357757 16.511318 4.357757 17.403561 c
4.357757 18.295801 5.075651 19.023966 5.958842 19.023966 c
6.842334 19.023966 7.561425 18.296104 7.561425 17.403561 c
7.561725 16.511621 6.842634 15.782238 5.958842 15.782238 c
h
21.317490 17.730789 m
18.205917 17.730789 l
18.688612 19.330273 20.816793 19.358175 21.317490 17.730789 c
h
34.869556 1.964325 m
28.217724 1.964325 22.574474 6.157133 20.477497 12.112888 c
19.601204 11.814156 l
18.730614 11.510582 l
21.021391 4.769035 27.379526 0.000000 34.874050 0.000000 c
42.329277 0.000000 48.694309 4.818161 51.021687 11.483585 c
49.285004 12.139572 l
47.171227 6.223242 41.501591 1.964325 34.869556 1.964325 c
h
69.905907 16.450054 m
69.792198 16.348457 l
69.343407 15.979673 68.676514 16.093096 68.442818 16.601692 c
68.203117 17.329557 68.327316 18.112013 68.327316 18.886887 c
69.876503 18.886887 l
69.876503 21.176022 l
68.327316 21.176022 l
68.327316 22.737288 l
65.882339 22.737288 l
65.882339 18.762541 l
65.441643 19.834930 64.775948 20.452709 63.730160 20.938255 c
61.633183 21.689775 59.629204 20.805719 58.705814 18.762541 c
58.342518 19.834930 57.792923 20.492128 56.772331 20.977978 c
54.744953 21.697958 52.793175 20.844841 52.089081 18.762541 c
51.532585 20.070272 50.726791 20.757801 49.342308 21.141750 c
47.476624 21.455036 45.889938 20.633461 45.069748 18.927526 c
45.069748 24.271877 l
42.537479 24.271877 l
42.537479 18.927526 l
42.220982 19.568958 41.879581 20.023266 41.331787 20.476665 c
38.737114 22.378819 35.323147 20.483641 35.260750 17.284370 c
35.260750 10.507032 l
37.784924 10.507032 l
37.784924 11.188799 37.706921 13.841867 37.706921 13.841867 c
37.985924 13.723289 l
39.875008 13.238653 41.802788 14.201862 42.537479 15.694897 c
42.537479 13.395144 l
45.069748 13.395144 l
45.069748 15.694897 l
45.796940 14.131502 47.189529 13.231371 48.914513 13.356928 c
49.712505 13.304462 50.378799 15.438023 50.381199 14.845419 c
50.382401 13.356928 l
51.357983 13.356928 l
52.074085 13.356928 l
54.534950 13.395144 l
54.534950 18.096245 l
54.534950 19.073708 56.121643 19.158016 56.204144 18.157505 c
56.223343 16.620193 56.219440 14.904554 56.219440 13.395144 c
58.706116 13.395144 l
58.706116 15.852291 l
59.164211 14.802347 59.775307 14.193972 60.789597 13.692656 c
62.795380 13.032118 64.887550 13.354807 65.669945 15.827728 c
63.554665 16.174376 l
63.068970 15.437412 61.331692 15.280315 60.781494 16.744537 c
65.882645 16.744537 l
65.882645 15.530519 65.906044 14.610075 66.989937 13.812761 c
68.074425 13.013929 70.022606 13.780909 69.999802 14.297997 c
69.905907 16.450054 l
h
39.173306 15.739479 m
38.289814 15.739479 37.569229 16.468252 37.569229 17.360189 c
37.569229 18.252432 38.289814 18.980597 39.173306 18.980597 c
40.054996 18.980597 40.774696 18.252735 40.774696 17.360189 c
40.774395 16.468252 40.054996 15.739479 39.173306 15.739479 c
h
48.523018 15.739479 m
47.638329 15.739479 46.920429 16.468252 46.920429 17.360189 c
46.920429 18.252432 47.638329 18.980597 48.523018 18.980597 c
49.405010 18.980597 50.124397 18.252735 50.124397 17.360189 c
50.124397 16.468252 49.404709 15.739479 48.523018 15.739479 c
h
60.764694 17.859383 m
61.181992 19.377892 63.347969 19.443399 63.831562 17.859383 c
60.764694 17.859383 l
h
f*
n
Q
endstream
endobj
2 0 obj
5436
endobj
3 0 obj
<< /BBox [ 0.000000 0.000000 70.000000 35.000000 ]
/Resources << >>
/Subtype /Form
/Length 4 0 R
/Group << /Type /Group
/S /Transparency
>>
/Type /XObject
>>
stream
/DeviceRGB CS
/DeviceRGB cs
q
1.000000 0.000000 -0.000000 1.000000 0.000000 0.000000 cm
0.000000 0.000000 0.000000 scn
0.000000 35.000000 m
70.000000 35.000000 l
70.000000 0.000000 l
0.000000 0.000000 l
0.000000 35.000000 l
h
f
n
Q
endstream
endobj
4 0 obj
232
endobj
5 0 obj
<< /XObject << /X1 1 0 R >>
/ExtGState << /E1 << /SMask << /Type /Mask
/G 3 0 R
/S /Alpha
>>
/Type /ExtGState
>> >>
>>
endobj
6 0 obj
<< /Length 7 0 R >>
stream
/DeviceRGB CS
/DeviceRGB cs
q
/E1 gs
/X1 Do
Q
endstream
endobj
7 0 obj
46
endobj
8 0 obj
<< /Annots []
/Type /Page
/MediaBox [ 0.000000 0.000000 70.000000 35.000000 ]
/Resources 5 0 R
/Contents 6 0 R
/Parent 9 0 R
>>
endobj
9 0 obj
<< /Kids [ 8 0 R ]
/Count 1
/Type /Pages
>>
endobj
10 0 obj
<< /Type /Catalog
/Pages 9 0 R
>>
endobj
xref
0 11
0000000000 65535 f
0000000010 00000 n
0000005694 00000 n
0000005717 00000 n
0000006197 00000 n
0000006219 00000 n
0000006517 00000 n
0000006619 00000 n
0000006640 00000 n
0000006813 00000 n
0000006887 00000 n
trailer
<< /ID [ (some) (id) ]
/Root 10 0 R
/Size 11
>>
startxref
6947
%%EOF

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

@ -312,6 +312,8 @@
470B3630244E2DB400C0EA9E /* GuidesGalleryViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 470B362F244E2DB400C0EA9E /* GuidesGalleryViewController.swift */; };
470B3632244E2DE200C0EA9E /* GuidesGalleryCityCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 470B3631244E2DE200C0EA9E /* GuidesGalleryCityCell.swift */; };
470B3634244E2DF900C0EA9E /* GuidesGalleryOutdoorCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 470B3633244E2DF900C0EA9E /* GuidesGalleryOutdoorCell.swift */; };
470E1674252AD7F2002D201A /* BookmarksListInfoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 470E1672252AD7F2002D201A /* BookmarksListInfoViewController.swift */; };
470E1675252AD7F2002D201A /* BookmarksListInfoViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 470E1673252AD7F2002D201A /* BookmarksListInfoViewController.xib */; };
470F0B7D238842EA006AEC94 /* ExpandableLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 470F0B7C238842EA006AEC94 /* ExpandableLabel.swift */; };
470F0B7F2388431E006AEC94 /* StarRatingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 470F0B7E2388431E006AEC94 /* StarRatingView.swift */; };
470F5A5B2181DE7500754295 /* PaidRouteViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 470F5A592181DE7400754295 /* PaidRouteViewController.swift */; };
@ -1456,6 +1458,8 @@
470B362F244E2DB400C0EA9E /* GuidesGalleryViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GuidesGalleryViewController.swift; sourceTree = "<group>"; };
470B3631244E2DE200C0EA9E /* GuidesGalleryCityCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GuidesGalleryCityCell.swift; sourceTree = "<group>"; };
470B3633244E2DF900C0EA9E /* GuidesGalleryOutdoorCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GuidesGalleryOutdoorCell.swift; sourceTree = "<group>"; };
470E1672252AD7F2002D201A /* BookmarksListInfoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarksListInfoViewController.swift; sourceTree = "<group>"; };
470E1673252AD7F2002D201A /* BookmarksListInfoViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BookmarksListInfoViewController.xib; sourceTree = "<group>"; };
470F0B7C238842EA006AEC94 /* ExpandableLabel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExpandableLabel.swift; sourceTree = "<group>"; };
470F0B7E2388431E006AEC94 /* StarRatingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StarRatingView.swift; sourceTree = "<group>"; };
470F5A592181DE7400754295 /* PaidRouteViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaidRouteViewController.swift; sourceTree = "<group>"; };
@ -3605,6 +3609,8 @@
47CA68D52500448D00671019 /* BookmarksListInteractor.swift */,
47CA68D7250044C500671019 /* BookmarksListRouter.swift */,
47CA68D92500469400671019 /* BookmarksListBuilder.swift */,
470E1672252AD7F2002D201A /* BookmarksListInfoViewController.swift */,
470E1673252AD7F2002D201A /* BookmarksListInfoViewController.xib */,
);
path = BookmarksList;
sourceTree = "<group>";
@ -5299,6 +5305,7 @@
F6E2FE1C1E097BA00083EBEC /* MWMOpeningHoursTimeSpanTableViewCell.xib in Resources */,
F6BD1D241CA412E40047B8E8 /* MWMOsmAuthAlert.xib in Resources */,
F6FE3C3C1CC5106500A73196 /* MWMPlaceDoesntExistAlert.xib in Resources */,
470E1675252AD7F2002D201A /* BookmarksListInfoViewController.xib in Resources */,
F6E407D41FC4722F001F7821 /* MWMDiscoveryController.xib in Resources */,
F6E2FE7F1E097BA00083EBEC /* MWMPlacePageOpeningHoursCell.xib in Resources */,
34AB66711FC5AA330078E451 /* TransportTransitTrain.xib in Resources */,
@ -5691,6 +5698,7 @@
346DB8281E5C4F6700E3123E /* GalleryCell.swift in Sources */,
993DF12223F6BDB100AC231A /* UINavigationItemRenderer.swift in Sources */,
993DF12B23F6BDB100AC231A /* StyleManager.swift in Sources */,
470E1674252AD7F2002D201A /* BookmarksListInfoViewController.swift in Sources */,
47B9065521C7FA400079C85E /* NSString+MD5.m in Sources */,
CDB4D5022231412900104869 /* SettingsTemplateBuilder.swift in Sources */,
F6EBB26F1FD7E33300B69B6A /* DiscoveryNoResultsCell.swift in Sources */,