From df23ac05e1409dc51076e0310b73e7d06f0fd00b Mon Sep 17 00:00:00 2001 From: Lukman Ascic Date: Wed, 4 May 2022 10:44:02 +0200 Subject: [PATCH] Remove button font conditional --- .../Onboarding/Views/UIOnboardingButton.swift | 13 ++++++++----- Sources/UIOnboarding/Views/UIOnboardingButton.swift | 8 +------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/Demo/UIOnboarding Demo/UIOnboarding Demo/Onboarding/Views/UIOnboardingButton.swift b/Demo/UIOnboarding Demo/UIOnboarding Demo/Onboarding/Views/UIOnboardingButton.swift index 4cf7b75..f9506a5 100644 --- a/Demo/UIOnboarding Demo/UIOnboarding Demo/Onboarding/Views/UIOnboardingButton.swift +++ b/Demo/UIOnboarding Demo/UIOnboarding Demo/Onboarding/Views/UIOnboardingButton.swift @@ -13,7 +13,9 @@ final class UIOnboardingButton: UIButton { convenience init(withConfiguration configuration: UIOnboardingButtonConfiguration) { self.init(type: .system) setTitle(configuration.title, for: .normal) +#if !targetEnvironment(macCatalyst) backgroundColor = configuration.backgroundColor +#endif configure() } @@ -30,19 +32,20 @@ final class UIOnboardingButton: UIButton { layer.cornerCurve = .continuous titleLabel?.numberOfLines = 0 +#if !targetEnvironment(macCatalyst) setTitleColor(.white, for: .normal) +#endif accessibilityTraits = .button titleLabel?.adjustsFontForContentSizeCategory = true translatesAutoresizingMaskIntoConstraints = false isAccessibilityElement = true - if #available(iOS 15.0, *) { - titleLabel?.font = UIFontMetrics.default.scaledFont(for: .systemFont(ofSize: traitCollection.horizontalSizeClass == .regular ? 19 : 17, weight: .bold)) -// titleLabel?.maximumContentSizeCategory = UIScreenType.isiPhone6s || UIScreenType.isiPhoneSE ? .extraLarge : .accessibilityExtraLarge - } else { - titleLabel?.font = UIFontMetrics.default.scaledFont(for: .preferredFont(forTextStyle: .headline), maximumPointSize: 21) + if #available(iOS 13.4, *) { + isPointerInteractionEnabled = true } + + titleLabel?.font = UIFontMetrics.default.scaledFont(for: .systemFont(ofSize: traitCollection.horizontalSizeClass == .regular ? 19 : 17, weight: .bold)) addTarget(self, action: #selector(handleCallToActionButton), for: .touchUpInside) } diff --git a/Sources/UIOnboarding/Views/UIOnboardingButton.swift b/Sources/UIOnboarding/Views/UIOnboardingButton.swift index 12ae9c1..eb72c90 100644 --- a/Sources/UIOnboarding/Views/UIOnboardingButton.swift +++ b/Sources/UIOnboarding/Views/UIOnboardingButton.swift @@ -45,13 +45,7 @@ final class UIOnboardingButton: UIButton { isPointerInteractionEnabled = true } - - if #available(iOS 15.0, *) { - titleLabel?.font = UIFontMetrics.default.scaledFont(for: .systemFont(ofSize: traitCollection.horizontalSizeClass == .regular ? 19 : 17, weight: .bold)) - // titleLabel?.maximumContentSizeCategory = UIScreenType.isiPhone6s || UIScreenType.isiPhoneSE ? .extraLarge : .accessibilityExtraLarge - } else { - titleLabel?.font = UIFontMetrics.default.scaledFont(for: .preferredFont(forTextStyle: .headline), maximumPointSize: 21) - } + titleLabel?.font = UIFontMetrics.default.scaledFont(for: .systemFont(ofSize: traitCollection.horizontalSizeClass == .regular ? 19 : 17, weight: .bold)) addTarget(self, action: #selector(handleCallToActionButton), for: .touchUpInside) }