Merge pull request #1 from EthanLipnik/main

Set corner curve to 'continuous'
lascic · May 4, 2022 · 3b96451 · 3b96451
2 parents 261fc45 + 96b9aed
commit 3b96451
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 1 deletion.
diff --git a/Demo/UIOnboarding Demo/UIOnboarding Demo/Onboarding/Views/UIOnboardingButton.swift b/Demo/UIOnboarding Demo/UIOnboarding Demo/Onboarding/Views/UIOnboardingButton.swift
@@ -27,6 +27,7 @@ final class UIOnboardingButton: UIButton {
 
     private func configure() {
         layer.cornerRadius = UIScreenType.isiPhoneSE ? 13 : 15
+        layer.cornerCurve = .continuous
         titleLabel?.numberOfLines = 0
 
         setTitleColor(.white, for: .normal)

diff --git a/Demo/UIOnboarding Demo/UIOnboarding Demo/Onboarding/Views/UIOnboardingIcon.swift b/Demo/UIOnboarding Demo/UIOnboarding Demo/Onboarding/Views/UIOnboardingIcon.swift
@@ -21,6 +21,7 @@ final class OnboardingIcon: UIImageView {
     private func configure() {
         let iconSize: CGFloat = traitCollection.horizontalSizeClass == .regular ? 140 : UIScreenType.isiPhoneSE ? 72 : 78
         layer.cornerRadius = iconSize * 0.2237
+        layer.cornerCurve = .continuous
 
         heightAnchor.constraint(equalToConstant: iconSize).isActive = true
         widthAnchor.constraint(equalTo: heightAnchor).isActive = true

diff --git a/Sources/UIOnboarding/Views/UIOnboardingButton.swift b/Sources/UIOnboarding/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()
     }
 
@@ -27,18 +29,26 @@ final class UIOnboardingButton: UIButton {
 
     private func configure() {
         layer.cornerRadius = UIScreenType.isiPhoneSE ? 13 : 15
+        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 13.4, *) {
+            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
+            //            titleLabel?.maximumContentSizeCategory = UIScreenType.isiPhone6s || UIScreenType.isiPhoneSE ? .extraLarge : .accessibilityExtraLarge
         } else {
             titleLabel?.font = UIFontMetrics.default.scaledFont(for: .preferredFont(forTextStyle: .headline), maximumPointSize: 21)
         }

diff --git a/Sources/UIOnboarding/Views/UIOnboardingIcon.swift b/Sources/UIOnboarding/Views/UIOnboardingIcon.swift
@@ -21,6 +21,7 @@ final class OnboardingIcon: UIImageView {
     private func configure() {
         let iconSize: CGFloat = traitCollection.horizontalSizeClass == .regular ? 140 : UIScreenType.isiPhoneSE ? 72 : 78
         layer.cornerRadius = iconSize * 0.2237
+        layer.cornerCurve = .continuous
 
         heightAnchor.constraint(equalToConstant: iconSize).isActive = true
         widthAnchor.constraint(equalTo: heightAnchor).isActive = true