organicmaps/organicmaps
32
Fork 18
Code Issues 2.7k Pull requests 194 Projects Releases 65 Wiki Activity Actions 1

[ios] add tap on the grabber that opens the modal screen

Browse source 
Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>
This commit is contained in:
Kiryl Kaveryn 2025-03-21 12:58:56 +04:00
parent f3d1270a48
commit b5d8c31b3f
Signed by: kirylkaveryn
SSH key fingerprint: SHA256:P3swI85Rc1ZoE8vyL28Oa6+FgRIaOwsjkKyqcVZ0NtY
2 changed files with 29 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
iphone/Maps/UI/Search/SearchOnMap/SearchOnMapHeaderView.swift
View file

@ -1,5 +1,6 @@
protocol SearchOnMapHeaderViewDelegate: UISearchBarDelegate { protocol SearchOnMapHeaderViewDelegate: UISearchBarDelegate {
func cancelButtonDidTap() func cancelButtonDidTap()
func grabberDidTap()
} }
final class SearchOnMapHeaderView: UIView { final class SearchOnMapHeaderView: UIView {
@ -19,6 +20,7 @@ final class SearchOnMapHeaderView: UIView {
} }
private let grabberView = UIView() private let grabberView = UIView()
private let grabberTapHandlerView = UIView()
private let searchBar = UISearchBar() private let searchBar = UISearchBar()
private let cancelButton = UIButton() private let cancelButton = UIButton()
private let cancelContainer = UIView() private let cancelContainer = UIView()
@ -38,6 +40,7 @@ final class SearchOnMapHeaderView: UIView {
setStyle(.primaryBackground) setStyle(.primaryBackground)
setupGrabberView() setupGrabberView()
setupGrabberTapHandlerView()
setupSearchBar() setupSearchBar()
setupCancelButton() setupCancelButton()
} }
@ -49,6 +52,14 @@ final class SearchOnMapHeaderView: UIView {
} }
} }
private func setupGrabberTapHandlerView() {
grabberTapHandlerView.backgroundColor = .clear
iPhoneSpecific {
let tapGesture = UITapGestureRecognizer(target: self, action: #selector(grabberDidTap))
grabberTapHandlerView.addGestureRecognizer(tapGesture)
}
}
private func setupSearchBar() { private func setupSearchBar() {
searchBar.placeholder = L("search") searchBar.placeholder = L("search")
searchBar.showsCancelButton = false searchBar.showsCancelButton = false
@ -63,16 +74,19 @@ final class SearchOnMapHeaderView: UIView {
cancelContainer.setStyle(.primaryBackground) cancelContainer.setStyle(.primaryBackground)
cancelButton.setStyle(.searchCancelButton) cancelButton.setStyle(.searchCancelButton)
cancelButton.setTitle(L("cancel"), for: .normal) cancelButton.setTitle(L("cancel"), for: .normal)
cancelButton.addTarget(self, action: #selector(cancelButtonTapped), for: .touchUpInside) cancelButton.addTarget(self, action: #selector(cancelButtonDidTap), for: .touchUpInside)
} }
private func layoutView() { private func layoutView() {
addSubview(grabberView) addSubview(grabberView)
addSubview(grabberTapHandlerView)
addSubview(searchBar) addSubview(searchBar)
addSubview(cancelContainer) addSubview(cancelContainer)
cancelContainer.addSubview(cancelButton) cancelContainer.addSubview(cancelButton)
grabberView.translatesAutoresizingMaskIntoConstraints = false grabberView.translatesAutoresizingMaskIntoConstraints = false
grabberTapHandlerView.translatesAutoresizingMaskIntoConstraints = false
grabberTapHandlerView.setContentHuggingPriority(.defaultLow, for: .vertical)
searchBar.translatesAutoresizingMaskIntoConstraints = false searchBar.translatesAutoresizingMaskIntoConstraints = false
cancelContainer.translatesAutoresizingMaskIntoConstraints = false cancelContainer.translatesAutoresizingMaskIntoConstraints = false
cancelButton.translatesAutoresizingMaskIntoConstraints = false cancelButton.translatesAutoresizingMaskIntoConstraints = false
@ -83,6 +97,11 @@ final class SearchOnMapHeaderView: UIView {
grabberView.widthAnchor.constraint(equalToConstant: Constants.grabberWidth), grabberView.widthAnchor.constraint(equalToConstant: Constants.grabberWidth),
grabberView.heightAnchor.constraint(equalToConstant: Constants.grabberHeight), grabberView.heightAnchor.constraint(equalToConstant: Constants.grabberHeight),
grabberTapHandlerView.topAnchor.constraint(equalTo: grabberView.bottomAnchor),
grabberTapHandlerView.leadingAnchor.constraint(equalTo: leadingAnchor),
grabberTapHandlerView.trailingAnchor.constraint(equalTo: trailingAnchor),
grabberTapHandlerView.bottomAnchor.constraint(equalTo: searchBar.topAnchor),
searchBar.topAnchor.constraint(equalTo: grabberView.bottomAnchor, constant: Constants.searchBarInsets.top), searchBar.topAnchor.constraint(equalTo: grabberView.bottomAnchor, constant: Constants.searchBarInsets.top),
searchBar.leadingAnchor.constraint(equalTo: leadingAnchor, constant: Constants.searchBarInsets.left), searchBar.leadingAnchor.constraint(equalTo: leadingAnchor, constant: Constants.searchBarInsets.left),
searchBar.trailingAnchor.constraint(equalTo: cancelContainer.leadingAnchor), searchBar.trailingAnchor.constraint(equalTo: cancelContainer.leadingAnchor),
@ -100,7 +119,11 @@ final class SearchOnMapHeaderView: UIView {
]) ])
} }
@objc private func cancelButtonTapped() { @objc private func grabberDidTap() {
delegate?.grabberDidTap()
}
@objc private func cancelButtonDidTap() {
delegate?.cancelButtonDidTap() delegate?.cancelButtonDidTap()
} }

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

@ -448,6 +448,10 @@ extension SearchOnMapViewController: SearchOnMapHeaderViewDelegate {
func cancelButtonDidTap() { func cancelButtonDidTap() {
interactor?.handle(.closeSearch) interactor?.handle(.closeSearch)
} }
func grabberDidTap() {
interactor?.handle(.didUpdatePresentationStep(.fullScreen))
}
} }
// MARK: - SearchTabViewControllerDelegate // MARK: - SearchTabViewControllerDelegate