Skip to content

Fix 'contentEdgeInsets' was deprecated in iOS 15.0 #8094

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 21 commits into from
Nov 24, 2022
Merged

Fix 'contentEdgeInsets' was deprecated in iOS 15.0 #8094

Changes from 10 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
4f2f048
Use UIButton.Configuration on CustomerNote cell
iamgabrielma Nov 11, 2022
2e3a9e8
Update applyLinkButtonStyle() with UIButton.Configuration
iamgabrielma Nov 11, 2022
13ebacd
Update edgeInsets SurveySubmittedViewController
iamgabrielma Nov 11, 2022
f5f359b
Update edgeInsets applySecondaryButtonStyle
iamgabrielma Nov 11, 2022
4a66349
Update paymentsModalCancelButtonStyle edgeInsets
iamgabrielma Nov 11, 2022
3635604
Comment-out calls to pinSubviewToAllEdgeMargins
iamgabrielma Nov 11, 2022
3fb5e8f
Use Button Configuration on applying button style
iamgabrielma Nov 15, 2022
84eba80
Revert testing button backgrounds
iamgabrielma Nov 15, 2022
5450244
Add Configuration to applyLinkButtonStyle
iamgabrielma Nov 15, 2022
028beb1
revert testing button configuration
iamgabrielma Nov 15, 2022
fa02ba8
Add Button Configuration to VerticalButton
iamgabrielma Nov 15, 2022
ad6678a
Add ButtonConfiguration to EmptyStateViewController
iamgabrielma Nov 15, 2022
bc3c27e
Add ButtonConfiguration to CustomerNoteTableViewCell
iamgabrielma Nov 15, 2022
7490c9f
Add ButtonConfiguration to FilteredOrdersHeaderBar
iamgabrielma Nov 15, 2022
1a40698
Add Configuration to SurveySubmittedViewController
iamgabrielma Nov 15, 2022
dba89ac
Add label as subview to UIButton
iamgabrielma Nov 15, 2022
cf68aa2
Remove unnecessary var
iamgabrielma Nov 15, 2022
87d67d8
Add label as subview on UIActivityIndicatorView
iamgabrielma Nov 16, 2022
3fb678b
Change CustomerNote button configuration to plain
iamgabrielma Nov 16, 2022
a6df43f
Rename constants for readability
iamgabrielma Nov 18, 2022
db0bd1d
Removed custom init from ButtonActivityIndicator
iamgabrielma Nov 23, 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
28 changes: 24 additions & 4 deletions WooCommerce/Classes/Extensions/UIButton+Helpers.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,13 @@ extension UIButton {
/// Applies the Primary Button Style: Solid BG!
///
func applyPrimaryButtonStyle() {
contentEdgeInsets = Style.defaultEdgeInsets
var configuration = UIButton.Configuration.filled()
configuration.contentInsets = .init(
top: Style.defaultInsets.top,
leading: Style.defaultInsets.leading,
bottom: Style.defaultInsets.bottom,
trailing: Style.defaultInsets.trailing
)
layer.borderColor = UIColor.primaryButtonBorder.cgColor
layer.borderWidth = Style.defaultBorderWidth
layer.cornerRadius = Style.defaultCornerRadius
Expand Down Expand Up @@ -39,8 +45,14 @@ extension UIButton {
/// Applies the Secondary Button Style: Clear BG / Bordered Outline
///
func applySecondaryButtonStyle() {
var configuration = UIButton.Configuration.filled()
configuration.contentInsets = .init(
top: Style.defaultInsets.top,
leading: Style.defaultInsets.leading,
bottom: Style.defaultInsets.bottom,
trailing: Style.defaultInsets.trailing
)
backgroundColor = .secondaryButtonBackground
contentEdgeInsets = Style.defaultEdgeInsets
layer.borderColor = UIColor.secondaryButtonBorder.cgColor
layer.borderWidth = Style.defaultBorderWidth
layer.cornerRadius = Style.defaultCornerRadius
Expand Down Expand Up @@ -71,8 +83,14 @@ extension UIButton {
/// Applies the Link Button Style: Clear BG / Brand Text Color
///
func applyLinkButtonStyle(enableMultipleLines: Bool = false) {
var configuration = UIButton.Configuration.filled()
configuration.contentInsets = .init(
top: Style.defaultInsets.top,
leading: Style.defaultInsets.leading,
bottom: Style.defaultInsets.bottom,
trailing: Style.defaultInsets.trailing
)
backgroundColor = .clear
contentEdgeInsets = Style.defaultEdgeInsets
tintColor = .accent
titleLabel?.applyBodyStyle()
titleLabel?.textAlignment = .natural
Expand All @@ -95,8 +113,9 @@ extension UIButton {
}

func applyPaymentsModalCancelButtonStyle() {
configuration = UIButton.Configuration.plain()
configuration?.contentInsets = Style.defaultInsets
backgroundColor = .tertiarySystemBackground
contentEdgeInsets = Style.defaultEdgeInsets
layer.borderColor = UIColor.secondaryButtonBorder.cgColor
layer.borderWidth = Style.defaultBorderWidth
layer.cornerRadius = Style.defaultCornerRadius
Expand Down Expand Up @@ -161,5 +180,6 @@ private extension UIButton {
static let defaultCornerRadius = CGFloat(8.0)
static let defaultBorderWidth = CGFloat(1.0)
static let defaultEdgeInsets = UIEdgeInsets(top: 12, left: 22, bottom: 12, right: 22)
static let defaultInsets = NSDirectionalEdgeInsets(top: 12, leading: 22, bottom: 12, trailing: 22)
}
}