From e9cc2c686f6e442c93f1488657dc69bb7ffd0b7f Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Thu, 29 Oct 2020 01:12:45 +0400 Subject: [PATCH] Location view fixes --- submodules/LocationUI/Sources/LocationActionListItem.swift | 5 ++++- submodules/LocationUI/Sources/LocationMapHeaderNode.swift | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/submodules/LocationUI/Sources/LocationActionListItem.swift b/submodules/LocationUI/Sources/LocationActionListItem.swift index 9e43984c4b..be8b2fa37b 100644 --- a/submodules/LocationUI/Sources/LocationActionListItem.swift +++ b/submodules/LocationUI/Sources/LocationActionListItem.swift @@ -239,7 +239,10 @@ final class LocationActionListItemNode: ListViewItemNode { let titleSpacing: CGFloat = 1.0 let bottomInset: CGFloat = hasSeparator ? 0.0 : 4.0 - let contentSize = CGSize(width: params.width, height: verticalInset * 2.0 + titleLayout.size.height + titleSpacing + subtitleLayout.size.height + bottomInset) + var contentSize = CGSize(width: params.width, height: verticalInset * 2.0 + titleLayout.size.height + titleSpacing + subtitleLayout.size.height + bottomInset) + if hasSeparator { + contentSize.height = max(52.0, contentSize.height) + } let nodeLayout = ListViewItemNodeLayout(contentSize: contentSize, insets: UIEdgeInsets()) return (nodeLayout, { [weak self] in diff --git a/submodules/LocationUI/Sources/LocationMapHeaderNode.swift b/submodules/LocationUI/Sources/LocationMapHeaderNode.swift index 7605a29697..50b7f715c1 100644 --- a/submodules/LocationUI/Sources/LocationMapHeaderNode.swift +++ b/submodules/LocationUI/Sources/LocationMapHeaderNode.swift @@ -180,7 +180,7 @@ final class LocationMapHeaderNode: ASDisplayNode { func updateLayout(layout: ContainerViewLayout, navigationBarHeight: CGFloat, topPadding: CGFloat, offset: CGFloat, size: CGSize, transition: ContainedViewLayoutTransition) { self.validLayout = (layout, navigationBarHeight, topPadding, offset, size) - let mapHeight: CGFloat = floor(layout.size.height * 1.5) + let mapHeight: CGFloat = floor(layout.size.height * 1.3) let mapFrame = CGRect(x: 0.0, y: floorToScreenPixels((size.height - mapHeight + navigationBarHeight) / 2.0) + offset, width: size.width, height: mapHeight) transition.updateFrame(node: self.mapNode, frame: mapFrame) self.mapNode.updateLayout(size: mapFrame.size)