Skip to content

Fix 'imageEdgeInsets' was deprecated in iOS 15.0 #8129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Nov 29, 2022
Merged

Fix 'imageEdgeInsets' was deprecated in iOS 15.0 #8129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
33a6f8a
Use Btn.Configuration in Order details & payment flow
iamgabrielma Nov 16, 2022
8215b2b
Use Btn.Configuration on BottomButtonContainerView
iamgabrielma Nov 16, 2022
54599ab
Delete UIButton+TitleAndImage extension
iamgabrielma Nov 16, 2022
e67f70e
Remove button configuration conflict
iamgabrielma Nov 28, 2022
3d9760b
Remove unnecessary CGFloat wrapper
iamgabrielma Nov 28, 2022
ab8288b
Revert auxiliaryButton to always be shown
iamgabrielma Nov 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 0 additions & 22 deletions WooCommerce/Classes/Extensions/UIButton+TitleAndImage.swift
View file
Open in desktop

This file was deleted.

5 changes: 4 additions & 1 deletion ...erce/Classes/ViewRelated/CardPresentPayments/CardPresentPaymentsModalViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,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()
}
Expand Down Expand Up @@ -389,6 +391,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
}
}

Expand Down
12 changes: 6 additions & 6 deletions ...erce/Classes/ViewRelated/Containers/BottomButtonContainer/BottomButtonContainerView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}

Expand Down
6 changes: 4 additions & 2 deletions ...Classes/ViewRelated/Orders/Order Details/Customer Section/CustomerInfoTableViewCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
2 changes: 1 addition & 1 deletion ...Classes/ViewRelated/Orders/Order Details/Customer Section/CustomerNoteTableViewCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
4 changes: 0 additions & 4 deletions WooCommerce/WooCommerce.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,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 */; };
Expand Down Expand Up @@ -2268,7 +2267,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>"; };
Expand Down Expand Up @@ -7794,7 +7792,6 @@
02396250239948470096F34C /* UIImage+TintColor.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 */,
Expand Down Expand Up @@ -9809,7 +9806,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 */,
Expand Down