From e75bb9dae087826cc0be359316e650050fd658dc Mon Sep 17 00:00:00 2001 From: Ilya Grechuhin Date: Thu, 3 Aug 2017 15:55:27 +0300 Subject: [PATCH] =?UTF-8?q?[MAPSME-5030]=20[ios]=20Added=20=C2=ABManage=20?= =?UTF-8?q?Route=C2=BB=20buttons.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MWMMapViewControlsManager.h | 1 - .../MWMNavigationDashboardManager.mm | 2 +- .../RoutePreview/MWMiPadRoutePreview.xib | 43 +++++++++++++++++- .../RoutePreview/MWMiPhoneRoutePreview.xib | 40 +++++++++++++++- .../RoutePreview/RoutePreviewStatus.swift | 42 ++++++++++++++++- .../ic_24px_manager.imageset/Contents.json | 15 ++++++ .../ic_24px_manager.pdf | Bin 0 -> 6118 bytes iphone/Maps/Maps.xcodeproj/project.pbxproj | 40 ++++++++-------- 8 files changed, 157 insertions(+), 26 deletions(-) create mode 100644 iphone/Maps/Images.xcassets/ic_24px_manager.imageset/Contents.json create mode 100644 iphone/Maps/Images.xcassets/ic_24px_manager.imageset/ic_24px_manager.pdf diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.h b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.h index 9b8b6e6a5e..bad1c6a1fa 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.h +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.h @@ -42,7 +42,6 @@ - (void)onRoutePrepare; - (void)onRouteRebuild; -- (void)onRouteError; - (void)onRouteReady; - (void)onRouteStart; - (void)onRouteStop; diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm index 91e6e14499..109a050cc8 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm @@ -148,7 +148,7 @@ using Observers = NSHashTable; self.navigationInfoView = nil; self.navigationControlView.isVisible = NO; self.navigationControlView = nil; - [self.statusBox stateNavigation]; + [self.statusBox stateHidden]; self.statusBox = nil; } diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPadRoutePreview.xib b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPadRoutePreview.xib index ea8a900845..06c6451d52 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPadRoutePreview.xib +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPadRoutePreview.xib @@ -122,7 +122,7 @@ - + @@ -242,6 +242,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPhoneRoutePreview.xib b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPhoneRoutePreview.xib index b85b341d10..582476df55 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPhoneRoutePreview.xib +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPhoneRoutePreview.xib @@ -138,7 +138,7 @@ - + @@ -175,6 +175,12 @@ + + + + + + + + + + diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus.swift b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus.swift index 21c2c3659e..ffd3fa19bd 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus.swift +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus.swift @@ -3,17 +3,36 @@ final class RoutePreviewStatus: SolidTouchView { @IBOutlet private weak var errorBox: UIView! @IBOutlet private weak var resultsBox: UIView! @IBOutlet private weak var heightBox: UIView! + @IBOutlet private weak var manageRouteBox: UIView! { + didSet { + iPhoneSpecific { + manageRouteBox.backgroundColor = UIColor.blackOpaque() + } + } + } @IBOutlet private weak var taxiBox: UIView! @IBOutlet private weak var errorLabel: UILabel! @IBOutlet private weak var resultLabel: UILabel! @IBOutlet private weak var arriveLabel: UILabel? @IBOutlet private weak var heightProfileImage: UIImageView! @IBOutlet private weak var heightProfileElevationHeight: UILabel? + @IBOutlet private weak var manageRouteButtonRegular: UIButton! { + didSet { + configManageRouteButton(manageRouteButtonRegular) + } + } + @IBOutlet private weak var manageRouteButtonCompact: UIButton? { + didSet { + configManageRouteButton(manageRouteButtonCompact!) + } + } @IBOutlet private var errorBoxBottom: NSLayoutConstraint! @IBOutlet private var resultsBoxBottom: NSLayoutConstraint! @IBOutlet private var heightBoxBottom: NSLayoutConstraint! @IBOutlet private var taxiBoxBottom: NSLayoutConstraint! + @IBOutlet private var manageRouteBoxBottom: NSLayoutConstraint! + @IBOutlet private var heightBoxBottomManageRouteBoxTop: NSLayoutConstraint! private var hiddenConstraint: NSLayoutConstraint! weak var ownerView: UIView! @@ -64,11 +83,31 @@ final class RoutePreviewStatus: SolidTouchView { self.errorBoxBottom.isActive = !self.errorBox.isHidden self.resultsBoxBottom.isActive = !self.resultsBox.isHidden self.heightBoxBottom.isActive = !self.heightBox.isHidden + self.heightBoxBottomManageRouteBoxTop.isActive = !self.heightBox.isHidden self.taxiBoxBottom.isActive = !self.taxiBox.isHidden + self.manageRouteBoxBottom.isActive = !self.manageRouteBox.isHidden UIView.animate(withDuration: kDefaultAnimationDuration) { self.layoutIfNeeded() } } } + private func configManageRouteButton(_ button: UIButton) { + button.titleLabel?.font = UIFont.medium14() + button.setTitle(L("planning_route_manage_route"), for: .normal) + button.tintColor = UIColor.blackSecondaryText() + } + + override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) { + super.traitCollectionDidChange(previousTraitCollection) + updateManageRouteVisibility() + updateHeight() + } + + private func updateManageRouteVisibility() { + let isCompact = traitCollection.verticalSizeClass == .compact + manageRouteBox.isHidden = isCompact || resultsBox.isHidden + manageRouteButtonCompact?.isHidden = !isCompact + } + func stateHidden() { isVisible = false } @@ -83,6 +122,7 @@ final class RoutePreviewStatus: SolidTouchView { resultsBox.isHidden = true heightBox.isHidden = true taxiBox.isHidden = true + manageRouteBox.isHidden = true errorLabel.text = message @@ -111,7 +151,7 @@ final class RoutePreviewStatus: SolidTouchView { heightBox.isHidden = true } } - + updateManageRouteVisibility() updateHeight() } diff --git a/iphone/Maps/Images.xcassets/ic_24px_manager.imageset/Contents.json b/iphone/Maps/Images.xcassets/ic_24px_manager.imageset/Contents.json new file mode 100644 index 0000000000..840060b1f4 --- /dev/null +++ b/iphone/Maps/Images.xcassets/ic_24px_manager.imageset/Contents.json @@ -0,0 +1,15 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "ic_24px_manager.pdf" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + }, + "properties" : { + "template-rendering-intent" : "template" + } +} \ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/ic_24px_manager.imageset/ic_24px_manager.pdf b/iphone/Maps/Images.xcassets/ic_24px_manager.imageset/ic_24px_manager.pdf new file mode 100644 index 0000000000000000000000000000000000000000..e4a81acfc1338e2c342496b0bb45a109348bec9a GIT binary patch literal 6118 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 DJ|Rd> literal 0 HcmV?d00001 diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 390c6d1303..d1a6ece980 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -329,6 +329,9 @@ 3476B8E01BFDD33A00874594 /* tts-how-to-set-up-voice-img in Resources */ = {isa = PBXBuildFile; fileRef = 3476B8DF1BFDD33A00874594 /* tts-how-to-set-up-voice-img */; }; 3476B8E11BFDD33A00874594 /* tts-how-to-set-up-voice-img in Resources */ = {isa = PBXBuildFile; fileRef = 3476B8DF1BFDD33A00874594 /* tts-how-to-set-up-voice-img */; }; 347A4C5E1C4E76C9006BA66E /* liboauthcpp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 340DC82B1C4E72C700EAA2CC /* liboauthcpp.a */; }; + 347BFA8F1F27909200E5531F /* MenuArea.swift in Sources */ = {isa = PBXBuildFile; fileRef = 347BFA8E1F27909200E5531F /* MenuArea.swift */; }; + 347BFA901F27909200E5531F /* MenuArea.swift in Sources */ = {isa = PBXBuildFile; fileRef = 347BFA8E1F27909200E5531F /* MenuArea.swift */; }; + 347BFA911F27909200E5531F /* MenuArea.swift in Sources */ = {isa = PBXBuildFile; fileRef = 347BFA8E1F27909200E5531F /* MenuArea.swift */; }; 347E1A881F1F5DD7002BF7A8 /* CianItemModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 347E1A871F1F5DD7002BF7A8 /* CianItemModel.swift */; }; 347E1A891F1F5DD7002BF7A8 /* CianItemModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 347E1A871F1F5DD7002BF7A8 /* CianItemModel.swift */; }; 347E1A8A1F1F5DD7002BF7A8 /* CianItemModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 347E1A871F1F5DD7002BF7A8 /* CianItemModel.swift */; }; @@ -344,9 +347,6 @@ 347E1A991F1F7404002BF7A8 /* CianElement.xib in Resources */ = {isa = PBXBuildFile; fileRef = 347E1A951F1F7404002BF7A8 /* CianElement.xib */; }; 347E1A9A1F1F7404002BF7A8 /* CianElement.xib in Resources */ = {isa = PBXBuildFile; fileRef = 347E1A951F1F7404002BF7A8 /* CianElement.xib */; }; 347E1A9B1F1F7404002BF7A8 /* CianElement.xib in Resources */ = {isa = PBXBuildFile; fileRef = 347E1A951F1F7404002BF7A8 /* CianElement.xib */; }; - 347BFA8F1F27909200E5531F /* MenuArea.swift in Sources */ = {isa = PBXBuildFile; fileRef = 347BFA8E1F27909200E5531F /* MenuArea.swift */; }; - 347BFA901F27909200E5531F /* MenuArea.swift in Sources */ = {isa = PBXBuildFile; fileRef = 347BFA8E1F27909200E5531F /* MenuArea.swift */; }; - 347BFA911F27909200E5531F /* MenuArea.swift in Sources */ = {isa = PBXBuildFile; fileRef = 347BFA8E1F27909200E5531F /* MenuArea.swift */; }; 34845DAE1E1649F6003D55B9 /* DownloaderNoResultsEmbedViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34845DAD1E1649F6003D55B9 /* DownloaderNoResultsEmbedViewController.swift */; }; 34845DAF1E1649F6003D55B9 /* DownloaderNoResultsEmbedViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34845DAD1E1649F6003D55B9 /* DownloaderNoResultsEmbedViewController.swift */; }; 34845DB01E1649F6003D55B9 /* DownloaderNoResultsEmbedViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34845DAD1E1649F6003D55B9 /* DownloaderNoResultsEmbedViewController.swift */; }; @@ -1887,16 +1887,15 @@ 34763F0B1F30CCAC00F4D2D3 /* MWMEditorCellType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMEditorCellType.h; sourceTree = ""; }; 3476B8D51BFDD30B00874594 /* tts-how-to-set-up-voice.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = "tts-how-to-set-up-voice.html"; path = "../../data/tts-how-to-set-up-voice.html"; sourceTree = ""; }; 3476B8DF1BFDD33A00874594 /* tts-how-to-set-up-voice-img */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "tts-how-to-set-up-voice-img"; path = "../../data/tts-how-to-set-up-voice-img"; sourceTree = ""; }; + 347AD8081F28B4E6007ACB68 /* MWMSearchManagerObserver.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMSearchManagerObserver.h; sourceTree = ""; }; + 347BFA8E1F27909200E5531F /* MenuArea.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MenuArea.swift; sourceTree = ""; }; + 347BFA921F27923200E5531F /* MWMBottomMenuControllerProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMBottomMenuControllerProtocol.h; sourceTree = ""; }; + 347BFA931F28842300E5531F /* MWMNavigationDashboardObserver.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMNavigationDashboardObserver.h; sourceTree = ""; }; 347E1A871F1F5DD7002BF7A8 /* CianItemModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CianItemModel.swift; sourceTree = ""; }; 347E1A8C1F1F71F1002BF7A8 /* PPCianCarouselCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PPCianCarouselCell.swift; sourceTree = ""; }; 347E1A901F1F72AD002BF7A8 /* PPCianCarouselCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PPCianCarouselCell.xib; sourceTree = ""; }; 347E1A941F1F7404002BF7A8 /* CianElement.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CianElement.swift; sourceTree = ""; }; 347E1A951F1F7404002BF7A8 /* CianElement.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CianElement.xib; sourceTree = ""; }; - 348320CC1B6A2C52007EC039 /* MWMNavigationViewProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMNavigationViewProtocol.h; sourceTree = ""; }; - 347AD8081F28B4E6007ACB68 /* MWMSearchManagerObserver.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMSearchManagerObserver.h; sourceTree = ""; }; - 347BFA8E1F27909200E5531F /* MenuArea.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MenuArea.swift; sourceTree = ""; }; - 347BFA921F27923200E5531F /* MWMBottomMenuControllerProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMBottomMenuControllerProtocol.h; sourceTree = ""; }; - 347BFA931F28842300E5531F /* MWMNavigationDashboardObserver.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMNavigationDashboardObserver.h; sourceTree = ""; }; 34845DAD1E1649F6003D55B9 /* DownloaderNoResultsEmbedViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DownloaderNoResultsEmbedViewController.swift; sourceTree = ""; }; 34845DB11E165E24003D55B9 /* SearchNoResultsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchNoResultsViewController.swift; sourceTree = ""; }; 34845DB51E166084003D55B9 /* Common.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Common.swift; sourceTree = ""; }; @@ -3074,10 +3073,10 @@ 340708471F28EDD100029ECC /* MWMTaxiPreviewDataSource.h */, 340708481F28EDD100029ECC /* MWMTaxiPreviewDataSource.mm */, 34763EF91F2F74B200F4D2D3 /* NavigationRoutePreviewStatusView.xib */, + 34763F011F30749000F4D2D3 /* RoutePreviewStatus.swift */, 340708491F28EDD100029ECC /* RoutePreviewTaxiCell.swift */, 3407086C1F2B427400029ECC /* RoutePreviewTaxiCell.xib */, 34763EFD1F3069BB00F4D2D3 /* RouteStartButton.swift */, - 34763F011F30749000F4D2D3 /* RoutePreviewStatus.swift */, ); path = RoutePreview; sourceTree = ""; @@ -3297,6 +3296,17 @@ path = Components; sourceTree = ""; }; + 34763EE31F2F392300F4D2D3 /* TextToSpeech */ = { + isa = PBXGroup; + children = ( + 34763EE41F2F392300F4D2D3 /* MWMTextToSpeech.h */, + 34763EE51F2F392300F4D2D3 /* MWMTextToSpeech.mm */, + 34763EE91F2F394D00F4D2D3 /* MWMTextToSpeech+CPP.h */, + 34763EEA1F2F3AD700F4D2D3 /* MWMTextToSpeechObserver.h */, + ); + path = TextToSpeech; + sourceTree = ""; + }; 347E1A861F1F5DD7002BF7A8 /* Cian */ = { isa = PBXGroup; children = ( @@ -3309,17 +3319,6 @@ path = Cian; sourceTree = ""; }; - 34763EE31F2F392300F4D2D3 /* TextToSpeech */ = { - isa = PBXGroup; - children = ( - 34763EE41F2F392300F4D2D3 /* MWMTextToSpeech.h */, - 34763EE51F2F392300F4D2D3 /* MWMTextToSpeech.mm */, - 34763EE91F2F394D00F4D2D3 /* MWMTextToSpeech+CPP.h */, - 34763EEA1F2F3AD700F4D2D3 /* MWMTextToSpeechObserver.h */, - ); - path = TextToSpeech; - sourceTree = ""; - }; 3486B5041E27A4B50069C126 /* Notifications */ = { isa = PBXGroup; children = ( @@ -5428,7 +5427,6 @@ 34ABA6281C2D567B00FE1BEC /* MWMInputLoginValidator.mm in Sources */, 34F4073D1E9E1AFF00E57AC0 /* MPNativeAd+MWM.mm in Sources */, F69018B81E9E601400B3C10B /* MWMAutoupdateController.mm in Sources */, - 560634F21B78806100F3D670 /* MWMTextToSpeech.mm in Sources */, 347E1A961F1F7404002BF7A8 /* CianElement.swift in Sources */, F6E2FECF1E097BA00083EBEC /* MWMSearchFilterViewController.mm in Sources */, 34D4FA661E265749003F53EF /* WhatsNewController.swift in Sources */,