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

[ios] ugc routes fixes

Browse source
This commit is contained in:
o.bolovintseva 2018-11-23 14:48:10 +03:00 • committed by Aleksey Belousov
parent 502fb56108
commit 4c69f45b3c
9 changed files with 75 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
iphone/Maps/Bookmarks/Categories/Category settings/CategorySettingsViewController.swift
View file

@ -41,11 +41,11 @@ class CategorySettingsViewController: MWMTableViewController {
func configureAccessStatus() {
switch MWMBookmarksManager.shared().getCategoryAccessStatus(categoryId!) {
case .local:
accessStatusLabel.text = "Not shared"
accessStatusLabel.text = L("not_shared")
case .public:
accessStatusLabel.text = "Public"
accessStatusLabel.text = L("bookmarks_public_access")
case .private:
accessStatusLabel.text = "Private"
accessStatusLabel.text = L("bookmarks_link_access")
case .other:
assert(false, "it's not ok that this category has such access status")
}

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

@ -83,7 +83,7 @@
<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">
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" rowHeight="95" id="VdZ-fO-p63" customClass="MWMTableViewCell">
<rect key="frame" x="0.0" y="111.5" width="375" height="95"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="VdZ-fO-p63" id="Y9s-zu-iol">
@ -97,6 +97,8 @@
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="upload_and_publish_desc"/>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/>
</userDefinedRuntimeAttributes>
</label>
</subviews>
@ -108,7 +110,7 @@
</constraints>
</tableViewCellContentView>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" rowHeight="86" id="3UL-dT-hKc">
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" rowHeight="86" id="3UL-dT-hKc" customClass="MWMTableViewCell">
<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">
@ -118,6 +120,7 @@
<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="18" width="303" height="49.5"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="tintColor" red="0.1176470588" green="0.58823529409999997" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<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"/>
<textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
@ -139,7 +142,7 @@
</constraints>
</tableViewCellContentView>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="50" id="y5U-AG-X4u">
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="50" id="y5U-AG-X4u" customClass="MWMTableViewCell">
<rect key="frame" x="0.0" y="292.5" width="375" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="y5U-AG-X4u" id="2pY-Yp-mFr">
@ -244,7 +247,7 @@
<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">
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" rowHeight="50" id="4dc-7Z-s7O" customClass="MWMTableViewCell">
<rect key="frame" x="0.0" y="454.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">
@ -258,6 +261,8 @@
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="get_direct_link_desc"/>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/>
</userDefinedRuntimeAttributes>
</label>
</subviews>
@ -310,6 +315,8 @@
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="ugc_route_tags_desc"/>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/>
</userDefinedRuntimeAttributes>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1u2-6K-X3l">
@ -320,7 +327,7 @@
</constraints>
</view>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="1u2-6K-X3l" secondAttribute="trailing" id="6eR-E7-9k1"/>
<constraint firstItem="1u2-6K-X3l" firstAttribute="leading" secondItem="KY2-7H-0bb" secondAttribute="leading" id="Dnm-2Z-JFd"/>
@ -349,10 +356,12 @@
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="ugc_route_tags_progress_msg"/>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/>
</userDefinedRuntimeAttributes>
</label>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="bottom" secondItem="27q-vH-fsJ" secondAttribute="bottom" id="1dw-3l-oFP"/>
<constraint firstAttribute="height" constant="105" id="N8W-R4-NUP"/>
@ -366,7 +375,7 @@
<subviews>
<collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="UZU-x1-VBd">
<rect key="frame" x="0.0" y="0.0" width="375" height="426"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<viewLayoutGuide key="safeArea" id="AgH-PG-DAM"/>
<collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="fbB-dB-9OF" customClass="TagsCollectionViewLayout" customModule="maps_me" customModuleProvider="target">
<size key="itemSize" width="178" height="97"/>
@ -406,6 +415,7 @@
<userDefinedRuntimeAttribute type="number" keyPath="layer.borderWidth">
<integer key="value" value="1"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
</userDefinedRuntimeAttributes>
</view>
</subviews>
@ -431,6 +441,10 @@
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="12"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.38" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/>
</userDefinedRuntimeAttributes>
</label>
</subviews>
<constraints>
@ -449,7 +463,7 @@
</connections>
</collectionView>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="UZU-x1-VBd" secondAttribute="trailing" id="1hh-7K-CpC"/>
<constraint firstItem="UZU-x1-VBd" firstAttribute="top" secondItem="crb-Hn-y9s" secondAttribute="top" id="lBd-Yh-hhM"/>
@ -458,6 +472,7 @@
</constraints>
</view>
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</stackView>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@ -468,6 +483,9 @@
<constraint firstItem="7vG-MC-M3b" firstAttribute="leading" secondItem="0d6-uC-MKC" secondAttribute="leading" id="D5c-Nv-S6k"/>
</constraints>
<viewLayoutGuide key="safeArea" id="0d6-uC-MKC"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
</userDefinedRuntimeAttributes>
</view>
<toolbarItems/>
<simulatedToolbarMetrics key="simulatedBottomBarMetrics"/>
@ -498,7 +516,7 @@
<sections>
<tableViewSection headerTitle="LOCAL OR TRAVELLER" id="M1K-Vf-5wl">
<cells>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="115" id="BxX-r9-FhR">
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="115" id="BxX-r9-FhR" customClass="MWMTableViewCell">
<rect key="frame" x="0.0" y="55.5" width="375" height="115"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="BxX-r9-FhR" id="2z2-uI-iUF">

15
iphone/Maps/Bookmarks/Categories/Sharing/Tags/SharingTagsViewController.swift
View file

@ -34,14 +34,25 @@ final class SharingTagsViewController: MWMViewController {
collectionView.allowsMultipleSelection = true
collectionView.contentInset = UIEdgeInsets(top: 16, left: 16, bottom: 16, right: 16)
loadTags()
}
func loadTags() {
progress.state = .spinner
self.loadingTagsView.isHidden = false
dataSource.loadTags { success in
self.progress.state = .completed
self.progress.state = .normal
self.loadingTagsView.isHidden = true
if success {
self.collectionView.reloadData()
} else {
//TODO: handle errors
MWMAlertViewController.activeAlert().presentTagsLoadingErrorAlert(okBlock: { [weak self] in
self?.loadTags()
}, cancel: { [weak self] in
self?.onCancel()
})
}
}
}

3
iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.h
View file

@ -57,6 +57,9 @@
rightButtonAction:(nonnull MWMVoidBlock)rightButton
leftButtonAction:(nonnull MWMVoidBlock)leftButton;
- (void)presentTagsLoadingErrorAlertWithOkBlock:(nonnull MWMVoidBlock)okBlock
cancelBlock:(nonnull MWMVoidBlock)cancelBlock;
- (void)presentDefaultAlertWithTitle:(nonnull NSString *)title
message:(nullable NSString *)message
rightButtonTitle:(nonnull NSString *)rightButtonTitle

7
iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm
View file

@ -255,6 +255,13 @@ static NSString * const kAlertControllerNibIdentifier = @"MWMAlertViewController
leftButtonAction:leftButton]];
}
- (void)presentTagsLoadingErrorAlertWithOkBlock:(nonnull MWMVoidBlock)okBlock
cancelBlock:(nonnull MWMVoidBlock)cancelBlock
{
[self displayAlert:[MWMAlert tagsLoadingErrorAlertWithOkBlock:okBlock
cancelBlock:cancelBlock]];
}
- (void)presentDefaultAlertWithTitle:(nonnull NSString *)title
message:(nullable NSString *)message
rightButtonTitle:(nonnull NSString *)rightButtonTitle

1
iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.h
View file

@ -44,6 +44,7 @@
+ (MWMAlert *)restoreBookmarkAlertWithMessage:(NSString *)message
rightButtonAction:(MWMVoidBlock)rightButton
leftButtonAction:(MWMVoidBlock)leftButton;
+ (MWMAlert *)tagsLoadingErrorAlertWithOkBlock:okBlock cancelBlock:cancelBlock;
+ (MWMAlert *)defaultAlertWithTitle:(NSString *)title
message:(NSString *)message

5
iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm
View file

@ -192,6 +192,11 @@
leftButtonAction:leftButton];
}
+ (MWMAlert *)tagsLoadingErrorAlertWithOkBlock:okBlock cancelBlock:cancelBlock
{
return [MWMDefaultAlert tagsLoadingErrorAlertWithOkBlock:okBlock cancelBlock:cancelBlock];
}
+ (MWMAlert *)defaultAlertWithTitle:(NSString *)title
message:(NSString *)message
rightButtonTitle:(NSString *)rightButtonTitle

2
iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.h
View file

@ -44,6 +44,8 @@
rightButtonAction:(MWMVoidBlock)rightButton
leftButtonAction:(MWMVoidBlock)leftButton;
+ (instancetype)tagsLoadingErrorAlertWithOkBlock:(MWMVoidBlock)okBlock cancelBlock:(MWMVoidBlock)cancelBlock;
+ (instancetype)defaultAlertWithTitle:(NSString *)title
message:(NSString *)message
rightButtonTitle:(NSString *)rightButtonTitle

14
iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.mm
View file

@ -450,6 +450,20 @@ static NSString * const kDefaultAlertNibName = @"MWMDefaultAlert";
statisticsEvent:nil];
}
+ (instancetype)tagsLoadingErrorAlertWithOkBlock:(MWMVoidBlock)okBlock cancelBlock:(MWMVoidBlock)cancelBlock
{
MWMDefaultAlert * alert =
[self defaultAlertWithTitle:L(@"title_error_downloading_bookmarks")
message:L(@"tags_loading_error_subtitle")
rightButtonTitle:L(@"downloader_retry")
leftButtonTitle:L(@"cancel")
rightButtonAction:okBlock
statisticsEvent:nil];
alert.leftButtonAction = cancelBlock;
[alert setNeedsCloseAlertAfterEnterBackground];
return alert;
}
+ (instancetype)defaultAlertWithTitle:(NSString *)title
message:(NSString *)message
rightButtonTitle:(NSString *)rightButtonTitle