PI-1738: Billing Form component: Standard

Cartfile.resolved

@@ -1 +1 @@
-github "marmelroy/PhoneNumberKit" "3.3.3"
+github "marmelroy/PhoneNumberKit" "3.3.7"

Source/CKOColor.swift

@@ -0,0 +1,36 @@
+import UIKit
+
+extension UIColor {
+    public static let brandeisBlue = UIColor(hex: "#0B5FF0")
+    public static let doveGray =  UIColor(hex: "#636363")
+    public static let codGray =  UIColor(hex: "#141414")
+    public static let mediumGray =  UIColor(hex: "#8A8A8A")
+    public static let tallPoppyRed =  UIColor(hex: "#AD283E")
+}
+
+extension UIColor {
+    convenience init(hex: String, alpha: CGFloat = 1.0) {
+        var cString = hex
+            .trimmingCharacters(in: .whitespacesAndNewlines)
+            .replacingOccurrences(of: " ", with: "")
+            .uppercased()
+
+        if cString.hasPrefix("#") { cString.removeFirst() }
+
+        guard cString.count == 6 else {
+            self.init(hex: "ff0000") // gray color
+            return
+        }
+
+        var rgbValue: UInt64 = 0
+        Scanner(string: cString).scanHexInt64(&rgbValue)
+
+        self.init (
+            red: CGFloat((rgbValue & 0xFF0000) >> 16) / 255.0,
+            green: CGFloat((rgbValue & 0x00FF00) >> 8) / 255.0,
+            blue: CGFloat(rgbValue & 0x0000FF) / 255.0,
+            alpha: CGFloat(1.0)
+        )
+    }
+
+}

Source/CKOFont.swift

@@ -0,0 +1,61 @@
+import UIKit
+
+extension UIFont {
+
+    // load framework font in application
+    public static let loadAllFonts: () = {
+        for style in GraphikStyle.allCases {
+            style.fontName.register(for: CheckoutTheme.self, withExtension: "otf")
+        }
+    }()
+
+}
+
+extension UIFont {
+
+    enum GraphikStyle: String, CaseIterable {
+        case regularIt
+        case thin
+        case thinIt
+        case extrabldIt
+        case lightIt
+        case black
+        case medium
+        case extrabld
+        case boldIt
+        case regular
+        case blackIt
+        case mediumIt
+        case bold
+        case light
+        case semiboldIt
+        case semibold
+        var fontName: String {
+            return "GraphikLCG-\(self.rawValue.capitalized)"
+        }
+    }
+
+    convenience init(graphikStyle: GraphikStyle, size: CGFloat) {
+        self.init(name: graphikStyle.fontName, size: size)!
+    }
+
+}
+
+
+extension String {
+    //MARK: - Make custom font bundle register to framework
+
+    func register(for type: AnyClass, withExtension: String) {
+        let bundle = getBundle(forClass: type)
+
+        if let pathForResourceString = bundle.url(forResource: self, withExtension: withExtension),
+           let fontData = NSData(contentsOf: pathForResourceString), let dataProvider = CGDataProvider.init(data: fontData) {
+            let fontRef = CGFont.init(dataProvider)
+            var errorRef: Unmanaged<CFError>? = nil
+            if CTFontManagerRegisterGraphicsFont(fontRef!, &errorRef) == false {
+                print("Failed to register font - register graphics font failed - this font may have already been registered in the main bundle.")
+            }
+        }
+    }
+
+}

Source/Extensions/StringExtensions.swift

@@ -2,24 +2,45 @@ import Foundation
 import UIKit
 
 extension String {
-
-    private func getBundle(forClass: AnyClass) -> Foundation.Bundle {
-        #if SWIFT_PACKAGE
+    
+    func getBundle(forClass: Swift.AnyClass) -> Foundation.Bundle {
+#if SWIFT_PACKAGE
         let baseBundle = Bundle.module
-        #else
+#else
         let baseBundle = Foundation.Bundle(for: forClass)
-        #endif
+#endif
         let path = baseBundle.path(forResource: "Frames", ofType: "bundle")
         return path == nil ? baseBundle : Foundation.Bundle(path: path!)!
     }
-
-    func localized(forClass: AnyClass, comment: String = "") -> String {
+    
+    func localized(forClass: Swift.AnyClass, comment: String = "") -> String {
         let bundle = getBundle(forClass: forClass)
         return NSLocalizedString(self, bundle: bundle, comment: "")
     }
-
+    
     func image(forClass: AnyClass) -> UIImage {
         let bundle = getBundle(forClass: forClass)
         return UIImage(named: self, in: bundle, compatibleWith: nil) ?? UIImage()
     }
+
+    //TODO: migrate to assets
+    //https://www.hackingwithswift.com/example-code/core-graphics/how-to-render-a-pdf-to-an-image
+    func vectorPDFImage(forClass: AnyClass) -> UIImage? {
+        let bundle = getBundle(forClass: forClass)
+        guard let urlPath = bundle.url(forResource: self, withExtension: "pdf") else { return nil }
+        guard let document = CGPDFDocument(urlPath as CFURL) else { return nil }
+        guard let page = document.page(at: 1) else { return nil }
+
+        let pageRect = page.getBoxRect(.mediaBox)
+        let renderer = UIGraphicsImageRenderer(size: pageRect.size)
+
+        return renderer.image {
+            UIColor.white.set()
+            $0.fill(pageRect)
+            $0.cgContext.translateBy(x: 0.0, y: pageRect.size.height)
+            $0.cgContext.scaleBy(x: 1.0, y: -1.0)
+            $0.cgContext.drawPDFPage(page)
+        }
+    }
+
 }

Source/Extensions/UIViewControllerExtensions.swift

@@ -25,6 +25,7 @@ extension UIViewController {
             let activeTextFieldOrigin: CGPoint? = activeTextFieldRect?.origin
             if !aRect.contains(activeTextFieldOrigin!) {
                 scrollView.scrollRectToVisible(activeTextFieldRect!, animated: true)
+
             }
         }
     }

Source/Resources/en.lproj/Localizable.strings

@@ -1,4 +1,16 @@
-
+"missingBillingFormFullName" = "Missing Name";
+"missingBillingFormAddressLine1" = "Missing Address Line 1";
+"missingBillingFormAddressLine2" = "Missing Address Line 2";
+"missingBillingFormCity" = "Missing City";
+"missingBillingFormState" = "Missing State";
+"missingBillingFormPostcode" = "Missing Postcode";
+"missingBillingFormPhoneNumber" = "Missing Phone Number";
+"missingBillingFormCountry" = "Missing Country";
+"billingFormPhoneNumberHint" = "Phone Number";
+"billingAddressTitle" = "Billing address";
+"city" = "City";
+"cancel" = "Cancel";
+"done" = "Done";
 "cardNumber" = "Card Number*";
 "cardholderName" = "Cardholder's name";
 "cardholderNameRequired" = "Cardholder's name*";

Source/UI/Controllers/CardViewController.swift

@@ -43,13 +43,17 @@ public class CardViewController: UIViewController,
     var topConstraint: NSLayoutConstraint?
 
     private var loggedForCurrentCorrelationID = false
-
+    public var isNewUI = false
+    // TODO: [Will updated in the next ticket].
+    private var countryCode = 0
     // MARK: - Initialization
-
+
+
     /// Returns a newly initialized view controller with the cardholder's name and billing details
     /// state specified. You can specified the region using the Iso2 region code ("UK" for "United Kingdom")
     public init(checkoutApiClient: CheckoutAPIClient, cardHolderNameState: InputState,
                 billingDetailsState: InputState, defaultRegionCode: String? = nil) {
+        UIFont.loadAllFonts
         self.checkoutApiClient = checkoutApiClient
         self.cardHolderNameState = cardHolderNameState
         self.billingDetailsState = billingDetailsState
@@ -160,8 +164,14 @@ public class CardViewController: UIViewController,
     }
 
     @objc func onTapAddressView() {
-        navigationController?.pushViewController(addressViewController, animated: true)
         checkoutApiClient?.logger.log(.billingFormPresented)
+
+        guard isNewUI,
+                let viewController = BillingFormFactory.getBillingFormViewController(delegate: self).1 else {
+            navigationController?.pushViewController(addressViewController, animated: true)
+            return
+        }
+        navigationController?.present(viewController, animated: true)
         loggedForCurrentCorrelationID = true
     }
 
@@ -339,3 +349,20 @@ public class CardViewController: UIViewController,
         }
     }
 }
+
+
+extension CardViewController: BillingFormViewModelDelegate {
+    func updateCountryCode(code: Int) {
+        countryCode = code
+    }
+
+    func onTapDoneButton(address: CkoAddress, phone: CkoPhoneNumber) {
+        billingDetailsAddress = address
+        billingDetailsPhone = phone
+        let value = "\(address.addressLine1 ?? ""), \(address.city ?? "")"
+        cardView.billingDetailsInputView.value.text = value
+        validateFieldsValues()
+        // return to CardViewController
+        self.topConstraint?.isActive = false
+    }
+}

Source/UI/NewUI/BillingForm/Default Implementation/BillingForm/Fields/AddressLine1/DefaultBillingFormAddressLine1CellStyle.swift

@@ -0,0 +1,26 @@
+import UIKit
+
+struct DefaultBillingFormAddressLine1CellStyle : BillingFormTextFieldCellStyle {
+
+    var isOptinal: Bool
+    var backgroundColor: UIColor
+    var title: InputLabelStyle?
+    var hint: InputLabelStyle?
+    var textfield: TextFieldStyle
+    var error: ErrorInputLabelStyle
+
+    init(isOptinal: Bool = true,
+         backgroundColor: UIColor = .white,
+         header: InputLabelStyle = DefaultTitleLabelStyle(text: "addressLine1".localized(forClass: CheckoutTheme.self)),
+         hint: InputLabelStyle? = nil,
+         textfield: TextFieldStyle = DefaultTextField(),
+         error: ErrorInputLabelStyle = DefaultErrorInputLabelStyle(text:  "missingBillingFormAddressLine1".localized(forClass: CheckoutTheme.self))) {
+        self.backgroundColor = backgroundColor
+        self.title = header
+        self.hint = hint
+        self.textfield = textfield
+        self.error = error
+        self.isOptinal = isOptinal
+    }
+
+}

Source/UI/NewUI/BillingForm/Default Implementation/BillingForm/Fields/AddressLine2/DefaultBillingFormAddressLine2CellStyle.swift

@@ -0,0 +1,26 @@
+import UIKit
+
+struct DefaultBillingFormAddressLine2CellStyle : BillingFormTextFieldCellStyle {
+
+    var isOptinal: Bool
+    var backgroundColor: UIColor
+    var title: InputLabelStyle?
+    var hint: InputLabelStyle?
+    var textfield: TextFieldStyle
+    var error: ErrorInputLabelStyle
+
+    init(isOptinal: Bool = true,
+         backgroundColor: UIColor = .white,
+         header: InputLabelStyle = DefaultTitleLabelStyle(text: "addressLine2".localized(forClass: CheckoutTheme.self)),
+         hint: InputLabelStyle? = nil,
+         textfield: TextFieldStyle = DefaultTextField(),
+         error: ErrorInputLabelStyle = DefaultErrorInputLabelStyle(text: "missingBillingFormAddressLine2".localized(forClass: CheckoutTheme.self))) {
+        self.backgroundColor = backgroundColor
+        self.title = header
+        self.hint = hint
+        self.textfield = textfield
+        self.error = error
+        self.isOptinal = isOptinal
+    }
+
+}

Source/UI/NewUI/BillingForm/Default Implementation/BillingForm/Fields/City/DefaultBillingFormCityCellStyle.swift

@@ -0,0 +1,26 @@
+import UIKit
+
+struct DefaultBillingFormCityCellStyle : BillingFormTextFieldCellStyle {
+
+    var isOptinal: Bool
+    var backgroundColor: UIColor
+    var title: InputLabelStyle?
+    var hint: InputLabelStyle?
+    var textfield: TextFieldStyle
+    var error: ErrorInputLabelStyle
+
+    init(isOptinal: Bool = false,
+         backgroundColor: UIColor = .white,
+         header: InputLabelStyle = DefaultTitleLabelStyle(text: "city".localized(forClass: CheckoutTheme.self)),
+         hint: InputLabelStyle? = nil,
+         textfield: TextFieldStyle = DefaultTextField(),
+         error: ErrorInputLabelStyle = DefaultErrorInputLabelStyle(text: "missingBillingFormCity".localized(forClass: CheckoutTheme.self))) {
+        self.backgroundColor = backgroundColor
+        self.title = header
+        self.hint = hint
+        self.textfield = textfield
+        self.error = error
+        self.isOptinal = isOptinal
+    }
+
+}

Source/UI/NewUI/BillingForm/Default Implementation/BillingForm/Fields/Country/DefaultBillingFormCountryCellStyle.swift

@@ -0,0 +1,26 @@
+import UIKit
+
+struct DefaultBillingFormCountryCellStyle : BillingFormTextFieldCellStyle {
+
+    var isOptinal: Bool
+    var backgroundColor: UIColor
+    var title: InputLabelStyle?
+    var hint: InputLabelStyle?
+    var textfield: TextFieldStyle
+    var error: ErrorInputLabelStyle
+
+    init(isOptinal: Bool = false,
+         backgroundColor: UIColor = .white,
+         header: InputLabelStyle = DefaultTitleLabelStyle(text: "country".localized(forClass: CheckoutTheme.self)),
+         hint: InputLabelStyle? = nil,
+         textfield: TextFieldStyle = DefaultTextField(),
+         error: ErrorInputLabelStyle = DefaultErrorInputLabelStyle(text: "missingBillingFormCountry".localized(forClass: CheckoutTheme.self))) {
+        self.backgroundColor = backgroundColor
+        self.title = header
+        self.hint = hint
+        self.textfield = textfield
+        self.error = error
+        self.isOptinal = isOptinal
+    }
+
+}

Source/UI/NewUI/BillingForm/Default Implementation/BillingForm/Fields/FullName/DefaultBillingFormFullNameCellStyle.swift

@@ -0,0 +1,26 @@
+import UIKit
+
+struct DefaultBillingFormFullNameCellStyle : BillingFormTextFieldCellStyle {
+
+    var isOptinal: Bool
+    var backgroundColor: UIColor
+    var title: InputLabelStyle?
+    var hint: InputLabelStyle?
+    var textfield: TextFieldStyle
+    var error: ErrorInputLabelStyle
+
+    init(isOptinal: Bool = false,
+         backgroundColor: UIColor = .white,
+         header: InputLabelStyle = DefaultTitleLabelStyle(text: "name".localized(forClass: CheckoutTheme.self)),
+         hint: InputLabelStyle? = nil,
+         textfield: TextFieldStyle = DefaultTextField(),
+         error: ErrorInputLabelStyle = DefaultErrorInputLabelStyle(text: "missingBillingFormFullName".localized(forClass: CheckoutTheme.self))) {
+        self.backgroundColor = backgroundColor
+        self.title = header
+        self.hint = hint
+        self.textfield = textfield
+        self.error = error
+        self.isOptinal = isOptinal
+    }
+
+}