pop views on successful submissionupdate contraint margins

kickstarter · Sep 28, 2023 · b38f921 · b38f921
1 parent 62e8c77
commit b38f921
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/Kickstarter-iOS/Features/ProjectPage/Views/Cells/ReportProjectCell.swift b/Kickstarter-iOS/Features/ProjectPage/Views/Cells/ReportProjectCell.swift
@@ -30,11 +30,6 @@ internal final class ReportProjectCell: UITableViewCell, ValueCell {
     _ = self
       |> baseTableViewCellStyle()
       |> ReportProjectCell.lens.accessibilityTraits .~ accessibilityTraits
-      |> ReportProjectCell.lens.contentView.layoutMargins %~~ { _, cell in
-        cell.traitCollection.isRegularRegular
-          ? .init(topBottom: Styles.gridHalf(5), leftRight: Styles.grid(16))
-          : .init(topBottom: Styles.gridHalf(5), leftRight: Styles.gridHalf(7))
-      }
   }
 
   private func setupReportProjectLabelView(projectFlagged: Bool) {
@@ -48,14 +43,17 @@ internal final class ReportProjectCell: UITableViewCell, ValueCell {
 
         self.contentView.addSubview(hostingController.view)
 
+        let leftRightInset = self.traitCollection.isRegularRegular ? Styles.grid(16) : Styles.gridHalf(5)
+
         NSLayoutConstraint.activate([
-          hostingController.view.topAnchor.constraint(equalTo: self.contentView.topAnchor, constant: 12),
+          hostingController.view.topAnchor
+            .constraint(equalTo: self.contentView.topAnchor, constant: Styles.gridHalf(5)),
           hostingController.view.bottomAnchor
-            .constraint(equalTo: self.contentView.bottomAnchor, constant: -12),
+            .constraint(equalTo: self.contentView.bottomAnchor, constant: -Styles.gridHalf(5)),
           hostingController.view.leadingAnchor
-            .constraint(equalTo: self.contentView.leadingAnchor, constant: 12),
+            .constraint(equalTo: self.contentView.leadingAnchor, constant: leftRightInset),
           hostingController.view.trailingAnchor
-            .constraint(equalTo: self.contentView.trailingAnchor, constant: -12)
+            .constraint(equalTo: self.contentView.trailingAnchor, constant: -leftRightInset)
         ])
       }
     }

diff --git a/Kickstarter-iOS/Features/ProjectPage/Views/ReportProjectLabelView.swift b/Kickstarter-iOS/Features/ProjectPage/Views/ReportProjectLabelView.swift
@@ -5,7 +5,7 @@ import SwiftUI
 struct ReportProjectLabelView: View {
   let flagged: Bool
 
-  let isIpad = AppEnvironment.current.device.userInterfaceIdiom == .pad
+  @SwiftUI.Environment(\.horizontalSizeClass) private var horizontalSizeClass
 
   var body: some View {
     if flagged {
@@ -23,7 +23,7 @@ struct ReportProjectLabelView: View {
           .scaledToFit()
           .frame(width: 10, height: 10)
       }
-      .padding(isIpad ? 0 : 10)
+      .padding(self.horizontalSizeClass == .regular ? 0 : 10)
     }
   }