Merge pull request #9824 from woocommerce/issue/privacy-choices-alignments

Ecarrion · web-flow · commit d2936a847b50 · 2023-05-25T19:02:47.000-05:00
[Privacy Choices] Toggle Descriptions Alignments
diff --git a/WooCommerce/Classes/ViewRelated/Dashboard/Settings/Privacy/PrivacyBannerViewController.swift b/WooCommerce/Classes/ViewRelated/Dashboard/Settings/Privacy/PrivacyBannerViewController.swift
@@ -83,6 +83,7 @@ struct PrivacyBanner: View {
 
             Text(Localization.toggleSubtitle)
                 .subheadlineStyle()
+                .padding(.trailing, Layout.toggleDescriptionMargin)
 
             HStack {
                 Button(Localization.goToSettings) {
@@ -133,6 +134,7 @@ private extension PrivacyBanner {
 
     enum Layout {
         static let mainVerticalSpacing = CGFloat(8)
+        static let toggleDescriptionMargin = CGFloat(40)
     }
 }
 
diff --git a/WooCommerce/Classes/ViewRelated/Dashboard/Settings/Privacy/PrivacySettingsViewController.swift b/WooCommerce/Classes/ViewRelated/Dashboard/Settings/Privacy/PrivacySettingsViewController.swift
@@ -345,6 +345,7 @@ private extension PrivacySettingsViewController {
         if isPrivacyChoicesEnabled {
             cell.textLabel?.applySubheadlineStyle()
             cell.textLabel?.textColor = .textSubtle
+            cell.contentView.directionalLayoutMargins = .init(top: 0, leading: 0, bottom: 0, trailing: Constants.toggleDescriptionMargin)
         }
     }
 
@@ -596,6 +597,7 @@ private struct Constants {
     static let headerTitleInsets = UIEdgeInsets(top: 16, left: 14, bottom: 32, right: 14)
     static let footerInsets = UIEdgeInsets(top: 8, left: 16, bottom: 16, right: 16)
     static let footerPadding = CGFloat(44)
+    static let toggleDescriptionMargin = CGFloat(40)
 }
 
 private struct Section {

Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,7 @@ struct PrivacyBanner: View {`
`83`	`83`
`84`	`84`	`Text(Localization.toggleSubtitle)`
`85`	`85`	`.subheadlineStyle()`
	`86`	`+ .padding(.trailing, Layout.toggleDescriptionMargin)`
`86`	`87`
`87`	`88`	`HStack {`
`88`	`89`	`Button(Localization.goToSettings) {`
`@@ -133,6 +134,7 @@ private extension PrivacyBanner {`
`133`	`134`
`134`	`135`	`enum Layout {`
`135`	`136`	`static let mainVerticalSpacing = CGFloat(8)`
	`137`	`+ static let toggleDescriptionMargin = CGFloat(40)`
`136`	`138`	`}`
`137`	`139`	`}`
`138`	`140`
Original file line number	Diff line number	Diff line change
`@@ -345,6 +345,7 @@ private extension PrivacySettingsViewController {`
`345`	`345`	`if isPrivacyChoicesEnabled {`
`346`	`346`	`cell.textLabel?.applySubheadlineStyle()`
`347`	`347`	`cell.textLabel?.textColor = .textSubtle`
	`348`	`+ cell.contentView.directionalLayoutMargins = .init(top: 0, leading: 0, bottom: 0, trailing: Constants.toggleDescriptionMargin)`
`348`	`349`	`}`
`349`	`350`	`}`
`350`	`351`
`@@ -596,6 +597,7 @@ private struct Constants {`
`596`	`597`	`static let headerTitleInsets = UIEdgeInsets(top: 16, left: 14, bottom: 32, right: 14)`
`597`	`598`	`static let footerInsets = UIEdgeInsets(top: 8, left: 16, bottom: 16, right: 16)`
`598`	`599`	`static let footerPadding = CGFloat(44)`
	`600`	`+ static let toggleDescriptionMargin = CGFloat(40)`
`599`	`601`	`}`
`600`	`602`
`601`	`603`	`private struct Section {`