Merge pull request #8129 from woocommerce/task/imageEdgeInsets-deprecated-ios15

iamgabrielma · web-flow · commit a997e2c216f0 · 2022-11-29T11:31:31.000+09:00
Fix 'imageEdgeInsets' was deprecated in iOS 15.0
diff --git a/WooCommerce/Classes/Extensions/UIButton+TitleAndImage.swift b/WooCommerce/Classes/Extensions/UIButton+TitleAndImage.swift
diff --git a/WooCommerce/Classes/ViewRelated/CardPresentPayments/CardPresentPaymentsModalViewController.swift b/WooCommerce/Classes/ViewRelated/CardPresentPayments/CardPresentPaymentsModalViewController.swift
@@ -320,7 +320,9 @@ private extension CardPresentPaymentsModalViewController {
             auxiliaryButton.setAttributedTitle(viewModel.auxiliaryAttributedButtonTitle, for: .normal)
             auxiliaryButton.setImage(viewModel.auxiliaryButtonimage, for: .normal)
             if viewModel.auxiliaryButtonimage != nil {
-                auxiliaryButton.distributeTitleAndImage(spacing: 8.0)
+                var config = UIButton.Configuration.plain()
+                config.imagePadding = Constants.buttonTitleAndImageSpacing
+                auxiliaryButton.configuration = config
             }
             view.layoutIfNeeded()
         }
@@ -416,6 +418,7 @@ private extension CardPresentPaymentsModalViewController {
         static let extraInfoCustomInsets = UIEdgeInsets(top: 12, left: 10, bottom: 12, right: 10)
         static let modalHeight: CGFloat = 382
         static let modalWidth: CGFloat = 280
+        static let buttonTitleAndImageSpacing: CGFloat = 8
     }
 }
 
diff --git a/WooCommerce/Classes/ViewRelated/Containers/BottomButtonContainer/BottomButtonContainerView.swift b/WooCommerce/Classes/ViewRelated/Containers/BottomButtonContainer/BottomButtonContainerView.swift
@@ -71,14 +71,14 @@ private extension BottomButtonContainerView {
         case .primary:
             button.applyPrimaryButtonStyle()
         case .link:
+            if let image = viewModel.image {
+                var configuration = UIButton.Configuration.plain()
+                button.setImage(image, for: .normal)
+                configuration.imagePadding = Constants.buttonTitleAndImageSpacing
+                button.configuration = configuration
+            }
             button.applyLinkButtonStyle()
             button.contentHorizontalAlignment = .leading
-            button.contentEdgeInsets = .zero
-        }
-
-        if let image = viewModel.image {
-            button.setImage(image, for: .normal)
-            button.distributeTitleAndImage(spacing: Constants.buttonTitleAndImageSpacing)
         }
     }
 
diff --git a/WooCommerce/Classes/ViewRelated/Orders/Order Details/Customer Section/CustomerInfoTableViewCell.swift b/WooCommerce/Classes/ViewRelated/Orders/Order Details/Customer Section/CustomerInfoTableViewCell.swift
@@ -125,8 +125,10 @@ private extension CustomerInfoTableViewCell {
         addButton.setImage(.plusImage, for: .normal)
         addButton.contentHorizontalAlignment = .leading
         addButton.contentVerticalAlignment = .bottom
-        addButton.contentEdgeInsets = .zero
-        addButton.distributeTitleAndImage(spacing: Constants.buttonTitleAndImageSpacing)
+        var configuration = UIButton.Configuration.plain()
+        configuration.contentInsets = .init(.zero)
+        configuration.imagePadding = Constants.buttonTitleAndImageSpacing
+        addButton.configuration = configuration
         addButton.addTarget(self, action: #selector(addButtonTapped), for: .touchUpInside)
     }
 
diff --git a/WooCommerce/Classes/ViewRelated/Orders/Order Details/Customer Section/CustomerNoteTableViewCell.swift b/WooCommerce/Classes/ViewRelated/Orders/Order Details/Customer Section/CustomerNoteTableViewCell.swift
@@ -130,8 +130,8 @@ private extension CustomerNoteTableViewCell {
         addButton.contentVerticalAlignment = .bottom
         var configuration = UIButton.Configuration.plain()
         configuration.contentInsets = .init(.zero)
+        configuration.imagePadding = Constants.buttonTitleAndImageSpacing
         addButton.configuration = configuration
-        addButton.distributeTitleAndImage(spacing: Constants.buttonTitleAndImageSpacing)
         addButton.addTarget(self, action: #selector(addButtonTapped), for: .touchUpInside)
     }
 
diff --git a/WooCommerce/WooCommerce.xcodeproj/project.pbxproj b/WooCommerce/WooCommerce.xcodeproj/project.pbxproj
@@ -312,7 +312,6 @@
 		0298431225936DFC00979CAE /* ShippingLabelsTopBannerFactoryTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0298431125936DFC00979CAE /* ShippingLabelsTopBannerFactoryTests.swift */; };
 		029A9C672535873000BECEC5 /* AppCoordinatorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 029A9C662535873000BECEC5 /* AppCoordinatorTests.swift */; };
 		029B0F57234197B80010C1F3 /* ProductSearchUICommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = 029B0F56234197B80010C1F3 /* ProductSearchUICommand.swift */; };
-		029BFD4F24597D4B00FDDEEC /* UIButton+TitleAndImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 029BFD4E24597D4B00FDDEEC /* UIButton+TitleAndImage.swift */; };
 		029D444922F13F8A00DEFA8A /* DashboardUI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 029D444822F13F8A00DEFA8A /* DashboardUI.swift */; };
 		029F29FA24D93E9E004751CA /* EditableProductModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 029F29F924D93E9E004751CA /* EditableProductModel.swift */; };
 		029F29FC24D94106004751CA /* EditableProductVariationModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 029F29FB24D94106004751CA /* EditableProductVariationModel.swift */; };
@@ -2301,7 +2300,6 @@
 		0298431125936DFC00979CAE /* ShippingLabelsTopBannerFactoryTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShippingLabelsTopBannerFactoryTests.swift; sourceTree = "<group>"; };
 		029A9C662535873000BECEC5 /* AppCoordinatorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppCoordinatorTests.swift; sourceTree = "<group>"; };
 		029B0F56234197B80010C1F3 /* ProductSearchUICommand.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProductSearchUICommand.swift; sourceTree = "<group>"; };
-		029BFD4E24597D4B00FDDEEC /* UIButton+TitleAndImage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIButton+TitleAndImage.swift"; sourceTree = "<group>"; };
 		029D444822F13F8A00DEFA8A /* DashboardUI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DashboardUI.swift; sourceTree = "<group>"; };
 		029F29F924D93E9E004751CA /* EditableProductModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditableProductModel.swift; sourceTree = "<group>"; };
 		029F29FB24D94106004751CA /* EditableProductVariationModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditableProductVariationModel.swift; sourceTree = "<group>"; };
@@ -7908,7 +7906,6 @@
 				02784A02238B8BC800BDD6A8 /* UIView+Border.swift */,
 				F997174323DC065900592D8E /* XLPagerStrip+AccessibilityIdentifier.swift */,
 				0215320A24231D5A003F2BBD /* UIStackView+Subviews.swift */,
-				029BFD4E24597D4B00FDDEEC /* UIButton+TitleAndImage.swift */,
 				57612988245888E2007BB2D9 /* NumberFormatter+LocalizedOrNinetyNinePlus.swift */,
 				02BA12842461674B008D8325 /* Optional+String.swift */,
 				02B8650E24A9E2D800265779 /* Product+SwiftUIPreviewHelpers.swift */,
@@ -9953,7 +9950,6 @@
 				DE8C94662646990000C94823 /* PluginListViewController.swift in Sources */,
 				B6E851F3276320C70041D1BA /* RefundFeesDetailsViewModel.swift in Sources */,
 				024DF31F23743045006658FE /* Header+AztecFormatting.swift in Sources */,
-				029BFD4F24597D4B00FDDEEC /* UIButton+TitleAndImage.swift in Sources */,
 				AE7C957B27C3D5DA007E8E12 /* FeeLineDetails.swift in Sources */,
 				B5A8F8AD20B88D9900D211DE /* LoginPrologueViewController.swift in Sources */,
 				B5D1AFC620BC7B7300DB0E8C /* StorePickerViewController.swift in Sources */,

Original file line number	Diff line number	Diff line change
`@@ -320,7 +320,9 @@ private extension CardPresentPaymentsModalViewController {`
`320`	`320`	`auxiliaryButton.setAttributedTitle(viewModel.auxiliaryAttributedButtonTitle, for: .normal)`
`321`	`321`	`auxiliaryButton.setImage(viewModel.auxiliaryButtonimage, for: .normal)`
`322`	`322`	`if viewModel.auxiliaryButtonimage != nil {`
`323`		`- auxiliaryButton.distributeTitleAndImage(spacing: 8.0)`
	`323`	`+ var config = UIButton.Configuration.plain()`
	`324`	`+ config.imagePadding = Constants.buttonTitleAndImageSpacing`
	`325`	`+ auxiliaryButton.configuration = config`
`324`	`326`	`}`
`325`	`327`	`view.layoutIfNeeded()`
`326`	`328`	`}`
`@@ -416,6 +418,7 @@ private extension CardPresentPaymentsModalViewController {`
`416`	`418`	`static let extraInfoCustomInsets = UIEdgeInsets(top: 12, left: 10, bottom: 12, right: 10)`
`417`	`419`	`static let modalHeight: CGFloat = 382`
`418`	`420`	`static let modalWidth: CGFloat = 280`
	`421`	`+ static let buttonTitleAndImageSpacing: CGFloat = 8`
`419`	`422`	`}`
`420`	`423`	`}`
`421`	`424`
Original file line number	Diff line number	Diff line change
`@@ -130,8 +130,8 @@ private extension CustomerNoteTableViewCell {`
`130`	`130`	`addButton.contentVerticalAlignment = .bottom`
`131`	`131`	`var configuration = UIButton.Configuration.plain()`
`132`	`132`	`configuration.contentInsets = .init(.zero)`
	`133`	`+ configuration.imagePadding = Constants.buttonTitleAndImageSpacing`
`133`	`134`	`addButton.configuration = configuration`
`134`		`- addButton.distributeTitleAndImage(spacing: Constants.buttonTitleAndImageSpacing)`
`135`	`135`	`addButton.addTarget(self, action: #selector(addButtonTapped), for: .touchUpInside)`
`136`	`136`	`}`
`137`	`137`