From 61b2a9bb82116c2656b40056a3d130539f75ba31 Mon Sep 17 00:00:00 2001
From: Riley Testut <riley@rileytestut.com>
Date: Mon, 16 Oct 2023 18:37:36 -0500
Subject: [PATCH] Adds PillButton.style to switch between `pill` and `custom`
 styles
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

`pill` style enforces minimum size + content insets, while `custom` doesn’t.
---
 AltStore/Components/AppBannerView.xib |  4 +--
 AltStore/Components/PillButton.swift  | 44 ++++++++++++++++++++++++---
 2 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/AltStore/Components/AppBannerView.xib b/AltStore/Components/AppBannerView.xib
index 95337f61..c27095f2 100644
--- a/AltStore/Components/AppBannerView.xib
+++ b/AltStore/Components/AppBannerView.xib
@@ -110,12 +110,12 @@
                                     <color key="textColor" systemColor="secondaryLabelColor"/>
                                     <nil key="highlightedColor"/>
                                 </label>
-                                <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="900" horizontalCompressionResistancePriority="900" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="tVx-3G-dcu" customClass="PillButton" customModule="AltStore" customModuleProvider="target">
+                                <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="900" horizontalCompressionResistancePriority="900" placeholderIntrinsicWidth="77" placeholderIntrinsicHeight="31" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="tVx-3G-dcu" customClass="PillButton" customModule="AltStore" customModuleProvider="target">
                                     <rect key="frame" x="0.0" y="0.0" width="77" height="31"/>
                                     <color key="backgroundColor" red="0.22352941179999999" green="0.4941176471" blue="0.39607843139999999" alpha="0.10000000000000001" colorSpace="custom" customColorSpace="sRGB"/>
                                     <constraints>
+                                        <constraint firstAttribute="width" relation="greaterThanOrEqual" secondItem="tVx-3G-dcu" secondAttribute="height" priority="999" id="Vbk-VH-5eU"/>
                                         <constraint firstAttribute="height" constant="31" id="Zwh-yQ-GTu"/>
-                                        <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="77" id="eGc-Dk-QbL"/>
                                     </constraints>
                                     <fontDescription key="fontDescription" type="boldSystem" pointSize="14"/>
                                     <state key="normal" title="FREE"/>
diff --git a/AltStore/Components/PillButton.swift b/AltStore/Components/PillButton.swift
index f32bc1a2..0fc467df 100644
--- a/AltStore/Components/PillButton.swift
+++ b/AltStore/Components/PillButton.swift
@@ -14,7 +14,16 @@ extension PillButton
     static let contentInsets = NSDirectionalEdgeInsets(top: 7, leading: 13, bottom: 7, trailing: 13)
 }
 
-final class PillButton: UIButton
+extension PillButton
+{
+    enum Style
+    {
+        case pill
+        case custom
+    }
+}
+
+class PillButton: UIButton
 {
     override var accessibilityValue: String? {
         get {
@@ -55,6 +64,18 @@ final class PillButton: UIButton
         }
     }
     
+    var style: Style = .pill {
+        didSet {
+            if self.style == .custom
+            {
+                // Reset insets for custom style.
+                self.contentEdgeInsets = UIEdgeInsets(top: 8, left: 8, bottom: 8, right: 8)
+            }
+            
+            self.update()
+        }
+    }
+    
     private let progressView = UIProgressView(progressViewStyle: .default)
     
     private lazy var displayLink: CADisplayLink = {
@@ -106,8 +127,6 @@ final class PillButton: UIButton
         self.layer.masksToBounds = true
         self.accessibilityTraits.formUnion([.updatesFrequently, .button])
         
-        self.contentEdgeInsets = UIEdgeInsets(top: Self.contentInsets.top, left: Self.contentInsets.leading, bottom: Self.contentInsets.bottom, right: Self.contentInsets.trailing)
-        
         self.activityIndicatorView.style = .medium
         self.activityIndicatorView.color = .white
         self.activityIndicatorView.isUserInteractionEnabled = false
@@ -144,8 +163,16 @@ final class PillButton: UIButton
     override func sizeThatFits(_ size: CGSize) -> CGSize
     {
         var size = super.sizeThatFits(size)
-        size.width = max(size.width, PillButton.minimumSize.width)
-        size.height = max(size.height, PillButton.minimumSize.height)
+        
+        switch self.style 
+        {
+        case .pill:
+            // Enforce minimum size for pill style.
+            size.width = max(size.width, PillButton.minimumSize.width)
+            size.height = max(size.height, PillButton.minimumSize.height)
+            
+        case .custom: break
+        }
         
         return size
     }
@@ -170,6 +197,13 @@ private extension PillButton
         
         // Update font after init because the original titleLabel is replaced.
         self.titleLabel?.font = UIFont.boldSystemFont(ofSize: 14)
+        
+        switch self.style
+        {
+        case .custom: break // Don't update insets in case client has updated them.
+        case .pill:
+            self.contentEdgeInsets = UIEdgeInsets(top: Self.contentInsets.top, left: Self.contentInsets.leading, bottom: Self.contentInsets.bottom, right: Self.contentInsets.trailing)
+        }
     }
     
     @objc func updateCountdown()