Roll back CountryInfo and SourceTypeValue type names to make PR more …

…clean
omise · Feb 14, 2024 · fbcdb3d · fbcdb3d
1 parent 10d3d9d
commit fbcdb3d
Show file tree

Hide file tree

Showing 33 changed files with 114 additions and 114 deletions.
diff --git a/ExampleApp/Models/Tools.swift b/ExampleApp/Models/Tools.swift
@@ -4,7 +4,7 @@ import OmiseSDK
 struct PaymentPreset {
  var paymentAmount: Int64
  var paymentCurrency: Currency
- var allowedPaymentMethods: [SourceType]
+ var allowedPaymentMethods: [SourceTypeValue]
 
  static let thailandPreset = PaymentPreset(
  paymentAmount: 5_000_00,
@@ -35,19 +35,19 @@ class Tool: NSObject {
 
  static let thailandPaymentAmount: Int64 = PaymentPreset.thailandPreset.paymentAmount
  static let thailandPaymentCurrency: String = PaymentPreset.thailandPreset.paymentCurrency.code
- static let thailandAllowedPaymentMethods: [SourceType] = PaymentPreset.thailandPreset.allowedPaymentMethods
+ static let thailandAllowedPaymentMethods: [SourceTypeValue] = PaymentPreset.thailandPreset.allowedPaymentMethods
 
  static let japanPaymentAmount: Int64 = PaymentPreset.japanPreset.paymentAmount
  static let japanPaymentCurrency: String = PaymentPreset.japanPreset.paymentCurrency.code
- static let japanAllowedPaymentMethods: [SourceType] = PaymentPreset.japanPreset.allowedPaymentMethods
+ static let japanAllowedPaymentMethods: [SourceTypeValue] = PaymentPreset.japanPreset.allowedPaymentMethods
 
  static let singaporePaymentAmount: Int64 = PaymentPreset.singaporePreset.paymentAmount
  static let singaporePaymentCurrency: String = PaymentPreset.singaporePreset.paymentCurrency.code
- static let singaporeAllowedPaymentMethods: [SourceType] = PaymentPreset.singaporePreset.allowedPaymentMethods
+ static let singaporeAllowedPaymentMethods: [SourceTypeValue] = PaymentPreset.singaporePreset.allowedPaymentMethods
 
  static let malaysiaPaymentAmount: Int64 = PaymentPreset.malaysiaPreset.paymentAmount
  static let malaysiaPaymentCurrency: String = PaymentPreset.malaysiaPreset.paymentCurrency.code
- static let malaysiaAllowedPaymentMethods: [SourceType] = PaymentPreset.malaysiaPreset.allowedPaymentMethods
+ static let malaysiaAllowedPaymentMethods: [SourceTypeValue] = PaymentPreset.malaysiaPreset.allowedPaymentMethods
 
  static func imageWith(size: CGSize, color: UIColor) -> UIImage? {
  return Tool.imageWith(size: size) { (context) in

diff --git a/ExampleApp/Views/BaseViewController.swift b/ExampleApp/Views/BaseViewController.swift
@@ -22,7 +22,7 @@ class BaseViewController: UIViewController {
  var paymentAmount: Int64 = 0
  var paymentCurrencyCode: String = ""
  var usesCapabilityDataForPaymentMethods = false
- var allowedPaymentMethods: [SourceType] = []
+ var allowedPaymentMethods: [SourceTypeValue] = []
 
  required init?(coder: NSCoder) {
  self.usesCapabilityDataForPaymentMethods = true

diff --git a/ExampleApp/Views/CustomCreditCardFormViewController.swift b/ExampleApp/Views/CustomCreditCardFormViewController.swift
@@ -136,7 +136,7 @@ class CustomCreditCardFormViewController: UIViewController {
  }
 
  private func setupBillingAddressFields() {
- countryCodeField.placeholder = "Country Code (ex. \"TH\")"
+ countryCodeField.placeholder = "CountryInfo Code (ex. \"TH\")"
  street1Field.placeholder = "Street"
  street2Field.placeholder = "Street 2"
  cityField.placeholder = "City"

diff --git a/ExampleApp/Views/PaymentSettingTableViewController.swift b/ExampleApp/Views/PaymentSettingTableViewController.swift
@@ -54,7 +54,7 @@ class PaymentSettingTableViewController: UITableViewController {
  }
  }
 
- var allowedPaymentMethods: Set<SourceType> = [] {
+ var allowedPaymentMethods: Set<SourceTypeValue> = [] {
  willSet {
  guard isViewLoaded else {
  return
@@ -264,7 +264,7 @@ extension PaymentSettingTableViewController {
  }
 
  // swiftlint:disable:next function_body_length
- func paymentSource(for cell: UITableViewCell) -> SourceType? {
+ func paymentSource(for cell: UITableViewCell) -> SourceTypeValue? {
  switch cell {
  case internetBankingBAYPaymentCell:
  return .internetBankingBAY
@@ -356,7 +356,7 @@ extension PaymentSettingTableViewController {
  }
 
  // swiftlint:disable:next function_body_length
- func cell(for paymentSource: SourceType) -> UITableViewCell? {
+ func cell(for paymentSource: SourceTypeValue) -> UITableViewCell? {
  switch paymentSource {
  case .internetBankingBAY:
  return internetBankingBAYPaymentCell

diff --git a/ExampleApp/Views/ProductDetailViewController.swift b/ExampleApp/Views/ProductDetailViewController.swift
@@ -20,7 +20,7 @@ class ProductDetailViewController: BaseViewController {
  client.capability { (result) in
  if case .success(let capability) = result {
  self.capability = capability
- print("Capability Country: \(capability.countryCode)")
+ print("Capability CountryInfo: \(capability.countryCode)")
  }
  }
  }

diff --git a/OmiseSDK/AtomeFormViewModel.swift b/OmiseSDK/AtomeFormViewModel.swift
@@ -22,16 +22,16 @@ class AtomeFormViewModel: AtomeFormViewModelProtocol, CountryListViewModelProtoc
  ]
 
  // MARK: CountryListViewModelProtocol
- lazy var countries: [Country] = Country.sortedAll
+ lazy var countries: [CountryInfo] = CountryInfo.sortedAll
 
- lazy var selectedCountry: Country? = OmiseSDK.shared.country {
+ lazy var selectedCountry: CountryInfo? = OmiseSDK.shared.country {
  didSet {
  if let selectedCountry = selectedCountry {
  onSelectCountry(selectedCountry)
  }
  }
  }
- var onSelectCountry: (Country) -> Void = { _ in }
+ var onSelectCountry: (CountryInfo) -> Void = { _ in }
 
  var countryListViewModel: CountryListViewModelProtocol { return self }
 

diff --git a/OmiseSDK/CountryListViewModelProtocol.swift b/OmiseSDK/CountryListViewModelProtocol.swift
@@ -9,7 +9,7 @@
 import Foundation
 
 protocol CountryListViewModelProtocol {
- var countries: [Country] { get }
- var selectedCountry: Country? { get set }
- var onSelectCountry: (Country) -> Void { get set }
+ var countries: [CountryInfo] { get }
+ var selectedCountry: CountryInfo? { get set }
+ var onSelectCountry: (CountryInfo) -> Void { get set }
 }
diff --git a/OmiseSDK/CreditCardFormViewModel.swift b/OmiseSDK/CreditCardFormViewModel.swift
@@ -25,16 +25,16 @@ class CreditCardFormViewModel: CreditCardFormViewModelProtocol, CountryListViewM
  var countryListViewModel: CountryListViewModelProtocol { return self }
 
  // MARK: CountryListViewModelProtocol
- lazy var countries: [Country] = Country.sortedAll
+ lazy var countries: [CountryInfo] = CountryInfo.sortedAll
 
- lazy var selectedCountry: Country? = OmiseSDK.shared.country {
+ lazy var selectedCountry: CountryInfo? = OmiseSDK.shared.country {
  didSet {
  if let selectedCountry = selectedCountry {
  onSelectCountry(selectedCountry)
  }
  }
  }
- var onSelectCountry: (Country) -> Void = { _ in }
+ var onSelectCountry: (CountryInfo) -> Void = { _ in }
 
  func error(for field: AddressField, validate text: String?) -> String? {
  guard isAddressFieldsVisible else { return nil }

diff --git a/OmiseSDK/InstallmentBankingSourceChooserViewController.swift b/OmiseSDK/InstallmentBankingSourceChooserViewController.swift
@@ -2,12 +2,12 @@ import UIKit
 import os
 
 // swiftlint:disable:next type_name
-class InstallmentBankingSourceChooserViewController: AdaptableStaticTableViewController<SourceType>,
+class InstallmentBankingSourceChooserViewController: AdaptableStaticTableViewController<SourceTypeValue>,
  PaymentSourceChooser,
  PaymentChooserUI {
  var flowSession: PaymentCreatorFlowSession?
 
- override var showingValues: [SourceType] {
+ override var showingValues: [SourceTypeValue] {
  didSet {
  os_log("Installment Brand Chooser: Showing options - %{private}@",
  log: uiLogObject,
@@ -37,7 +37,7 @@ class InstallmentBankingSourceChooserViewController: AdaptableStaticTableViewCon
  navigationItem.backBarButtonItem = UIBarButtonItem(title: "", style: .plain, target: nil, action: nil)
  }
 
- override func staticIndexPath(forValue value: SourceType) -> IndexPath {
+ override func staticIndexPath(forValue value: SourceTypeValue) -> IndexPath {
  switch value {
  case .installmentBBL:
  return IndexPath(row: 0, section: 0)

diff --git a/OmiseSDK/InstallmentsNumberOfTermsChooserViewController.swift b/OmiseSDK/InstallmentsNumberOfTermsChooserViewController.swift
@@ -5,7 +5,7 @@ import os
 class InstallmentsNumberOfTermsChooserViewController: UITableViewController, PaymentSourceChooser, PaymentChooserUI {
  var flowSession: PaymentCreatorFlowSession?
 
- var sourceType: SourceType? {
+ var sourceType: SourceTypeValue? {
  didSet {
  os_log("Installment Chooser: Showing options - %{private}@",
  log: uiLogObject,
@@ -22,7 +22,7 @@ class InstallmentsNumberOfTermsChooserViewController: UITableViewController, Pay
  }
 
  // swiftlint:disable:next function_body_length
- func headerTitle(for sourceType: SourceType) -> String {
+ func headerTitle(for sourceType: SourceTypeValue) -> String {
  switch sourceType {
  case .installmentBAY:
  return NSLocalizedString(

diff --git a/OmiseSDK/InternetBankingSourceChooserViewController.swift b/OmiseSDK/InternetBankingSourceChooserViewController.swift
@@ -2,12 +2,12 @@ import UIKit
 import os
 
 // swiftlint:disable:next type_name
-class InternetBankingSourceChooserViewController: AdaptableStaticTableViewController<SourceType>,
+class InternetBankingSourceChooserViewController: AdaptableStaticTableViewController<SourceTypeValue>,
  PaymentSourceChooser,
  PaymentChooserUI {
  var flowSession: PaymentCreatorFlowSession?
 
- override var showingValues: [SourceType] {
+ override var showingValues: [SourceTypeValue] {
  didSet {
  os_log("Internet Banking Chooser: Showing options - %{private}@",
  log: uiLogObject,
@@ -37,7 +37,7 @@ class InternetBankingSourceChooserViewController: AdaptableStaticTableViewContro
  navigationItem.backBarButtonItem = UIBarButtonItem(title: "", style: .plain, target: nil, action: nil)
  }
 
- override func staticIndexPath(forValue value: SourceType) -> IndexPath {
+ override func staticIndexPath(forValue value: SourceTypeValue) -> IndexPath {
  switch value {
  case .internetBankingBBL:
  return IndexPath(row: 0, section: 0)

diff --git a/OmiseSDK/MobileBankingSourceChooserViewController.swift b/OmiseSDK/MobileBankingSourceChooserViewController.swift
@@ -1,12 +1,12 @@
 import UIKit
 import os
 
-class MobileBankingSourceChooserViewController: AdaptableStaticTableViewController<SourceType>,
+class MobileBankingSourceChooserViewController: AdaptableStaticTableViewController<SourceTypeValue>,
  PaymentSourceChooser,
  PaymentChooserUI {
  var flowSession: PaymentCreatorFlowSession?
 
- override var showingValues: [SourceType] {
+ override var showingValues: [SourceTypeValue] {
  didSet {
  os_log("Mobile Banking Chooser: Showing options - %{private}@",
  log: uiLogObject,
@@ -36,7 +36,7 @@ class MobileBankingSourceChooserViewController: AdaptableStaticTableViewControll
  navigationItem.backBarButtonItem = UIBarButtonItem(title: "", style: .plain, target: nil, action: nil)
  }
 
- override func staticIndexPath(forValue value: SourceType) -> IndexPath {
+ override func staticIndexPath(forValue value: SourceTypeValue) -> IndexPath {
  switch value {
  case .mobileBankingBAY:
  return IndexPath(row: 0, section: 0)

diff --git a/OmiseSDK/PaymentChooserViewController.swift b/OmiseSDK/PaymentChooserViewController.swift
@@ -149,7 +149,7 @@ enum PaymentChooserOption: CaseIterable, Equatable, CustomStringConvertible {
 
 extension PaymentChooserOption {
  // swiftlint:disable:next function_body_length
- fileprivate static func paymentOptions(for sourceType: SourceType) -> [PaymentChooserOption] {
+ fileprivate static func paymentOptions(for sourceType: SourceTypeValue) -> [PaymentChooserOption] {
  switch sourceType {
  case .trueMoneyWallet:
  return [.truemoney]
@@ -235,7 +235,7 @@ class PaymentChooserViewController: AdaptableStaticTableViewController<PaymentCh
  updateShowingValues()
  }
  }
- var allowedPaymentMethods: [SourceType] = [] {
+ var allowedPaymentMethods: [SourceTypeValue] = [] {
  didSet {
  updateShowingValues()
  }
@@ -500,7 +500,7 @@ class PaymentChooserViewController: AdaptableStaticTableViewController<PaymentCh
  showsCreditCardPayment = capability.cardPaymentMethod != nil
 
  allowedPaymentMethods = capability.paymentMethods.compactMap {
- SourceType(rawValue: $0.name)
+ SourceTypeValue(rawValue: $0.name)
  }
 
  updateShowingValues()
@@ -538,7 +538,7 @@ class PaymentChooserViewController: AdaptableStaticTableViewController<PaymentCh
 }
 
 private extension PaymentChooserViewController {
- func paymentOptions(from sourceTypes: [SourceType]) -> [PaymentChooserOption] {
+ func paymentOptions(from sourceTypes: [SourceTypeValue]) -> [PaymentChooserOption] {
  let paymentOptions: [PaymentChooserOption] = sourceTypes.reduce(into: []) { (result, sourceType) in
  let paymentOptions = PaymentChooserOption.paymentOptions(for: sourceType)
  for paymentOption in paymentOptions where !result.contains(paymentOption) {

diff --git a/OmiseSDK/PaymentCreatorController.swift b/OmiseSDK/PaymentCreatorController.swift
@@ -63,7 +63,7 @@ public class PaymentCreatorController: UINavigationController {
 
  /// Available Source payment options to let user to choose.
  /// The default value is the default available payment method for merchant in Thailand
- public var allowedPaymentMethods: [SourceType] = PaymentCreatorController.thailandDefaultAvailableSourceMethods {
+ public var allowedPaymentMethods: [SourceTypeValue] = PaymentCreatorController.thailandDefaultAvailableSourceMethods {
  didSet {
  paymentChooserViewController.allowedPaymentMethods = allowedPaymentMethods
  }
@@ -119,7 +119,7 @@ public class PaymentCreatorController: UINavigationController {
  publicKey: String,
  amount: Int64,
  currency: Currency,
- allowedPaymentMethods: [SourceType],
+ allowedPaymentMethods: [SourceTypeValue],
  paymentDelegate: PaymentCreatorControllerDelegate?
  ) -> PaymentCreatorController {
  let storyboard = UIStoryboard(name: "OmiseSDK", bundle: .omiseSDK)
@@ -433,7 +433,7 @@ extension PaymentCreatorController: PaymentCreatorFlowSessionDelegate {
 }
 
 extension PaymentCreatorController {
- public static let thailandDefaultAvailableSourceMethods: [SourceType] = [
+ public static let thailandDefaultAvailableSourceMethods: [SourceTypeValue] = [
  .internetBankingBAY,
  .internetBankingBBL,
  .mobileBankingSCB,
@@ -457,17 +457,17 @@ extension PaymentCreatorController {
  .shopeePayJumpApp
  ]
 
- public static let japanDefaultAvailableSourceMethods: [SourceType] = [
+ public static let japanDefaultAvailableSourceMethods: [SourceTypeValue] = [
  .eContext,
  .payPay
  ]
 
- public static let singaporeDefaultAvailableSourceMethods: [SourceType] = [
+ public static let singaporeDefaultAvailableSourceMethods: [SourceTypeValue] = [
  .payNow,
  .shopeePayJumpApp
  ]
 
- public static let malaysiaDefaultAvailableSourceMethods: [SourceType] = [
+ public static let malaysiaDefaultAvailableSourceMethods: [SourceTypeValue] = [
  .fpx,
  .installmentMBB,
  .touchNGo,
@@ -480,13 +480,13 @@ extension PaymentCreatorController {
  .duitNowOBW
  ]
 
- public static let internetBankingAvailablePaymentMethods: [SourceType] = [
+ public static let internetBankingAvailablePaymentMethods: [SourceTypeValue] = [
  .internetBankingBAY,
  .internetBankingBBL
  ]
 
  // swiftlint:disable:next identifier_name
- public static let installmentsBankingAvailablePaymentMethods: [SourceType] = [
+ public static let installmentsBankingAvailablePaymentMethods: [SourceTypeValue] = [
  .installmentBAY,
  .installmentFirstChoice,
  .installmentBBL,
@@ -498,15 +498,15 @@ extension PaymentCreatorController {
  .installmentUOB
  ]
 
- public static let billPaymentAvailablePaymentMethods: [SourceType] = [
+ public static let billPaymentAvailablePaymentMethods: [SourceTypeValue] = [
  .billPaymentTescoLotus
  ]
 
- public static let barcodeAvailablePaymentMethods: [SourceType] = [
+ public static let barcodeAvailablePaymentMethods: [SourceTypeValue] = [
  .barcodeAlipay
  ]
 
- public static let mobileBankingAvailablePaymentMethods: [SourceType] = [
+ public static let mobileBankingAvailablePaymentMethods: [SourceTypeValue] = [
  .mobileBankingSCB,
  .mobileBankingKBank,
  .mobileBankingBAY,

diff --git a/OmiseSDK/Resources/en.lproj/Localizable.strings b/OmiseSDK/Resources/en.lproj/Localizable.strings
@@ -1,5 +1,5 @@
 // Credit Card
-"CreditCard.field.country" = "Country or region";
+"CreditCard.field.country" = "CountryInfo or region";
 "CreditCard.field.address" = "Address";
 "CreditCard.field.city" = "City";
 "CreditCard.field.state" = "State";
@@ -14,7 +14,7 @@
 "Atome.field.name" = "Name";
 "Atome.field.email" = "Email";
 "Atome.field.phoneNumber" = "Phone Number";
-"Atome.field.country" = "Country";
+"Atome.field.country" = "CountryInfo";
 "Atome.field.city" = "City";
 "Atome.field.postalCode" = "Postal code";
 "Atome.field.state" = "State";

diff --git a/OmiseSDK/Sources/Models/Country.swift b/OmiseSDK/Sources/Models/Country.swift
@@ -1,6 +1,6 @@
 import Foundation
 
-public struct Country: Codable, Equatable {
+public struct CountryInfo: Codable, Equatable {
  public let name: String
  public let code: String
 
@@ -21,18 +21,18 @@ public struct Country: Codable, Equatable {
  }
 }
 
-extension Country {
+extension CountryInfo {
  public static var avsCodes: [String] = ["US", "CA", "GB"]
 
- public static var sortedAll: [Country] = {
- Country.all.sorted {
+ public static var sortedAll: [CountryInfo] = {
+ CountryInfo.all.sorted {
  $0.name.localizedCompare($1.name) == .orderedAscending
  }
  }()
 }
 
-extension Country {
- public static var all: [Country] = [
+extension CountryInfo {
+ public static var all: [CountryInfo] = [
  .init(name: "Afghanistan", code: "AF"),
  .init(name: "Åland Islands", code: "AX"),
  .init(name: "Albania", code: "AL"),