Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup Demo ViewController file structure #1110

Merged
merged 7 commits into from
Oct 10, 2023
Merged

Cleanup Demo ViewController file structure #1110

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4bafd38
Remove nested directories and rename ViewController names for demo ap…
scannillo Oct 5, 2023
ce30780
Delete duplicate files
scannillo Oct 5, 2023
2e24a0c
Merge branch 'main' into cleanup-demo-files
scannillo Oct 9, 2023
6b7d906
Merge branch 'main' into cleanup-demo-files
scannillo Oct 9, 2023
6b368f9
Delete Braintree.xcworkspace/xcshareddata/swiftpm/Package.resolved
scannillo Oct 9, 2023
c1e8eab
Merge branch 'main' into cleanup-demo-files
scannillo Oct 9, 2023
bf75ba3
Delete Braintree.xcworkspace/xcshareddata/swiftpm/Package.resolved
scannillo Oct 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions Demo/Application/Base/Settings/Settings.bundle/Root.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,16 @@
</array>
<key>Values</key>
<array>
<string>BraintreeDemoPayPalNativeCheckoutViewController</string>
<string>BraintreeDemoPayPalWebCheckoutViewController</string>
<string>BraintreeDemoCardTokenizationViewController</string>
<string>BraintreeDemoVenmoViewController</string>
<string>BraintreeDemoApplePayPassKitViewController</string>
<string>BraintreeDemoThreeDSecurePaymentFlowViewController</string>
<string>BraintreeDemoBTDataCollectorViewController</string>
<string>BraintreeDemoIdealViewController</string>
<string>BraintreeDemoAmexViewController</string>
<string>BraintreeDemoSEPADirectDebitViewController</string>
<string>PayPalNativeCheckoutViewController</string>
<string>PayPalWebCheckoutViewController</string>
<string>CardTokenizationViewController</string>
<string>VenmoViewController</string>
<string>ApplePayViewController</string>
<string>ThreeDSecureViewController</string>
<string>DataCollectorViewController</string>
<string>IdealViewController</string>
<string>AmexViewController</string>
<string>SEPADirectDebitViewController</string>
</array>
</dict>
<dict>
Expand Down
2 changes: 1 addition & 1 deletion ...mex/BraintreeDemoAmexViewController.swift → ...ication/Features/AmexViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Foundation
import BraintreeAmericanExpress
import BraintreeCard

class BraintreeDemoAmexViewController: BraintreeDemoPaymentButtonBaseViewController {
class AmexViewController: BraintreeDemoPaymentButtonBaseViewController {

lazy var amexClient = BTAmericanExpressClient(apiClient: apiClient)
lazy var cardClient = BTCardClient(apiClient: apiClient)
Expand Down
4 changes: 2 additions & 2 deletions ...BraintreeDemoApplePayViewController.swift → ...ion/Features/ApplePayViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Foundation
import BraintreeApplePay
import PassKit

class BraintreeDemoApplePayPassKitViewController: BraintreeDemoPaymentButtonBaseViewController {
class ApplePayViewController: BraintreeDemoPaymentButtonBaseViewController {

lazy var applePayClient = BTApplePayClient(apiClient: apiClient)

Expand Down Expand Up @@ -75,7 +75,7 @@ class BraintreeDemoApplePayPassKitViewController: BraintreeDemoPaymentButtonBase

// MARK: - PKPaymentAuthorizationViewControllerDelegate Conformance

extension BraintreeDemoApplePayPassKitViewController: PKPaymentAuthorizationViewControllerDelegate {
extension ApplePayViewController: PKPaymentAuthorizationViewControllerDelegate {

func paymentAuthorizationViewControllerDidFinish(_ controller: PKPaymentAuthorizationViewController) {
controller.dismiss(animated: true)
Expand Down
2 changes: 1 addition & 1 deletion ...eDemoCardTokenizationViewController.swift → ...ures/CardTokenizationViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import UIKit
import BraintreeCard

class BraintreeDemoCardTokenizationViewController: BraintreeDemoPaymentButtonBaseViewController {
class CardTokenizationViewController: BraintreeDemoPaymentButtonBaseViewController {

private let cardFormView = BTCardFormView()
private let autofillButton = UIButton(type: .system)
Expand Down
2 changes: 1 addition & 1 deletion ...eeDemoBTDataCollectorViewController.swift → ...eatures/DataCollectorViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import UIKit
import BraintreeDataCollector
import BraintreeCore

class BraintreeDemoBTDataCollectorViewController: BraintreeDemoPaymentButtonBaseViewController {
class DataCollectorViewController: BraintreeDemoPaymentButtonBaseViewController {

var dataLabel = UILabel()

Expand Down
0 ...ation/Features/Views/BTCardFormView.swift → ...ion/Features/Helpers/BTCardFormView.swift
View file
Open in desktop
File renamed without changes.
0 ...t Debit/BTSEPADirectDebitTestHelper.swift → ...Helpers/BTSEPADirectDebitTestHelper.swift
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...al/BraintreeDemoIdealViewController.swift → ...cation/Features/IdealViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Foundation
import BraintreeLocalPayment
import BraintreeCore

class BraintreeDemoIdealViewController: BraintreeDemoPaymentButtonBaseViewController {
class IdealViewController: BraintreeDemoPaymentButtonBaseViewController {

var localPaymentClient: BTLocalPaymentClient!
var paymentIDLabel: UILabel = UILabel()
Expand Down Expand Up @@ -95,7 +95,7 @@ class BraintreeDemoIdealViewController: BraintreeDemoPaymentButtonBaseViewContro

// MARK: - BTLocalPaymentRequestDelegate Conformance

extension BraintreeDemoIdealViewController: BTLocalPaymentRequestDelegate {
extension IdealViewController: BTLocalPaymentRequestDelegate {

func localPaymentStarted(
_ request: BraintreeLocalPayment.BTLocalPaymentRequest,
Expand Down
2 changes: 1 addition & 1 deletion ...oPayPalNativeCheckoutViewController.swift → .../PayPalNativeCheckoutViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Foundation
import UIKit
import BraintreePayPalNativeCheckout

class BraintreeDemoPayPalNativeCheckoutViewController: BraintreeDemoPaymentButtonBaseViewController {
class PayPalNativeCheckoutViewController: BraintreeDemoPaymentButtonBaseViewController {
lazy var payPalNativeCheckoutClient = BTPayPalNativeCheckoutClient(apiClient: apiClient)

func checkoutPaymentButton(title: String, action: Selector) -> UIButton {
Expand Down
2 changes: 1 addition & 1 deletion ...DemoPayPalWebCheckoutViewController.swift → ...res/PayPalWebCheckoutViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Foundation
import UIKit
import BraintreePayPal

class BraintreeDemoPayPalWebCheckoutViewController: BraintreeDemoPaymentButtonBaseViewController {
class PayPalWebCheckoutViewController: BraintreeDemoPaymentButtonBaseViewController {

lazy var payPalClient = BTPayPalClient(apiClient: apiClient)

Expand Down
2 changes: 1 addition & 1 deletion ...eeDemoSEPADirectDebitViewController.swift → ...tures/SEPADirectDebitViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import UIKit
import AuthenticationServices
import BraintreeSEPADirectDebit

class BraintreeDemoSEPADirectDebitViewController: BraintreeDemoBaseViewController {
class SEPADirectDebitViewController: BraintreeDemoBaseViewController {
private let sepaDirectDebitClient: BTSEPADirectDebitClient
private let sepaDirectDebitButton = UIButton(type: .system)

Expand Down
4 changes: 2 additions & 2 deletions ...reeDSecurePaymentFlowViewController.swift → ...Features/ThreeDSecureViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Foundation
import BraintreeCard
import BraintreeThreeDSecure

class BraintreeDemoThreeDSecurePaymentFlowViewController: BraintreeDemoPaymentButtonBaseViewController {
class ThreeDSecureViewController: BraintreeDemoPaymentButtonBaseViewController {

private let cardFormView = BTCardFormView()
private let autofillButton = UIButton(type: .system)
Expand Down Expand Up @@ -222,7 +222,7 @@ class BraintreeDemoThreeDSecurePaymentFlowViewController: BraintreeDemoPaymentBu

// MARK: - BTThreeDSecureRequestDelegate Conformance

extension BraintreeDemoThreeDSecurePaymentFlowViewController: BTThreeDSecureRequestDelegate {
extension ThreeDSecureViewController: BTThreeDSecureRequestDelegate {

func onLookupComplete(
_ request: BTThreeDSecureRequest,
Expand Down
2 changes: 1 addition & 1 deletion ...on/BraintreeDemoVenmoViewController.swift → ...cation/Features/VenmoViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import UIKit
import BraintreeVenmo

class BraintreeDemoVenmoViewController: BraintreeDemoPaymentButtonBaseViewController {
class VenmoViewController: BraintreeDemoPaymentButtonBaseViewController {

var venmoClient: BTVenmoClient!

Expand Down
Loading
Loading