Merge pull request #2133 from minvws/bugfix/5002-bottom-margins-details

minvws · Oct 27, 2022 · cad5169 · cad5169
2 parents 3f6a146 + a0a9a73
commit cad5169
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 3 deletions.
diff --git a/...s/__Snapshots__/IdentitySelectionDetailsViewControllerTests/test_snapshot.1.png b/...s/__Snapshots__/IdentitySelectionDetailsViewControllerTests/test_snapshot.1.png
diff --git a/Sources/CTR/Interface/Holder/FuzzyMatching/Details/IdentitySelectionDetailsView.swift b/Sources/CTR/Interface/Holder/FuzzyMatching/Details/IdentitySelectionDetailsView.swift
@@ -52,6 +52,13 @@ class IdentitySelectionDetailsView: BaseView {
 		stackView.spacing = ViewTraits.Spacing.stackSpacing
 		return stackView
 	}()
+
+	private let spacer: UIView = {
+		let view = UIView()
+		view.translatesAutoresizingMaskIntoConstraints = false
+		view.backgroundColor = .clear
+		return view
+	}()
 
 	override func setupViews() {
 
@@ -66,6 +73,7 @@ class IdentitySelectionDetailsView: BaseView {
 		addSubview(titleLabel)
 		addSubview(contentTextView)
 		addSubview(detailsStackView)
+		addSubview(spacer)
 	}
 
 	override func setupViewConstraints() {
@@ -74,6 +82,7 @@ class IdentitySelectionDetailsView: BaseView {
 		setupTitleLabelViewConstraints()
 		setupContentTextViewConstraints()
 		setupDetailsStackViewConstraints()
+		setupSpacerViewConstraints()
 	}
 
 	func setupTitleLabelViewConstraints() {
@@ -137,11 +146,24 @@ class IdentitySelectionDetailsView: BaseView {
 				constant: -2 * ViewTraits.Margin.edge
 			),
 			detailsStackView.bottomAnchor.constraint(
-				equalTo: safeAreaLayoutGuide.bottomAnchor,
+				equalTo: spacer.topAnchor,
 				constant: -ViewTraits.Margin.bottom
 			)
 		])
 	}
+
+	func setupSpacerViewConstraints() {
+
+		NSLayoutConstraint.activate([
+			spacer.topAnchor.constraint(equalTo: detailsStackView.bottomAnchor),
+			spacer.leadingAnchor.constraint(equalTo: leadingAnchor),
+			spacer.trailingAnchor.constraint(equalTo: trailingAnchor),
+			spacer.bottomAnchor.constraint(
+				equalTo: safeAreaLayoutGuide.bottomAnchor,
+				constant: UIDevice.current.hasNotch ? 0 : -ViewTraits.Margin.bottom
+			)
+		])
+	}
 
 	// MARK: Public Access