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

[ios] fix the side and traffic buttons animation according to search position

Browse source 
1. the available areas are added to the MapViewController. It add an ability to set the affeced view programmatically rather than only in the main storyboard
2. the search screen view now affects on the side button position by setting the affecting direction
3. fixed animation of the Traffic button when its covered by the other view (out of available area)
4. removed unused `getAvailableArea`

Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>
This commit is contained in:
Kiryl Kaveryn 2025-03-13 15:40:48 +04:00
parent 9b5b085526
commit 692a92cb90
Signed by: kirylkaveryn
SSH key fingerprint: SHA256:P3swI85Rc1ZoE8vyL28Oa6+FgRIaOwsjkKyqcVZ0NtY
11 changed files with 44 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtons.h
View file

@ -14,6 +14,5 @@
- (void)processMyPositionStateModeEvent:(MWMMyPositionMode)mode;
+ (void)updateAvailableArea:(CGRect)frame;
+ (CGRect)getAvailableArea;
@end

2
iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtons.mm
View file

@ -58,8 +58,6 @@ NSString * const kUDDidShowLongTapToShowSideButtonsToast = @"kUDDidShowLongTapTo
+ (void)updateAvailableArea:(CGRect)frame { [[self buttons].sideView updateAvailableArea:frame]; }
+ (CGRect)getAvailableArea { return [self buttons].sideView.getAvailableArea; }
- (void)zoomIn
{
GetFramework().Scale(Framework::SCALE_MAG, true);

1
iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtonsView.h
View file

@ -8,6 +8,5 @@
- (void)setHidden:(BOOL)hidden animated:(BOOL)animated;
- (void)updateAvailableArea:(CGRect)frame;
- (CGRect)getAvailableArea;
@end

4
iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtonsView.mm
View file

@ -144,10 +144,6 @@ CGFloat const kButtonsBottomOffset = 6;
[self setNeedsLayout];
}
- (CGRect)getAvailableArea {
return self.availableArea;
}
- (CGFloat)availableHeight {
return self.availableArea.size.height - kButtonsTopOffset - kButtonsBottomOffset;
}

2
iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.mm
View file

@ -195,6 +195,8 @@ NSArray<UIImage *> *imagesWithName(NSString *name) {
if (CGRectEqualToRect(controller.availableArea, frame))
return;
controller.availableArea = frame;
BOOL isHidden = frame.origin.y + frame.size.height < controller.view.origin.y + controller.view.height + kTopOffset;
[MapViewController.sharedController.controlsManager setTrafficButtonHidden:isHidden];
[controller refreshLayout];
}

10
iphone/Maps/Classes/MapViewController.h
View file

@ -7,6 +7,11 @@
@class MWMMapDownloadDialog;
@class BookmarksCoordinator;
@class SearchOnMapManager;
@class SideButtonsArea;
@class WidgetsArea;
@class TrafficButtonArea;
@class PlacePageArea;
@protocol MWMLocationModeListener;
@interface MapViewController : MWMViewController
@ -54,4 +59,9 @@
@property(strong, nonatomic) IBOutlet UIView * _Nonnull controlsView;
@property(nonatomic) UIView * _Nonnull searchContainer;
@property (weak, nonatomic) IBOutlet SideButtonsArea * sideButtonsArea;
@property (weak, nonatomic) IBOutlet WidgetsArea * widgetsArea;
@property (weak, nonatomic) IBOutlet TrafficButtonArea * trafficButtonArea;
@property (weak, nonatomic) IBOutlet PlacePageArea * placePageArea;
@end

5
iphone/Maps/UI/AvailableArea/AvailableArea.swift
View file

@ -101,7 +101,10 @@ class AvailableArea: UIView {
}
func addConstraints(otherView: UIView, directions: MWMAvailableAreaAffectDirections) {
precondition(!directions.isEmpty)
guard !directions.isEmpty else {
LOG(.warning, "Attempt to add empty affecting directions from \(otherView) to \(self)")
return
}
let add = { (sa: NSLayoutConstraint.Attribute, oa: NSLayoutConstraint.Attribute, rel: NSLayoutConstraint.Relation) in
let c = NSLayoutConstraint(item: self, attribute: sa, relatedBy: rel, toItem: otherView, attribute: oa, multiplier: 1, constant: 0)
c.priority = UILayoutPriority.defaultHigh

15
iphone/Maps/UI/Search/SearchOnMap/Presentation/SearchOnMapPresentationController.swift
View file

@ -32,11 +32,14 @@ final class SearchOnMapPresentationController: NSObject {
private weak var presentedViewController: SearchOnMapViewController?
private weak var parentViewController: UIViewController?
private weak var containerView: UIView?
private let affectedAreas: [Weak<AvailableArea>]
init(parentViewController: UIViewController,
containerView: UIView) {
containerView: UIView,
affectedAreas: Set<AvailableArea> = []) {
self.parentViewController = parentViewController
self.containerView = containerView
self.affectedAreas = affectedAreas.map { Weak(value: $0) }
}
func setViewController(_ viewController: SearchOnMapViewController) {
@ -47,6 +50,8 @@ final class SearchOnMapPresentationController: NSObject {
viewController.view.frame = frameOfPresentedViewInContainerView
viewController.didMove(toParent: parentViewController)
affectedAreas.forEach { $0.value?.addAffectingView(viewController.view) }
iPhoneSpecific {
let panGestureRecognizer = UIPanGestureRecognizer(target: self, action: #selector(handlePan(_:)))
panGestureRecognizer.delegate = self
@ -90,13 +95,6 @@ final class SearchOnMapPresentationController: NSObject {
maxAvailableFrameOfPresentedView = ModalScreenPresentationStep.fullScreen.frame()
}
private func updateSideButtonsAvailableArea(_ newY: CGFloat) {
guard presentedViewController?.traitCollection.verticalSizeClass != .compact else { return }
var sideButtonsAvailableArea = MWMSideButtons.getAvailableArea()
sideButtonsAvailableArea.size.height = newY - sideButtonsAvailableArea.origin.y
MWMSideButtons.updateAvailableArea(sideButtonsAvailableArea)
}
// MARK: - Pan gesture handling
@objc private func handlePan(_ gesture: UIPanGestureRecognizer) {
guard let presentedViewController, let presentedView = presentedViewController.view else { return }
@ -182,7 +180,6 @@ extension SearchOnMapPresentationController: ModallyPresentedViewController {
func translationYDidUpdate(_ translationY: CGFloat) {
iPhoneSpecific {
presentedViewController?.translationYDidUpdate(translationY)
updateSideButtonsAvailableArea(translationY)
}
}
}

6
iphone/Maps/UI/Search/SearchOnMap/SearchOnMapManager.swift
View file

@ -83,7 +83,11 @@ private struct SearchOnMapViewControllerBuilder {
static func build(isRouting: Bool, didChangeState: @escaping ((SearchOnMapState) -> Void)) -> SearchOnMapViewController {
let mapViewController = MapViewController.shared()!
let presentationController = SearchOnMapPresentationController(parentViewController: mapViewController,
containerView: mapViewController.searchContainer)
containerView: mapViewController.searchContainer,
affectedAreas: [
mapViewController.sideButtonsArea,
mapViewController.trafficButtonArea,
])
let viewController = SearchOnMapViewController(presentationController: presentationController)
let presenter = SearchOnMapPresenter(isRouting: isRouting,
didChangeState: didChangeState)

13
iphone/Maps/UI/Search/SearchOnMap/SearchOnMapViewController.swift
View file

@ -48,6 +48,10 @@ final class SearchOnMapViewController: UIViewController {
}
// MARK: - Lifecycle
override func loadView() {
view = SearchOnMapAreaView()
}
override func viewDidLoad() {
super.viewDidLoad()
setupViews()
@ -357,3 +361,12 @@ extension SearchOnMapViewController: SearchTabViewControllerDelegate {
}
}
private class SearchOnMapAreaView: UIView {
override var sideButtonsAreaAffectDirections: MWMAvailableAreaAffectDirections {
alternative(iPhone: .bottom, iPad: [])
}
override var trafficButtonAreaAffectDirections: MWMAvailableAreaAffectDirections {
alternative(iPhone: .bottom, iPad: [])
}
}

4
iphone/Maps/UI/Storyboard/Main.storyboard
View file

@ -194,11 +194,15 @@
<outlet property="carplayPlaceholderView" destination="ixC-IZ-Pvs" id="3rZ-Kn-VBS"/>
<outlet property="controlsView" destination="rL1-9E-4b7" id="sfV-7X-WlR"/>
<outlet property="mapView" destination="aPn-pa-nCx" id="tCi-LW-1ll"/>
<outlet property="placePageArea" destination="awj-9E-eBS" id="nDP-as-zc2"/>
<outlet property="placePageAreaKeyboard" destination="PFs-sL-oVA" id="O3P-ia-ZlX"/>
<outlet property="sideButtonsArea" destination="xJx-UU-IdV" id="Qug-gg-Za8"/>
<outlet property="sideButtonsAreaBottom" destination="VfU-Zk-8IU" id="MvP-Ki-4wP"/>
<outlet property="sideButtonsAreaKeyboard" destination="SDX-4J-Jz5" id="kv9-zX-hbD"/>
<outlet property="trafficButtonArea" destination="QKu-4A-UgP" id="uJI-rT-zGt"/>
<outlet property="visibleAreaBottom" destination="OE7-Qb-J0v" id="isp-aT-LtA"/>
<outlet property="visibleAreaKeyboard" destination="YUs-MJ-9w8" id="UJP-KT-2uK"/>
<outlet property="widgetsArea" destination="NI8-tV-i2B" id="xU3-51-vHe"/>
<segue destination="Lfa-Zp-orR" kind="custom" identifier="Map2EditorSegue" customClass="MWMSegue" id="OEF-kR-jKi"/>
<segue destination="QlF-CJ-cEG" kind="custom" identifier="MapToCategorySelectorSegue" customClass="MWMSegue" id="4Cc-99-mlN"/>
<segue destination="5Wc-fy-NOW" kind="custom" identifier="Map2OsmLogin" customClass="MWMSegue" id="7YC-t5-0WN"/>