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

[ios] direct link sharing

Browse source
This commit is contained in:
o.bolovintseva 2018-10-31 12:57:12 +03:00 • committed by Aleksey Belousov
parent d9d1c824b7
commit 62ff0faa0e
14 changed files with 303 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
iphone/Maps/Bookmarks/Categories/BMCView/BMCViewController.swift
View file

@ -75,6 +75,7 @@ final class BMCViewController: MWMViewController {
private func shareCategory(category: BMCCategory, anchor: UIView) {
let storyboard = UIStoryboard.instance(.sharing)
let shareController = storyboard.instantiateInitialViewController() as! BookmarksSharingViewController
shareController.categoryId = category.identifier
MapViewController.topViewController().navigationController?.pushViewController(shareController,
animated: true)

78
iphone/Maps/Bookmarks/Categories/Sharing/BookmarksSharingFlow.storyboard
View file

@ -44,17 +44,41 @@
<color key="textColor" red="0.11764705882352941" green="0.58823529411764708" blue="0.94117647058823528" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="lF2-pc-Qo7">
<rect key="frame" x="335" y="16" width="24" height="24"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="height" constant="24" id="9r2-mf-DsT"/>
<constraint firstAttribute="width" constant="24" id="Gon-Yr-8Fq"/>
</constraints>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="PYo-PL-9Fc">
<rect key="frame" x="335" y="16" width="24" height="24"/>
<state key="normal" title="Button" image="ic24PxShare"/>
<connections>
<action selector="shareButtonPressed:" destination="wpS-8c-SPb" eventType="touchUpInside" id="LGm-kR-yxB"/>
</connections>
</button>
</subviews>
<constraints>
<constraint firstItem="PYo-PL-9Fc" firstAttribute="bottom" secondItem="lF2-pc-Qo7" secondAttribute="bottom" id="BJL-HW-qeL"/>
<constraint firstItem="fmA-82-rPS" firstAttribute="centerY" secondItem="ayR-ii-DjA" secondAttribute="centerY" id="Bfj-dF-WcJ"/>
<constraint firstItem="uMP-YO-wbu" firstAttribute="centerY" secondItem="fmA-82-rPS" secondAttribute="centerY" id="D4L-J4-gPv"/>
<constraint firstItem="PYo-PL-9Fc" firstAttribute="leading" secondItem="lF2-pc-Qo7" secondAttribute="leading" id="KDo-o9-elh"/>
<constraint firstItem="lF2-pc-Qo7" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="uMP-YO-wbu" secondAttribute="trailing" constant="16" id="RxV-Xg-PoI"/>
<constraint firstItem="fmA-82-rPS" firstAttribute="leading" secondItem="ayR-ii-DjA" secondAttribute="leadingMargin" id="Zzq-yt-7DW"/>
<constraint firstItem="lF2-pc-Qo7" firstAttribute="centerY" secondItem="ayR-ii-DjA" secondAttribute="centerY" id="cBC-St-gRO"/>
<constraint firstItem="PYo-PL-9Fc" firstAttribute="trailing" secondItem="lF2-pc-Qo7" secondAttribute="trailing" id="h2e-6c-4ID"/>
<constraint firstAttribute="trailing" secondItem="lF2-pc-Qo7" secondAttribute="trailing" constant="16" id="iJm-Q9-d2P"/>
<constraint firstItem="uMP-YO-wbu" firstAttribute="leading" secondItem="fmA-82-rPS" secondAttribute="trailing" constant="16" id="qOc-7f-rpS"/>
<constraint firstItem="PYo-PL-9Fc" firstAttribute="top" secondItem="lF2-pc-Qo7" secondAttribute="top" id="qZ8-cY-uRw"/>
</constraints>
</tableViewCellContentView>
<connections>
<outlet property="actionImage" destination="fmA-82-rPS" id="Z0K-e9-nZj"/>
<outlet property="actionTitle" destination="uMP-YO-wbu" id="pQd-ox-QLF"/>
<outlet property="progressView" destination="lF2-pc-Qo7" id="R12-gK-Si1"/>
<outlet property="shareButton" destination="PYo-PL-9Fc" id="2yn-Sk-Yq8"/>
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" rowHeight="95" id="VdZ-fO-p63">
@ -65,7 +89,7 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="This list will be uploaded in the public 
catalog at MAPS.ME as guide and will be 
easily shared with others" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="N3w-HY-3ac">
<rect key="frame" x="56" y="20" width="303" height="60.5"/>
<rect key="frame" x="56" y="18" width="303" height="58.5"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
@ -75,22 +99,22 @@
</label>
</subviews>
<constraints>
<constraint firstAttribute="bottom" secondItem="N3w-HY-3ac" secondAttribute="bottom" constant="14" id="1EW-1C-WIX"/>
<constraint firstItem="N3w-HY-3ac" firstAttribute="top" secondItem="Y9s-zu-iol" secondAttribute="top" constant="20" id="qEv-Gk-ane"/>
<constraint firstAttribute="bottom" secondItem="N3w-HY-3ac" secondAttribute="bottom" constant="18" id="1EW-1C-WIX"/>
<constraint firstItem="N3w-HY-3ac" firstAttribute="top" secondItem="Y9s-zu-iol" secondAttribute="top" constant="18" id="qEv-Gk-ane"/>
<constraint firstItem="N3w-HY-3ac" firstAttribute="leading" secondItem="Y9s-zu-iol" secondAttribute="leading" constant="56" id="upe-MD-o7N"/>
<constraint firstAttribute="trailing" secondItem="N3w-HY-3ac" secondAttribute="trailing" constant="16" id="zDt-Qf-8JF"/>
</constraints>
</tableViewCellContentView>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" rowHeight="70" id="3UL-dT-hKc">
<rect key="frame" x="0.0" y="206.5" width="375" height="70"/>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" rowHeight="86" id="3UL-dT-hKc">
<rect key="frame" x="0.0" y="206.5" width="375" height="86"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="3UL-dT-hKc" id="402-ot-2TF">
<rect key="frame" x="0.0" y="0.0" width="375" height="69.5"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="85.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" editable="NO" text="Please note: by proceeding, you accept the license agreement" translatesAutoresizingMaskIntoConstraints="NO" id="dsV-Vs-oCo" customClass="LinkTextView" customModule="maps_me" customModuleProvider="target">
<rect key="frame" x="56" y="20" width="303" height="35.5"/>
<rect key="frame" x="56" y="18" width="303" height="49.5"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="custom" customColorSpace="sRGB"/>
<fontDescription key="fontDescription" name=".AppleSystemUIFont" family=".AppleSystemUIFont" pointSize="14"/>
@ -107,8 +131,8 @@
</subviews>
<constraints>
<constraint firstItem="dsV-Vs-oCo" firstAttribute="leading" secondItem="402-ot-2TF" secondAttribute="leading" constant="56" id="BgN-PM-ejM"/>
<constraint firstAttribute="bottom" secondItem="dsV-Vs-oCo" secondAttribute="bottom" constant="14" id="bik-bt-cDR"/>
<constraint firstItem="dsV-Vs-oCo" firstAttribute="top" secondItem="402-ot-2TF" secondAttribute="top" constant="20" id="rZO-fI-h9b"/>
<constraint firstAttribute="bottom" secondItem="dsV-Vs-oCo" secondAttribute="bottom" constant="18" id="MYS-Cs-qSO"/>
<constraint firstItem="dsV-Vs-oCo" firstAttribute="top" secondItem="402-ot-2TF" secondAttribute="top" constant="18" id="pbY-qn-0dd"/>
<constraint firstAttribute="trailing" secondItem="dsV-Vs-oCo" secondAttribute="trailing" constant="16" id="vcP-CZ-R8d"/>
</constraints>
</tableViewCellContentView>
@ -118,7 +142,7 @@
<tableViewSection headerTitle="Limited access" id="GtE-jP-p4q">
<cells>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="56" id="90b-ef-VUJ" customClass="UploadActionCell" customModule="maps_me" customModuleProvider="target">
<rect key="frame" x="0.0" y="332.5" width="375" height="56"/>
<rect key="frame" x="0.0" y="348.5" width="375" height="56"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="90b-ef-VUJ" id="AlV-ie-H63">
<rect key="frame" x="0.0" y="0.0" width="375" height="55.5"/>
@ -141,28 +165,52 @@
<color key="textColor" red="0.1176470588" green="0.58823529409999997" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2Ai-cK-Fh3">
<rect key="frame" x="335" y="16" width="24" height="24"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="height" constant="24" id="4Ee-n2-9vE"/>
<constraint firstAttribute="width" constant="24" id="cE0-J8-T89"/>
</constraints>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ept-QQ-o9W">
<rect key="frame" x="335" y="16" width="24" height="24"/>
<state key="normal" title="Button" image="ic24PxShare"/>
<connections>
<action selector="shareButtonPressed:" destination="90b-ef-VUJ" eventType="touchUpInside" id="D5v-pl-bJ3"/>
</connections>
</button>
</subviews>
<constraints>
<constraint firstItem="saz-sU-6Ej" firstAttribute="leading" secondItem="AlV-ie-H63" secondAttribute="leadingMargin" id="6xx-om-FYX"/>
<constraint firstItem="eP0-FF-mrr" firstAttribute="leading" secondItem="saz-sU-6Ej" secondAttribute="trailing" constant="16" id="9wM-mP-nrJ"/>
<constraint firstAttribute="trailing" secondItem="2Ai-cK-Fh3" secondAttribute="trailing" constant="16" id="DUO-BY-vze"/>
<constraint firstItem="saz-sU-6Ej" firstAttribute="centerY" secondItem="AlV-ie-H63" secondAttribute="centerY" id="RO2-ZE-4ki"/>
<constraint firstItem="2Ai-cK-Fh3" firstAttribute="centerY" secondItem="AlV-ie-H63" secondAttribute="centerY" id="Z69-SL-Gcv"/>
<constraint firstItem="Ept-QQ-o9W" firstAttribute="leading" secondItem="2Ai-cK-Fh3" secondAttribute="leading" id="djD-eC-uUu"/>
<constraint firstItem="Ept-QQ-o9W" firstAttribute="top" secondItem="2Ai-cK-Fh3" secondAttribute="top" id="fEI-o6-bWd"/>
<constraint firstItem="eP0-FF-mrr" firstAttribute="centerY" secondItem="saz-sU-6Ej" secondAttribute="centerY" id="gjd-eI-tRy"/>
<constraint firstItem="2Ai-cK-Fh3" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="eP0-FF-mrr" secondAttribute="trailing" constant="16" id="nQh-lg-Mo1"/>
<constraint firstItem="Ept-QQ-o9W" firstAttribute="trailing" secondItem="2Ai-cK-Fh3" secondAttribute="trailing" id="wJJ-0a-HTe"/>
<constraint firstItem="Ept-QQ-o9W" firstAttribute="bottom" secondItem="2Ai-cK-Fh3" secondAttribute="bottom" id="y1E-c4-RHy"/>
</constraints>
</tableViewCellContentView>
<connections>
<outlet property="actionImage" destination="saz-sU-6Ej" id="98p-ou-d6i"/>
<outlet property="actionTitle" destination="eP0-FF-mrr" id="SCv-0e-YHj"/>
<outlet property="progressView" destination="2Ai-cK-Fh3" id="Hnc-Uy-lQ8"/>
<outlet property="shareButton" destination="Ept-QQ-o9W" id="KN9-Jo-P1q"/>
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" rowHeight="50" id="4dc-7Z-s7O">
<rect key="frame" x="0.0" y="388.5" width="375" height="50"/>
<rect key="frame" x="0.0" y="404.5" width="375" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="4dc-7Z-s7O" id="5YA-YS-3K5">
<rect key="frame" x="0.0" y="0.0" width="375" height="49.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Anyone this the link will see your list" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XQh-26-CNo">
<rect key="frame" x="56" y="20" width="303" height="15.5"/>
<rect key="frame" x="56" y="18" width="303" height="13.5"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
@ -174,8 +222,8 @@
<constraints>
<constraint firstItem="XQh-26-CNo" firstAttribute="leading" secondItem="5YA-YS-3K5" secondAttribute="leading" constant="56" id="YAj-bm-cRZ"/>
<constraint firstAttribute="trailing" secondItem="XQh-26-CNo" secondAttribute="trailing" constant="16" id="a42-ex-JkL"/>
<constraint firstAttribute="bottom" secondItem="XQh-26-CNo" secondAttribute="bottom" constant="14" id="jUr-iV-omT"/>
<constraint firstItem="XQh-26-CNo" firstAttribute="top" secondItem="5YA-YS-3K5" secondAttribute="top" constant="20" id="yhk-td-FO2"/>
<constraint firstAttribute="bottom" secondItem="XQh-26-CNo" secondAttribute="bottom" constant="18" id="jUr-iV-omT"/>
<constraint firstItem="XQh-26-CNo" firstAttribute="top" secondItem="5YA-YS-3K5" secondAttribute="top" constant="18" id="yhk-td-FO2"/>
</constraints>
</tableViewCellContentView>
</tableViewCell>
@ -194,6 +242,7 @@
</connections>
</tableViewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="ylv-YU-ujs" userLabel="First Responder" sceneMemberID="firstResponder"/>
<exit id="wpS-8c-SPb" userLabel="Exit" sceneMemberID="exit"/>
</objects>
<point key="canvasLocation" x="37.600000000000001" y="26.53673163418291"/>
</scene>
@ -201,5 +250,6 @@
<resources>
<image name="ic24PxGlobe" width="24" height="24"/>
<image name="ic24PxLink" width="24" height="24"/>
<image name="ic24PxShare" width="24" height="24"/>
</resources>
</document>

73
iphone/Maps/Bookmarks/Categories/Sharing/BookmarksSharingViewController.swift
View file

@ -3,6 +3,9 @@ import SafariServices
final class BookmarksSharingViewController: MWMTableViewController {
typealias ViewModel = MWMAuthorizationViewModel
var categoryId: MWMMarkGroupID?
var categoryUrl: URL?
@IBOutlet weak var uploadAndPublishCell: UploadActionCell!
@IBOutlet weak var getDirectLinkCell: UploadActionCell!
@ -21,12 +24,21 @@ final class BookmarksSharingViewController: MWMTableViewController {
super.viewDidLoad()
title = L("sharing_options") //"Sharing options"
self.configureActionCells()
configureActionCells()
assert(categoryId != nil, "We can't share nothing")
}
func configureActionCells() {
uploadAndPublishCell.config(title: L("upload_and_publish"), image: UIImage(named: "ic24PxGlobe")!)
getDirectLinkCell.config(title: L("upload_and_get_direct_link"), image: UIImage(named: "ic24PxLink")!)
uploadAndPublishCell.config(titles: [ .normal : L("upload_and_publish"),
.inProgress : L("upload_and_publish_progress_text"),
.completed : L("upload_and_publish_success") ],
image: UIImage(named: "ic24PxGlobe"),
delegate: self)
getDirectLinkCell.config(titles: [ .normal : L("upload_and_get_direct_link"),
.inProgress : L("direct_link_progress_text"),
.completed : L("direct_link_success") ],
image: UIImage(named: "ic24PxLink"), delegate: self)
}
override func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
@ -38,27 +50,56 @@ final class BookmarksSharingViewController: MWMTableViewController {
return section == 0 ? L("public_access") : L("limited_access")
}
override func tableView(_ tableView: UITableView,
willSelectRowAt indexPath: IndexPath) -> IndexPath? {
let cell = tableView.cellForRow(at: indexPath)
if cell == getDirectLinkCell {
if getDirectLinkCell.cellState != .normal {
return nil
}
}
return indexPath
}
override func tableView(_ tableView: UITableView,
didSelectRowAt indexPath: IndexPath) {
tableView.deselectRow(at: indexPath, animated: true)
let cell = tableView.cellForRow(at: indexPath)
if (cell == self.uploadAndPublishCell) {
self.uploadAndPublish()
} else if (cell == self.getDirectLinkCell) {
self.getDirectLink()
if cell == uploadAndPublishCell {
uploadAndPublish()
} else if cell == getDirectLinkCell {
uploadAndGetDirectLink()
}
}
func uploadAndPublish() {
self.performAfterValidation {
performAfterValidation {
//implementation
}
}
func getDirectLink() {
self.performAfterValidation {
//implementation
func uploadAndGetDirectLink() {
performAfterValidation { [weak self] in
guard let categoryId = self?.categoryId else {
assert(false, "categoryId must not be nil")
return
}
MWMBookmarksManager.shared().uploadAndGetDirectLinkCategory(withId: categoryId, progress: { (progress) in
if progress == .uploadStarted {
self?.getDirectLinkCell.cellState = .inProgress
}
}, completion: { (url, error) in
if error != nil {
self?.getDirectLinkCell.cellState = .normal
//handle errors
} else {
self?.getDirectLinkCell.cellState = .completed
self?.categoryUrl = url
}
})
}
}
@ -76,7 +117,15 @@ final class BookmarksSharingViewController: MWMTableViewController {
extension BookmarksSharingViewController: UITextViewDelegate {
func textView(_ textView: UITextView, shouldInteractWith URL: URL, in characterRange: NSRange) -> Bool {
let safari = SFSafariViewController(url: URL)
self.present(safari, animated: true, completion: nil)
present(safari, animated: true, completion: nil)
return false;
}
}
extension BookmarksSharingViewController: UploadActionCellDelegate {
func cellDidPressShareButton(_ cell: UploadActionCell) {
let message = L("share_bookmarks_email_body")
let shareController = MWMActivityViewController.share(for: categoryUrl, message: message)
shareController?.present(inParentViewController: self, anchorView: nil)
}
}

67
iphone/Maps/Bookmarks/Categories/Sharing/UploadActionCell.swift
View file

@ -1,14 +1,65 @@
final class UploadActionCell: MWMTableViewCell {
@IBOutlet private weak var actionImage: UIImageView! {
protocol UploadActionCellDelegate: AnyObject {
func cellDidPressShareButton(_ cell: UploadActionCell)
}
enum UploadActionCellState: String {
case normal
case inProgress
case completed
}
final class UploadActionCell: MWMTableViewCell {
@IBOutlet private weak var actionImage: UIImageView!
@IBOutlet private weak var actionTitle: UILabel!
@IBOutlet private weak var progressView: UIView!
@IBOutlet private weak var shareButton: UIButton!
weak var delegate: UploadActionCellDelegate?
private var titles: [UploadActionCellState : String]?
private lazy var progress: MWMCircularProgress = {
return MWMCircularProgress(parentView: self.progressView)
}()
func config(titles: [UploadActionCellState : String], image: UIImage?, delegate: UploadActionCellDelegate?) {
actionImage.image = image
self.titles = titles
self.delegate = delegate
self.cellState = .normal
}
var cellState: UploadActionCellState = .normal {
didSet {
actionImage.tintColor = .linkBlue()
switch cellState {
case .normal:
progress.state = .normal
actionImage.tintColor = .linkBlue()
actionTitle.textColor = .linkBlue()
actionTitle.font = .regular16()
actionTitle.text = titles?[.normal]
shareButton.isHidden = true
break
case .inProgress:
progress.state = .spinner
actionImage.tintColor = .blackSecondaryText()
actionTitle.textColor = .blackSecondaryText()
actionTitle.font = .italic16()
actionTitle.text = titles?[.inProgress]
shareButton.isHidden = true
break
case .completed:
progress.state = .completed
actionImage.tintColor = .blackSecondaryText()
actionTitle.textColor = .blackSecondaryText()
actionTitle.font = .regular16()
actionTitle.text = titles?[.completed]
shareButton.isHidden = false
break
}
}
}
@IBOutlet private weak var actionTitle: UILabel!
func config(title: String, image: UIImage) {
actionImage.image = image
actionTitle.text = title
@IBAction func shareButtonPressed(_ sender: Any) {
assert(cellState == .completed, "Share button can only be pressed while the cell is in .completed state")
delegate?.cellDidPressShareButton(self)
}
}

1
iphone/Maps/Categories/UIFont+MapsMeFonts.h
View file

@ -39,6 +39,7 @@
+ (UIFont *)bold28;
+ (UIFont *)bold36;
+ (UIFont *)bold48;
+ (UIFont *)italic16;
+ (UIFont *)fontWithName:(NSString *)fontName;

1
iphone/Maps/Categories/UIFont+MapsMeFonts.mm
View file

@ -44,6 +44,7 @@ NSString * const kLightFontName = @"HelveticaNeue-Light";
+ (UIFont *)bold28 { return [UIFont boldSystemFontOfSize:28]; }
+ (UIFont *)bold36 { return [UIFont boldSystemFontOfSize:26]; }
+ (UIFont *)bold48 { return [UIFont boldSystemFontOfSize:48]; }
+ (UIFont *)italic16 { return [UIFont italicSystemFontOfSize:16]; }
+ (UIFont *)fontWithName:(NSString *)fontName
{
#pragma clang diagnostic push

6
iphone/Maps/Core/Bookmarks/MWMBookmarksManager.h
View file

@ -53,12 +53,16 @@ NS_ASSUME_NONNULL_BEGIN
- (void)downloadItemWithId:(NSString *)itemId
name:(NSString *)name
progress:(_Nullable ProgressBlock)progress
completion:(_Nullable CompletionBlock)completion;
completion:(_Nullable DownloadCompletionBlock)completion;
- (BOOL)isCategoryFromCatalog:(MWMMarkGroupID)groupId;
- (NSArray<MWMCatalogCategory *> *)categoriesFromCatalog;
- (NSInteger)getCatalogDownloadsCount;
- (BOOL)isCategoryDownloading:(NSString *)itemId;
- (BOOL)hasCategoryDownloaded:(NSString *)itemId;
- (void)uploadAndGetDirectLinkCategoryWithId:(MWMMarkGroupID)itemId
progress:(ProgressBlock)progress
completion:(UploadCompletionBlock)completion;
@end
NS_ASSUME_NONNULL_END

32
iphone/Maps/Core/Bookmarks/MWMBookmarksManager.mm
View file

@ -158,14 +158,22 @@ NSString * const CloudErrorToString(Cloud::SynchronizationResult result)
[self.catalogObservers removeObjectForKey:observer.categoryId];
}
};
auto onUploadStarted = [](kml::MarkGroupId originCategoryId)
auto onUploadStarted = [self](kml::MarkGroupId originCategoryId)
{
//TODO(@beloal): Implement me.
auto observer = self.catalogObservers[[NSString stringWithFormat:@"%lld", originCategoryId]];
if (observer)
[observer onUploadStart];
};
auto onUploadFinished = [](BookmarkCatalog::UploadResult uploadResult,std::string const & description,
auto onUploadFinished = [self](BookmarkCatalog::UploadResult uploadResult,std::string const & description,
kml::MarkGroupId originCategoryId, kml::MarkGroupId resultCategoryId)
{
//TODO(@beloal): Implement me.
auto observer = self.catalogObservers[[NSString stringWithFormat:@"%lld", originCategoryId]];
if (observer)
{
NSURL * url = [self sharingUrlForCategoryId:resultCategoryId];
[observer onUploadComplete:uploadResult withUrl:url];
[self.catalogObservers removeObjectForKey:observer.categoryId];
}
};
self.bm.SetCatalogHandlers(std::move(onDownloadStarted),
std::move(onDownloadFinished),
@ -499,16 +507,28 @@ NSString * const CloudErrorToString(Cloud::SynchronizationResult result)
- (void)downloadItemWithId:(NSString *)itemId
name:(NSString *)name
progress:(ProgressBlock)progress
completion:(CompletionBlock)completion
completion:(DownloadCompletionBlock)completion
{
auto observer = [[MWMCatalogObserver alloc] init];
observer.categoryId = itemId;
observer.progressBlock = progress;
observer.completionBlock = completion;
observer.downloadCompletionBlock = completion;
[self.catalogObservers setObject:observer forKey:itemId];
self.bm.DownloadFromCatalogAndImport(itemId.UTF8String, name.UTF8String);
}
- (void)uploadAndGetDirectLinkCategoryWithId:(MWMMarkGroupID)itemId
progress:(ProgressBlock)progress
completion:(UploadCompletionBlock)completion
{
auto observer = [[MWMCatalogObserver alloc] init];
observer.categoryId = [NSString stringWithFormat:@"%lld", itemId];
observer.progressBlock = progress;
observer.uploadCompletionBlock = completion;
[self.catalogObservers setObject:observer forKey:observer.categoryId];
GetFramework().GetBookmarkManager().UploadToCatalog(itemId, kml::AccessRules::DirectLink);
}
- (BOOL)isCategoryFromCatalog:(MWMMarkGroupID)groupId
{
return self.bm.IsCategoryFromCatalog(groupId);

18
iphone/Maps/Core/Bookmarks/MWMCatalogCommon.h
View file

@ -3,7 +3,8 @@ typedef NS_ENUM(NSInteger, MWMCategoryProgress)
MWMCategoryProgressDownloadStarted,
MWMCategoryProgressDownloadFinished,
MWMCategoryProgressImportStarted,
MWMCategoryProgressImportFinished
MWMCategoryProgressImportFinished,
MWMCategoryProgressUploadStarted
};
typedef NS_ENUM(NSInteger, MWMCategoryDownloadStatus)
@ -14,13 +15,26 @@ typedef NS_ENUM(NSInteger, MWMCategoryDownloadStatus)
MWMCategoryDownloadStatusDiskError
};
typedef NS_ENUM(NSInteger, MWMCategoryUploadStatus)
{
MWMCategoryUploadStatusNetworkError,
MWMCategoryUploadStatusServerError,
MWMCategoryUploadStatusAuthError,
MWMCategoryUploadStatusMalformedData,
MWMCategoryUploadStatusAccessError,
MWMCategoryUploadStatusInvalidCall
};
static NSErrorDomain const kCatalogErrorDomain = @"com.mapswithme.catalog.error";
static NSInteger const kCategoryDownloadFailedCode = -10;
static NSInteger const kCategoryImportFailedCode = -11;
static NSInteger const kCategoryUploadFailedCode = -12;
static NSString * const kCategoryDownloadStatusKey = @"kCategoryDownloadStatusKey";
static NSString * const kCategoryUploadStatusKey = @"kCategoryUploadStatusKey";
typedef void (^ProgressBlock)(MWMCategoryProgress progress);
typedef void (^CompletionBlock)(UInt64 categoryId, NSError * error);
typedef void (^DownloadCompletionBlock)(UInt64 categoryId, NSError * error);
typedef void (^UploadCompletionBlock)(NSURL * url, NSError * error);

5
iphone/Maps/Core/Bookmarks/MWMCatalogObserver.h
View file

@ -8,11 +8,14 @@
@property (copy, nonatomic) NSString * categoryId;
@property (copy, nonatomic) ProgressBlock progressBlock;
@property (copy, nonatomic) CompletionBlock completionBlock;
@property (copy, nonatomic) DownloadCompletionBlock downloadCompletionBlock;
@property (copy, nonatomic) UploadCompletionBlock uploadCompletionBlock;
- (void)onDownloadStart;
- (void)onDownloadComplete:(BookmarkCatalog::DownloadResult)result;
- (void)onImportStart;
- (void)onImportCompleteSuccessful:(BOOL)success forCategoryId:(UInt64)categoryId;
- (void)onUploadStart;
- (void)onUploadComplete:(BookmarkCatalog::UploadResult)result withUrl:(NSURL *)categoryUrl;
@end

52
iphone/Maps/Core/Bookmarks/MWMCatalogObserver.mm
View file

@ -33,10 +33,10 @@
//TODO(@beloal)
break;
}
if (self.completionBlock)
self.completionBlock(0, [[NSError alloc] initWithDomain:kCatalogErrorDomain
code:kCategoryDownloadFailedCode
userInfo:@{kCategoryDownloadStatusKey : @(downloadStatus)}]);
if (self.downloadCompletionBlock)
self.downloadCompletionBlock(0, [[NSError alloc] initWithDomain:kCatalogErrorDomain
code:kCategoryDownloadFailedCode
userInfo:@{kCategoryDownloadStatusKey : @(downloadStatus)}]);
}
- (void)onImportStart
@ -47,12 +47,52 @@
- (void)onImportCompleteSuccessful:(BOOL)success forCategoryId:(UInt64)categoryId
{
if (self.completionBlock) {
if (self.downloadCompletionBlock) {
NSError * error = success ? nil : [[NSError alloc] initWithDomain:kCatalogErrorDomain
code:kCategoryImportFailedCode
userInfo:nil];
self.completionBlock(categoryId, error);
self.downloadCompletionBlock(categoryId, error);
}
}
- (void)onUploadStart
{
if (self.progressBlock)
self.progressBlock(MWMCategoryProgressUploadStarted);
}
- (void)onUploadComplete:(BookmarkCatalog::UploadResult)result withUrl:(NSURL *)categoryUrl
{
MWMCategoryUploadStatus uploadStatus;
switch (result)
{
case BookmarkCatalog::UploadResult::Success:
if (self.uploadCompletionBlock)
self.uploadCompletionBlock(categoryUrl, nil);
return;
case BookmarkCatalog::UploadResult::NetworkError:
uploadStatus = MWMCategoryUploadStatusNetworkError;
break;
case BookmarkCatalog::UploadResult::ServerError:
uploadStatus = MWMCategoryUploadStatusServerError;
break;
case BookmarkCatalog::UploadResult::AuthError:
uploadStatus = MWMCategoryUploadStatusAuthError;
break;
case BookmarkCatalog::UploadResult::MalformedDataError:
uploadStatus = MWMCategoryUploadStatusMalformedData;
break;
case BookmarkCatalog::UploadResult::AccessError:
uploadStatus = MWMCategoryUploadStatusAccessError;
break;
case BookmarkCatalog::UploadResult::InvalidCall:
uploadStatus = MWMCategoryUploadStatusInvalidCall;
break;
}
if (self.uploadCompletionBlock)
self.uploadCompletionBlock(nil, [[NSError alloc] initWithDomain:kCatalogErrorDomain
code:kCategoryUploadFailedCode
userInfo:@{kCategoryUploadStatusKey : @(uploadStatus)}]);
}
@end

15
iphone/Maps/Images.xcassets/Sharing/ic24PxShare.imageset/Contents.json vendored Normal file
View file

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

BIN
iphone/Maps/Images.xcassets/Sharing/ic24PxShare.imageset/ic24PxShare.pdf vendored Normal file
View file

Binary file not shown.

4
platform/http_uploader_apple.mm
View file

@ -91,6 +91,10 @@
NSString * boundary = [NSString stringWithFormat:@"Boundary-%@", [[NSUUID UUID] UUIDString]];
NSString * contentType = [NSString stringWithFormat:@"multipart/form-data; boundary=%@", boundary];
[uploadRequest setValue:contentType forHTTPHeaderField:@"Content-Type"];
[self.headers enumerateKeysAndObjectsUsingBlock:^(NSString * key, NSString * value, BOOL * stop) {
[uploadRequest setValue:value forHTTPHeaderField:key];
}];
NSData * postData = [self requestDataWithBoundary:boundary];