drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-22 06:03:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ios] remove spacing and separator from the Track recording Place page

Browse Source 
Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>
This commit is contained in:
Kiryl Kaveryn
2025-06-16 12:48:58 +04:00
committed by Konstantin Pastbin
parent 18be61e789
commit a88798fbf2
3 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/IPlacePageLayout.swift
View File

@@ -28,6 +28,11 @@ protocol IPlacePageLayout: AnyObject {
var bodyViewControllers: [UIViewController] { get } var bodyViewControllers: [UIViewController] { get }
var actionBar: ActionBarViewController? { get } var actionBar: ActionBarViewController? { get }
var navigationBar: UIViewController? { get } var navigationBar: UIViewController? { get }
var sectionSpacing: CGFloat { get }
func calculateSteps(inScrollView scrollView: UIScrollView, compact: Bool) -> [PlacePageState] func calculateSteps(inScrollView scrollView: UIScrollView, compact: Bool) -> [PlacePageState]
} }
extension IPlacePageLayout {
var sectionSpacing: CGFloat { return 24.0 }
}

2
iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageTrackRecordingLayout.swift
View File

@@ -53,6 +53,8 @@ final class PlacePageTrackRecordingLayout: IPlacePageLayout {
return vc return vc
}() }()
var sectionSpacing: CGFloat { 0.0 }
init(interactor: PlacePageInteractor, storyboard: UIStoryboard, data: PlacePageData) { init(interactor: PlacePageInteractor, storyboard: UIStoryboard, data: PlacePageData) {
self.interactor = interactor self.interactor = interactor
self.storyboard = storyboard self.storyboard = storyboard

20
iphone/Maps/UI/PlacePage/PlacePageViewController.swift
View File

@@ -176,8 +176,10 @@ final class PlacePageScrollView: UIScrollView {
private func setupLayout(_ layout: IPlacePageLayout) { private func setupLayout(_ layout: IPlacePageLayout) {
setLayout(layout) setLayout(layout)
fillHeader(with: layout.headerViewControllers) let showSeparator = layout.sectionSpacing > 0
fillBody(with: layout.bodyViewControllers) stackView.spacing = layout.sectionSpacing
fillHeader(with: layout.headerViewControllers, showSeparator: showSeparator)
fillBody(with: layout.bodyViewControllers, showSeparator: showSeparator)
beginDragging = false beginDragging = false
if let actionBar = layout.actionBar { if let actionBar = layout.actionBar {
@@ -188,23 +190,27 @@ final class PlacePageScrollView: UIScrollView {
} }
} }
private func fillHeader(with viewControllers: [UIViewController]) { private func fillHeader(with viewControllers: [UIViewController], showSeparator: Bool = true) {
viewControllers.forEach { [self] viewController in viewControllers.forEach { [self] viewController in
if !stackView.arrangedSubviews.contains(headerStackView) { if !stackView.arrangedSubviews.contains(headerStackView) {
stackView.addArrangedSubview(headerStackView) stackView.addArrangedSubview(headerStackView)
} }
headerStackView.addArrangedSubview(viewController.view) headerStackView.addArrangedSubview(viewController.view)
} }
headerStackView.addSeparator(.bottom) if showSeparator {
headerStackView.addSeparator(.bottom)
}
} }
private func fillBody(with viewControllers: [UIViewController]) { private func fillBody(with viewControllers: [UIViewController], showSeparator: Bool = true) {
viewControllers.forEach { [self] viewController in viewControllers.forEach { [self] viewController in
addChild(viewController) addChild(viewController)
stackView.addArrangedSubview(viewController.view) stackView.addArrangedSubview(viewController.view)
viewController.didMove(toParent: self) viewController.didMove(toParent: self)
viewController.view.addSeparator(.top) if showSeparator {
viewController.view.addSeparator(.bottom) viewController.view.addSeparator(.top)
viewController.view.addSeparator(.bottom)
}
} }
} }