From edbc60107e5cf2d6a82d77cd80f59d1b7d31bf00 Mon Sep 17 00:00:00 2001 From: Laura Trujillo Date: Wed, 24 Jul 2024 13:32:09 +0100 Subject: [PATCH] IOS-10430 fix padding --- .../Components/UICatalogEmptyStateViewController.swift | 3 +-- .../MisticaSwiftUI/Components/CarouselCatalogView.swift | 2 +- Package.resolved | 8 ++++---- Sources/Mistica/Components/Feedback/FeedbackView.swift | 2 +- Sources/MisticaSwiftUI/Components/Cards/DataCard.swift | 2 +- Sources/MisticaSwiftUI/Components/Carousel/Carousel.swift | 2 +- .../MisticaSwiftUI/Components/EmptyState/EmptyState.swift | 2 +- Sources/MisticaSwiftUI/Components/Feedback/Feedback.swift | 2 +- 8 files changed, 11 insertions(+), 12 deletions(-) diff --git a/MisticaCatalog/Source/Catalog/Mistica/Components/UICatalogEmptyStateViewController.swift b/MisticaCatalog/Source/Catalog/Mistica/Components/UICatalogEmptyStateViewController.swift index 28186409..4851439d 100644 --- a/MisticaCatalog/Source/Catalog/Mistica/Components/UICatalogEmptyStateViewController.swift +++ b/MisticaCatalog/Source/Catalog/Mistica/Components/UICatalogEmptyStateViewController.swift @@ -301,8 +301,7 @@ private class EmptyStateViewSampleViewController: UIViewController { override func loadView() { let view = UIView() view.backgroundColor = .background - view.directionalLayoutMargins = NSDirectionalEdgeInsets(top: 16, leading: 24, bottom: 16, trailing: 24) - + view.directionalLayoutMargins = NSDirectionalEdgeInsets(top: 16, leading: 16, bottom: 16, trailing: 16) view.addSubview(emptyState, constraints: [ emptyState.topAnchor.constraint(equalTo: view.safeAreaLayoutGuide.topAnchor, constant: 24), emptyState.leadingAnchor.constraint(equalTo: view.layoutMarginsGuide.leadingAnchor), diff --git a/MisticaCatalog/Source/Catalog/MisticaSwiftUI/Components/CarouselCatalogView.swift b/MisticaCatalog/Source/Catalog/MisticaSwiftUI/Components/CarouselCatalogView.swift index b55eb0d4..366d004a 100644 --- a/MisticaCatalog/Source/Catalog/MisticaSwiftUI/Components/CarouselCatalogView.swift +++ b/MisticaCatalog/Source/Catalog/MisticaSwiftUI/Components/CarouselCatalogView.swift @@ -62,7 +62,7 @@ struct CarouselCatalogView: View { .foregroundColor(.textSecondary) .lineLimit(4) } - .padding(24) + .padding(16) } } .autoplay(hasAutoplay ? .active(TimeInterval(autoplayTimeIntervalOptions[autoplayTimeIntervalSelectedIndex])) : .inactive) diff --git a/Package.resolved b/Package.resolved index 7760b038..338aa892 100644 --- a/Package.resolved +++ b/Package.resolved @@ -5,8 +5,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/airbnb/lottie-ios.git", "state" : { - "revision" : "4e5877425dae5c10792fc9d22d53dc6bf6824dc1", - "version" : "3.1.8" + "revision" : "7fe8b6f697ae7db4bf0df270119592cb5d502848", + "version" : "4.4.1" } }, { @@ -14,8 +14,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/SDWebImage/SDWebImage.git", "state" : { - "revision" : "633996a807442ec28df9d33b0f88ce57a0e2fdbf", - "version" : "5.17.0" + "revision" : "f6afa0132961d593f07970d84e2d8b588c29ea04", + "version" : "5.19.1" } }, { diff --git a/Sources/Mistica/Components/Feedback/FeedbackView.swift b/Sources/Mistica/Components/Feedback/FeedbackView.swift index f523ad7b..07604c87 100644 --- a/Sources/Mistica/Components/Feedback/FeedbackView.swift +++ b/Sources/Mistica/Components/Feedback/FeedbackView.swift @@ -223,7 +223,7 @@ public class FeedbackView: UIView { private lazy var scrollStackView: ScrollStackView = { let scrollStackView = ScrollStackView(arrangedSubviews: [contentContainerStackView]) scrollStackView.translatesAutoresizingMaskIntoConstraints = false - scrollStackView.stackView.spacing = 24 + scrollStackView.stackView.spacing = 16 scrollStackView.stackView.alignment = .leading scrollStackView.stackView.layoutMargins = UIEdgeInsets(top: 64, left: 16, bottom: 16, right: 16) scrollStackView.stackView.preservesSuperviewLayoutMargins = false diff --git a/Sources/MisticaSwiftUI/Components/Cards/DataCard.swift b/Sources/MisticaSwiftUI/Components/Cards/DataCard.swift index 65e9f055..e2b4f284 100644 --- a/Sources/MisticaSwiftUI/Components/Cards/DataCard.swift +++ b/Sources/MisticaSwiftUI/Components/Cards/DataCard.swift @@ -155,7 +155,7 @@ public struct DataCard(@ViewBuilder content: () -> ContentView) -> some View { switch style { case .default: - VStack(alignment: controlAlignment.horizontal, spacing: 24) { + VStack(alignment: controlAlignment.horizontal, spacing: 16) { content() } case .fullWidth: diff --git a/Sources/MisticaSwiftUI/Components/EmptyState/EmptyState.swift b/Sources/MisticaSwiftUI/Components/EmptyState/EmptyState.swift index b0f6aa69..d59a0383 100644 --- a/Sources/MisticaSwiftUI/Components/EmptyState/EmptyState.swift +++ b/Sources/MisticaSwiftUI/Components/EmptyState/EmptyState.swift @@ -83,7 +83,7 @@ public struct EmptyState: View { } .expandHorizontally(alignment: .leading) } - .padding(24) + .padding(16) } } diff --git a/Sources/MisticaSwiftUI/Components/Feedback/Feedback.swift b/Sources/MisticaSwiftUI/Components/Feedback/Feedback.swift index 97969d43..8ed23a50 100644 --- a/Sources/MisticaSwiftUI/Components/Feedback/Feedback.swift +++ b/Sources/MisticaSwiftUI/Components/Feedback/Feedback.swift @@ -169,7 +169,7 @@ public struct Feedback< .frame(height: Constants.spacing) contentView - .padding(.horizontal, 24) + .padding(.horizontal, 16) .expandVertically() } else { Spacer()