Merge branch 'next-major-version' of https://github.com/paypal/paypal…

…-ios into fix/button-size # Conflicts: # Demo/Demo/SwiftUIComponents/PayPalWebPayments/PayPalWebButtonsView.swift
paypal · Feb 14, 2024 · e47e030 · e47e030
2 parents 233eb34 + 51c43d0
commit e47e030
Show file tree

Hide file tree

Showing 8 changed files with 66 additions and 52 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 # PayPal iOS SDK Release Notes
 
 ## unreleased
+* PaymentButtons
+  * Add `custom` case for `PaymentButtonEdges`
+  * Support VoiceOver by adding button accessibility labels
+  * Add `custom` case for `PaymentButtonEdges`
+  * Support VoiceOver by adding button accessibility labels
+  * Font typeface changed to "PayPalOpen" to meet brand guidelines
 * CardPayments
   * Add `liabilityShift` property to `CardResult`
   * Add `CardClientError.threeDSVerificationError` for invalid verification
@@ -12,23 +18,6 @@
   * Add `PayPalVaultResult` type to return vault result
   * Add `PayPalVaultDelegate` to handle results from vault flow
   * Add `PayPalWebCheckoutClientError.paypalVaultResponseError` for missing or invalid response from vaulting
-* PaymentButtons
-  * Add new `PaymentButtonSize` case `.standard`
-  * Add `custom` case for `PaymentButtonEdges`
-  * Support VoiceOver by adding button accessibility labels
-  * Add new `PaymentButtonSize` case `.miniWithWordmark`
-  * Add new `PayPalButton.Labels` cases: `.addMoneyWith`, `.bookWith`, `.buyWith`, `.buyNowWith`,
-  `.checkoutWith`, `.continueWith`, `.contributeWith`, `.orderWith`, `.payLaterWith`, `.payWith`,
-  `.reloadWith`, `.rentWith`, `.reserveWith`, `.subscribeWith`, `.supportWith`, `.tipWith`,
-  `.topUpWith`
-  * `PayPalButtonSize` `.mini` changed to rectangular button to meet brand guidelines
-  * Font typeface changed to "PayPalOpen" to meet brand guidelines
-* Breaking Changes
-  * PaymentButtons
-    * Remove `PayPalButton.Labels` cases: `.checkout`, `.buyNow`, `.payLater`
-    * Remove `PaymentButtonColor` `.black`, `.silver`, `.blue`, and `.darkBlue`
-    * Add `PaymentButtonColor.gold` for `PayPalCreditButton`
-    * Remove `PaymentButtonSize` cases: `.miniWithWordmark`, `.collapsed`, `.expanded`, `.full`
 
 ## 1.1.0 (2023-11-16)
 * PayPalNativePayments

diff --git a/Demo/Demo/Extensions/PaymentButtonEnums+Extension.swift b/Demo/Demo/Extensions/PaymentButtonEnums+Extension.swift
@@ -3,7 +3,7 @@ import PaymentButtons
 extension PayPalPayLaterButton.Color {
 
     public static var allCases: [PayPalPayLaterButton.Color] {
-        [.gold, .white]
+        [.gold, .white, .black, .silver, .blue]
     }
 
     static func allCasesAsString() -> [String] {
@@ -14,7 +14,7 @@ extension PayPalPayLaterButton.Color {
 extension PayPalButton.Color: CaseIterable {
 
     public static var allCases: [PayPalButton.Color] {
-        [.gold, .white]
+        [.gold, .white, .black, .silver, .blue]
     }
 
     static func allCasesAsString() -> [String] {
@@ -25,7 +25,7 @@ extension PayPalButton.Color: CaseIterable {
 extension PayPalCreditButton.Color: CaseIterable {
 
     public static var allCases: [PayPalCreditButton.Color] {
-        [.gold, .white]
+        [.white, .black, .darkBlue]
     }
 
     static func allCasesAsString() -> [String] {
@@ -47,7 +47,7 @@ extension PaymentButtonEdges: CaseIterable {
 extension PaymentButtonSize: CaseIterable {
 
     public static var allCases: [PaymentButtonSize] {
-        [.mini, .standard]
+        [.mini, .collapsed, .expanded, .full]
     }
 
     static func allCasesAsString() -> [String] {
@@ -69,27 +69,7 @@ extension PaymentButtonFundingSource: CaseIterable {
 extension PayPalButton.Label: CaseIterable {
 
     public static var allCases: [PayPalButton.Label] {
-        [
-            .none,
-            .addMoneyWith,
-            .bookWith,
-            .buyNowWith,
-            .buyWith,
-            .checkoutWith,
-            .continueWith,
-            .contributeWith,
-            .orderWith,
-            .payWith,
-            .payLater,
-            .payLaterWith,
-            .reloadWith,
-            .rentWith,
-            .reserveWith,
-            .subscribeWith,
-            .supportWith,
-            .tipWith,
-            .topUpWith
-        ]
+        [.none, .checkout, .buyNow, .payWith]
     }
 
     static func allCasesAsString() -> [String] {

diff --git a/Demo/Demo/Models/Order.swift b/Demo/Demo/Models/Order.swift
@@ -36,9 +36,9 @@ struct Order: Codable, Equatable {
 
     struct Vault: Codable, Equatable {
 
-        let id: String
+        let id: String?
         let status: String
-        let customer: Customer
+        let customer: Customer?
     }
 
     struct Customer: Codable, Equatable {

diff --git a/Demo/Demo/SwiftUIComponents/CardPaymentViews/CardOrderCompletionResultView.swift b/Demo/Demo/SwiftUIComponents/CardPaymentViews/CardOrderCompletionResultView.swift
@@ -43,11 +43,15 @@ struct CardOrderCompletionResultView: View {
                 LeadingText("Brand", weight: .bold)
                 LeadingText("\(brand)")
             }
+            if let vaultStatus = orderResponse.paymentSource?.card?.attributes?.vault.status {
+                LeadingText("Vault Status", weight: .bold)
+                LeadingText("\(vaultStatus)")
+            }
             if let vaultID = orderResponse.paymentSource?.card?.attributes?.vault.id {
                 LeadingText("Vault ID / Payment Token", weight: .bold)
                 LeadingText("\(vaultID)")
             }
-            if let customerID = orderResponse.paymentSource?.card?.attributes?.vault.customer.id {
+            if let customerID = orderResponse.paymentSource?.card?.attributes?.vault.customer?.id {
                 LeadingText("Customer ID", weight: .bold)
                 LeadingText("\(customerID)")
             }

diff --git a/Demo/Demo/SwiftUIComponents/PayPalWebPayments/PayPalWebButtonsView.swift b/Demo/Demo/SwiftUIComponents/PayPalWebPayments/PayPalWebButtonsView.swift
@@ -27,7 +27,7 @@ struct PayPalWebButtonsView: View {
 
                 switch selectedFundingSource {
                 case .paypalCredit:
-                    PayPalCreditButton.Representable(color: .gold, edges: .rounded, size: .standard) {
+                    PayPalCreditButton.Representable(color: .white, edges: .rounded, size: .standard) {
                         payPalWebViewModel.paymentButtonTapped(funding: .paypalCredit)
                     }
                 case .paylater:

diff --git a/Demo/Demo/SwiftUIComponents/PayPalWebPayments/PayPalWebResultView.swift b/Demo/Demo/SwiftUIComponents/PayPalWebPayments/PayPalWebResultView.swift
@@ -42,7 +42,7 @@ struct PayPalWebResultView: View {
                 LabelViewText("Payment Token:", bodyText: vaultID)
             }
 
-            if let customerID = payPalWebViewModel.order?.paymentSource?.paypal?.attributes?.vault.customer.id {
+            if let customerID = payPalWebViewModel.order?.paymentSource?.paypal?.attributes?.vault.customer?.id {
                 LabelViewText("Customer ID:", bodyText: customerID)
             }
         }

diff --git a/Sources/PaymentButtons/PayPalCreditButton.swift b/Sources/PaymentButtons/PayPalCreditButton.swift
@@ -8,11 +8,10 @@ public final class PayPalCreditButton: PaymentButton {
     Available colors for PayPalCreditButton.
     */
     public enum Color: String {
-        case gold
         case white
 
         var color: PaymentButtonColor {
-            PaymentButtonColor(rawValue: rawValue) ?? .white
+            PaymentButtonColor(rawValue: rawValue) ?? .darkBlue
         }
     }
 

diff --git a/Sources/PaymentButtons/PaymentButtonColor.swift b/Sources/PaymentButtons/PaymentButtonColor.swift
@@ -5,21 +5,51 @@ public enum PaymentButtonColor: String {
     /// The gold background and blue wordmark, monogram, and black text.
     case gold
 
-    /// The white background and blue wordmark, blue border, monogram, and black text.
+    /// The white background and blue wordmark, monogram, and black text.
     case white
 
+    /// The black background and monochrome wordmark, monogram, and white text.
+    case black
+
+    /// The silver background and blue wordmark, monogram, and black text.
+    case silver
+
+    /// The blue background and white wordmark, blue monogram, and white text.
+    case blue
+
+    /// The dark blue background with PayPal Credit wordmark and monogram.
+    case darkBlue
+
     var color: UIColor {
         switch self {
         case .gold:
-            return UIColor(hexString: "#FFD140")
+            return UIColor(hexString: "#FFC439")
 
         case .white:
             return UIColor(hexString: "#FFFFFF")
+
+        case .black:
+            return UIColor(hexString: "#000000")
+
+        case .silver:
+            return UIColor(hexString: "#EEEEEE")
+
+        case .blue:
+            return UIColor(hexString: "#0070BA")
+
+        case .darkBlue:
+            return UIColor(hexString: "#073990")
         }
     }
 
     var fontColor: UIColor {
-        .black
+        switch self {
+        case .gold, .white, .silver:
+            return .black
+
+        case .blue, .black, .darkBlue:
+            return .white
+        }
     }
 
     public var description: String {
@@ -29,6 +59,18 @@ public enum PaymentButtonColor: String {
 
         case .white:
             return "White"
+
+        case .black:
+            return "Black"
+
+        case .silver:
+            return "Silver"
+
+        case .blue:
+            return "Blue"
+
+        case .darkBlue:
+            return "Dark blue"
         }
     }
 }