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

[iOS] Renamed GuideDescription in Bookmarks Sharing

Browse source
This commit is contained in:
Alexander Boriskov 2020-09-14 12:13:17 +03:00 • committed by Aleksey Belousov
parent c28c83d94d
commit 507dd6ba18
5 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Yad-RH-i8M">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Yad-RH-i8M">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
@ -866,7 +866,7 @@ upload photos and more</string>
<!--Guide name-->
<scene sceneID="gWg-zK-J9t">
<objects>
<tableViewController storyboardIdentifier="guideName" id="cvj-kq-BmC" customClass="GuideNameViewController" customModule="maps_me" customModuleProvider="target" sceneMemberID="viewController">
<tableViewController storyboardIdentifier="guideName" id="cvj-kq-BmC" customClass="GuideSharingNameViewController" customModule="maps_me" customModuleProvider="target" sceneMemberID="viewController">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" id="Uwp-K9-cnW">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@ -932,7 +932,7 @@ The name shouldn't contain special symbols or digits. The name shouldn't be 'My
<!--Description-->
<scene sceneID="j38-lP-seP">
<objects>
<tableViewController storyboardIdentifier="guideDescription" id="Stq-Tq-XqB" customClass="GuideDescriptionViewController" customModule="maps_me" customModuleProvider="target" sceneMemberID="viewController">
<tableViewController storyboardIdentifier="guideDescription" id="Stq-Tq-XqB" customClass="GuideSharingDescriptionViewController" customModule="maps_me" customModuleProvider="target" sceneMemberID="viewController">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" id="Y7n-SR-xIH">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>

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

@ -396,7 +396,7 @@ final class BookmarksSharingViewController: MWMTableViewController {
private func showEditName() {
let storyboard = UIStoryboard.instance(.sharing)
let guideNameController = storyboard.instantiateViewController(withIdentifier: kNameControllerIdentifier)
as! GuideNameViewController
as! GuideSharingNameViewController
guideNameController.guideName = category.title
guideNameController.delegate = self
navigationController?.pushViewController(guideNameController, animated: true)
@ -405,7 +405,7 @@ final class BookmarksSharingViewController: MWMTableViewController {
private func showEditDescr() {
let storyboard = UIStoryboard.instance(.sharing)
let guideDescrController = storyboard.instantiateViewController(withIdentifier: kDescriptionControllerIdentifier)
as! GuideDescriptionViewController
as! GuideSharingDescriptionViewController
guideDescrController.guideDescription = category.detailedAnnotation
guideDescrController.delegate = self
@ -504,15 +504,15 @@ extension BookmarksSharingViewController: EditOnWebViewControllerDelegate {
}
}
extension BookmarksSharingViewController: GuideNameViewControllerDelegate {
func viewController(_ viewController: GuideNameViewController, didFinishEditing text: String) {
extension BookmarksSharingViewController: GuideSharingNameViewControllerDelegate {
func viewController(_ viewController: GuideSharingNameViewController, didFinishEditing text: String) {
category.title = text
showEditDescr()
}
}
extension BookmarksSharingViewController: GuideDescriptionViewControllerDelegate {
func viewController(_ viewController: GuideDescriptionViewController, didFinishEditing text: String) {
extension BookmarksSharingViewController: GuideSharingDescriptionViewControllerDelegate {
func viewController(_ viewController: GuideSharingDescriptionViewController, didFinishEditing text: String) {
category.detailedAnnotation = text
showSelectProperties()
}

10
iphone/Maps/Bookmarks/Categories/Sharing/GuideDescriptionViewController.swift → iphone/Maps/Bookmarks/Categories/Sharing/GuideSharingDescriptionViewController.swift
View file

@ -1,14 +1,14 @@
protocol GuideDescriptionViewControllerDelegate {
func viewController(_ viewController: GuideDescriptionViewController, didFinishEditing text: String)
protocol GuideSharingDescriptionViewControllerDelegate {
func viewController(_ viewController: GuideSharingDescriptionViewController, didFinishEditing text: String)
}
fileprivate let kLengthLimit = 500
class GuideDescriptionViewController: MWMTableViewController {
class GuideSharingDescriptionViewController: MWMTableViewController {
@IBOutlet weak var nextBarButton: UIBarButtonItem!
@IBOutlet weak var descriptionTextView: MWMTextView!
var delegate: GuideDescriptionViewControllerDelegate?
var delegate: GuideSharingDescriptionViewControllerDelegate?
var guideDescription: String? {
didSet {
if let str = guideDescription, str.count > kLengthLimit {
@ -39,7 +39,7 @@ class GuideDescriptionViewController: MWMTableViewController {
}
}
extension GuideDescriptionViewController: UITextViewDelegate {
extension GuideSharingDescriptionViewController: UITextViewDelegate {
func textViewDidChange(_ textView: UITextView) {
nextBarButton.isEnabled = textView.text.count > 0
}

10
iphone/Maps/Bookmarks/Categories/Sharing/GuideNameViewController.swift → iphone/Maps/Bookmarks/Categories/Sharing/GuideSharingNameViewController.swift
View file

@ -1,13 +1,13 @@
protocol GuideNameViewControllerDelegate {
func viewController(_ viewController: GuideNameViewController, didFinishEditing text: String)
protocol GuideSharingNameViewControllerDelegate {
func viewController(_ viewController: GuideSharingNameViewController, didFinishEditing text: String)
}
class GuideNameViewController: MWMTableViewController {
class GuideSharingNameViewController: MWMTableViewController {
@IBOutlet weak var nextBarButton: UIBarButtonItem!
@IBOutlet weak var nameTextField: UITextField!
var guideName: String?
var delegate: GuideNameViewControllerDelegate?
var delegate: GuideSharingNameViewControllerDelegate?
override func viewDidLoad() {
super.viewDidLoad()
@ -37,7 +37,7 @@ class GuideNameViewController: MWMTableViewController {
}
}
extension GuideNameViewController: UITextFieldDelegate {
extension GuideSharingNameViewController: UITextFieldDelegate {
func textField(_ textField: UITextField,
shouldChangeCharactersIn range: NSRange,
replacementString string: String) -> Bool {

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

@ -368,8 +368,7 @@
47699A0A21F0C4C8009E6585 /* NotificationManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47699A0921F0C4C8009E6585 /* NotificationManager.swift */; };
477219052243E79500E5B227 /* DrivingOptionsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 477219042243E79500E5B227 /* DrivingOptionsViewController.swift */; };
477D7AC7218F1515007EE2CB /* IPaidRoutePurchase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 477D7AC6218F1515007EE2CB /* IPaidRoutePurchase.swift */; };
47868A7B22145A2C000AFC86 /* GuideNameViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47868A7A22145A2C000AFC86 /* GuideNameViewController.swift */; };
47868A7D22145A95000AFC86 /* GuideDescriptionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47868A7C22145A95000AFC86 /* GuideDescriptionViewController.swift */; };
47868A7D22145A95000AFC86 /* GuideSharingDescriptionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47868A7C22145A95000AFC86 /* GuideSharingDescriptionViewController.swift */; };
4788739220EE326500F6826B /* VerticallyAlignedButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4788739120EE326400F6826B /* VerticallyAlignedButton.swift */; };
478F6FA423C447E500054A53 /* ReviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 478F6FA323C447E500054A53 /* ReviewView.swift */; };
478F6FA623C4521F00054A53 /* MoreReviewsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 478F6FA523C4521F00054A53 /* MoreReviewsViewController.swift */; };
@ -553,6 +552,7 @@
990F33B624BC915200D0F426 /* SearchActionBarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 990F33B524BC915200D0F426 /* SearchActionBarView.swift */; };
9917D17D2396793A00A7E06E /* PaidRoutesSubscriptionCampaign.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9917D17C2396793A00A7E06E /* PaidRoutesSubscriptionCampaign.swift */; };
9917D17F2397B1D600A7E06E /* IPadModalPresentationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9917D17E2397B1D600A7E06E /* IPadModalPresentationController.swift */; };
991A726C250F666D0075348C /* GuideSharingNameViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 991A726B250F666D0075348C /* GuideSharingNameViewController.swift */; };
991CE2BF2371D349009EB02A /* ABTestManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 991CE2BA2371D349009EB02A /* ABTestManager.swift */; };
991CE2C02371D349009EB02A /* IABTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 991CE2BB2371D349009EB02A /* IABTest.swift */; };
991CE2C22371D349009EB02A /* PromoDiscoveryCampaign.swift in Sources */ = {isa = PBXBuildFile; fileRef = 991CE2BE2371D349009EB02A /* PromoDiscoveryCampaign.swift */; };
@ -1510,8 +1510,7 @@
47699A0921F0C4C8009E6585 /* NotificationManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationManager.swift; sourceTree = "<group>"; };
477219042243E79500E5B227 /* DrivingOptionsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DrivingOptionsViewController.swift; sourceTree = "<group>"; };
477D7AC6218F1515007EE2CB /* IPaidRoutePurchase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IPaidRoutePurchase.swift; sourceTree = "<group>"; };
47868A7A22145A2C000AFC86 /* GuideNameViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GuideNameViewController.swift; sourceTree = "<group>"; };
47868A7C22145A95000AFC86 /* GuideDescriptionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GuideDescriptionViewController.swift; sourceTree = "<group>"; };
47868A7C22145A95000AFC86 /* GuideSharingDescriptionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GuideSharingDescriptionViewController.swift; sourceTree = "<group>"; };
4788739120EE326400F6826B /* VerticallyAlignedButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VerticallyAlignedButton.swift; sourceTree = "<group>"; };
478F6FA323C447E500054A53 /* ReviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReviewView.swift; sourceTree = "<group>"; };
478F6FA523C4521F00054A53 /* MoreReviewsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoreReviewsViewController.swift; sourceTree = "<group>"; };
@ -1656,6 +1655,7 @@
990F33B524BC915200D0F426 /* SearchActionBarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchActionBarView.swift; sourceTree = "<group>"; };
9917D17C2396793A00A7E06E /* PaidRoutesSubscriptionCampaign.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaidRoutesSubscriptionCampaign.swift; sourceTree = "<group>"; };
9917D17E2397B1D600A7E06E /* IPadModalPresentationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IPadModalPresentationController.swift; sourceTree = "<group>"; };
991A726B250F666D0075348C /* GuideSharingNameViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GuideSharingNameViewController.swift; sourceTree = "<group>"; };
991CE2BA2371D349009EB02A /* ABTestManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ABTestManager.swift; sourceTree = "<group>"; };
991CE2BB2371D349009EB02A /* IABTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IABTest.swift; sourceTree = "<group>"; };
991CE2BE2371D349009EB02A /* PromoDiscoveryCampaign.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PromoDiscoveryCampaign.swift; sourceTree = "<group>"; };
@ -2475,8 +2475,8 @@
33F8BA3B2199858B00ECA8EE /* Tags */,
47289E582212DFFF002ABFC0 /* EditOnWebAlertViewController.swift */,
47289E592212DFFF002ABFC0 /* EditOnWebAlertViewController.xib */,
47868A7A22145A2C000AFC86 /* GuideNameViewController.swift */,
47868A7C22145A95000AFC86 /* GuideDescriptionViewController.swift */,
991A726B250F666D0075348C /* GuideSharingNameViewController.swift */,
47868A7C22145A95000AFC86 /* GuideSharingDescriptionViewController.swift */,
);
path = Sharing;
sourceTree = "<group>";
@ -5686,7 +5686,6 @@
F6E2FE281E097BA00083EBEC /* MWMOpeningHoursSection.mm in Sources */,
3406FA161C6E0C3300E9FAD2 /* MWMMapDownloadDialog.mm in Sources */,
340416481E7BF28E00E2B6D6 /* UIView+Snapshot.swift in Sources */,
47868A7B22145A2C000AFC86 /* GuideNameViewController.swift in Sources */,
34AB66501FC5AA330078E451 /* RoutePreviewTaxiCell.swift in Sources */,
F6E2FE251E097BA00083EBEC /* MWMOpeningHoursModel.mm in Sources */,
99AAEA74244DA5ED0039D110 /* BottomMenuPresentationController.swift in Sources */,
@ -5816,6 +5815,7 @@
340E1EFB1E2F614400CE49BF /* Storyboard.swift in Sources */,
34E776331F15FAC2003040B3 /* MWMPlacePageManagerHelper.mm in Sources */,
993DF12D23F6BDB100AC231A /* GlobalStyleSheet.swift in Sources */,
991A726C250F666D0075348C /* GuideSharingNameViewController.swift in Sources */,
F6E2FF361E097BA00083EBEC /* MWMSearchSuggestionCell.mm in Sources */,
3472B5CF200F4A2B00DC6CD5 /* BackgroundFetchTask.swift in Sources */,
477219052243E79500E5B227 /* DrivingOptionsViewController.swift in Sources */,
@ -5969,7 +5969,7 @@
34C9BD051C6DB693000DC38D /* MWMViewController.m in Sources */,
47699A0A21F0C4C8009E6585 /* NotificationManager.swift in Sources */,
331630D12191D74B00BB91A9 /* TagSectionHeaderView.swift in Sources */,
47868A7D22145A95000AFC86 /* GuideDescriptionViewController.swift in Sources */,
47868A7D22145A95000AFC86 /* GuideSharingDescriptionViewController.swift in Sources */,
F6E2FDA41E097BA00083EBEC /* MWMCuisineEditorViewController.mm in Sources */,
3454D7CB1E07F045004AF2AD /* UIColor+MapsMeColor.m in Sources */,
34B127EA1FBDD410008713D9 /* MWMRouterTransitStepInfo.mm in Sources */,