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

Jump to bottom

Rename PaymentMethodsViewModel to PaymentMethodSettingsViewModel #1998

Merged
merged 1 commit into from
Mar 26, 2024
+19 −19
Merged

Rename PaymentMethodsViewModel to PaymentMethodSettingsViewModel #1998

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Kickstarter-iOS/Features/PaymentMethods/Controller/PaymentMethodSettingsViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ protocol PaymentMethodSettingsViewControllerDelegate: AnyObject {
internal final class PaymentMethodSettingsViewController: UIViewController,
MessageBannerViewControllerPresenting {
private let dataSource = PaymentMethodsDataSource()
private let viewModel: PaymentMethodsViewModelType = PaymentMethodsViewModel()
private let viewModel: PaymentMethodsViewModelType = PaymentMethodSettingsViewModel()
private var paymentSheetFlowController: PaymentSheet.FlowController?
private weak var cancellationDelegate: PaymentMethodSettingsViewControllerDelegate?
@IBOutlet private var tableView: UITableView!
Expand Down
16 changes: 8 additions & 8 deletions Kickstarter.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@
1996AA1F2A5F1BC400AE2ED0 /* StripePaymentSheet in Frameworks */ = {isa = PBXBuildFile; productRef = 1996AA1E2A5F1BC400AE2ED0 /* StripePaymentSheet */; };
1996AA312A5F39CC00AE2ED0 /* PledgePaymentMethodsViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6534D3D22E789B900E9D279 /* PledgePaymentMethodsViewModelTests.swift */; };
1996AA322A5F3A3200AE2ED0 /* Stripe+PaymentMethod.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1923770928DA2AE300F68635 /* Stripe+PaymentMethod.swift */; };
1996AA332A5F477B00AE2ED0 /* PaymentMethodsViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D66FB347218212B700A27BCC /* PaymentMethodsViewModelTests.swift */; };
1996AA332A5F477B00AE2ED0 /* PaymentMethodSettingsViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D66FB347218212B700A27BCC /* PaymentMethodSettingsViewModelTests.swift */; };
1996AA352A5F4ADB00AE2ED0 /* PaymentSheetPaymentOptionsDisplayData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1996AA342A5F4ADB00AE2ED0 /* PaymentSheetPaymentOptionsDisplayData.swift */; };
1998BCB028F60EC300D04077 /* ReactiveExtensions-TestHelpers in Frameworks */ = {isa = PBXBuildFile; productRef = 1998BCAF28F60EC300D04077 /* ReactiveExtensions-TestHelpers */; };
1998BCB228F60ED400D04077 /* ReactiveExtensions in Frameworks */ = {isa = PBXBuildFile; productRef = 1998BCB128F60ED400D04077 /* ReactiveExtensions */; };
Expand Down Expand Up @@ -1353,7 +1353,7 @@
D63BBCF9217F666B007E01F0 /* PaymentMethodsDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = D63BBCF8217F666B007E01F0 /* PaymentMethodsDataSource.swift */; };
D63BBD31217F7212007E01F0 /* UserCreditCards.swift in Sources */ = {isa = PBXBuildFile; fileRef = D63BBD30217F7212007E01F0 /* UserCreditCards.swift */; };
D63BBD33217F9CDE007E01F0 /* GraphCreditCardTemplate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D63BBD32217F9CDE007E01F0 /* GraphCreditCardTemplate.swift */; };
D63BBD35217FAB85007E01F0 /* PaymentMethodsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D63BBD34217FAB85007E01F0 /* PaymentMethodsViewModel.swift */; };
D63BBD35217FAB85007E01F0 /* PaymentMethodSettingsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D63BBD34217FAB85007E01F0 /* PaymentMethodSettingsViewModel.swift */; };
D63BBD37217FC224007E01F0 /* CreditCardCellViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D63BBD36217FC224007E01F0 /* CreditCardCellViewModel.swift */; };
D63BBD392180BE5D007E01F0 /* PaymentMethodsFooterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D63BBD382180BE5D007E01F0 /* PaymentMethodsFooterView.swift */; };
D63BBD3B2180BEA4007E01F0 /* PaymentMethodsFooterView.xib in Resources */ = {isa = PBXBuildFile; fileRef = D63BBD3A2180BEA4007E01F0 /* PaymentMethodsFooterView.xib */; };
Expand Down Expand Up @@ -2968,7 +2968,7 @@
D63BBCF8217F666B007E01F0 /* PaymentMethodsDataSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaymentMethodsDataSource.swift; sourceTree = "<group>"; };
D63BBD30217F7212007E01F0 /* UserCreditCards.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserCreditCards.swift; sourceTree = "<group>"; };
D63BBD32217F9CDE007E01F0 /* GraphCreditCardTemplate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GraphCreditCardTemplate.swift; sourceTree = "<group>"; };
D63BBD34217FAB85007E01F0 /* PaymentMethodsViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaymentMethodsViewModel.swift; sourceTree = "<group>"; };
D63BBD34217FAB85007E01F0 /* PaymentMethodSettingsViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaymentMethodSettingsViewModel.swift; sourceTree = "<group>"; };
D63BBD36217FC224007E01F0 /* CreditCardCellViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreditCardCellViewModel.swift; sourceTree = "<group>"; };
D63BBD382180BE5D007E01F0 /* PaymentMethodsFooterView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaymentMethodsFooterView.swift; sourceTree = "<group>"; };
D63BBD3A2180BEA4007E01F0 /* PaymentMethodsFooterView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PaymentMethodsFooterView.xib; sourceTree = "<group>"; };
Expand All @@ -2995,7 +2995,7 @@
D668509E236B38E000EE9AC2 /* ProjectPamphletCreatorHeaderCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProjectPamphletCreatorHeaderCell.swift; sourceTree = "<group>"; };
D66850A0236CA44C00EE9AC2 /* ProjectPamphletCreatorHeaderCellViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProjectPamphletCreatorHeaderCellViewModel.swift; sourceTree = "<group>"; };
D66850A223707CCC00EE9AC2 /* ProjectPamphletCreatorHeaderCellViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProjectPamphletCreatorHeaderCellViewModelTests.swift; sourceTree = "<group>"; };
D66FB347218212B700A27BCC /* PaymentMethodsViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaymentMethodsViewModelTests.swift; sourceTree = "<group>"; };
D66FB347218212B700A27BCC /* PaymentMethodSettingsViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaymentMethodSettingsViewModelTests.swift; sourceTree = "<group>"; };
D6765B4C211091AB00AE3DB4 /* SettingsNewslettersDataSourceTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsNewslettersDataSourceTests.swift; sourceTree = "<group>"; };
D67B6C9C221F458700B63A6B /* Config+Encode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Config+Encode.swift"; sourceTree = "<group>"; };
D67B6CD5221F468100B63A6B /* Location+Encode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Location+Encode.swift"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -6494,8 +6494,8 @@
A7ED1F6C1E831C5C00BFFA01 /* MessageThreadsViewModelTests.swift */,
D7A37D781E367E5A00EA066D /* MostPopularSearchProjectCellViewModel.swift */,
D7A86A3A1F324EB300C7DA53 /* MostPopularSearchProjectCellViewModelTests.swift */,
D63BBD34217FAB85007E01F0 /* PaymentMethodsViewModel.swift */,
D66FB347218212B700A27BCC /* PaymentMethodsViewModelTests.swift */,
D63BBD34217FAB85007E01F0 /* PaymentMethodSettingsViewModel.swift */,
D66FB347218212B700A27BCC /* PaymentMethodSettingsViewModelTests.swift */,
777C60A72420154100820C59 /* PersonalizationCellViewModel.swift */,
771F38892422C961009036A0 /* PersonalizationCellViewModelTests.swift */,
77D19FF62408148A0058FC8E /* PillCellViewModel.swift */,
Expand Down Expand Up @@ -7886,7 +7886,7 @@
3777F2F72343C7900030BEF5 /* ManageViewPledgeRewardReceivedViewModel.swift in Sources */,
0176E13B1C9742FD009CA092 /* UIBarButtonItem.swift in Sources */,
395A3BC92BA8D43F0091A379 /* PostCampaignCheckoutViewModel.swift in Sources */,
D63BBD35217FAB85007E01F0 /* PaymentMethodsViewModel.swift in Sources */,
D63BBD35217FAB85007E01F0 /* PaymentMethodSettingsViewModel.swift in Sources */,
8001D4C91D415692009E6667 /* UpdateDraftStyles.swift in Sources */,
063D2D0C2846779100CEDE33 /* PledgeLocalPickupViewModel.swift in Sources */,
8A6C979024BFCDED00C4FA71 /* RewardAddOnSelectionContinueCTAViewModel.swift in Sources */,
Expand Down Expand Up @@ -8173,7 +8173,7 @@
D6600790241A7C0000AC1EDB /* CuratedProjectsViewModelTests.swift in Sources */,
A7ED1F4A1E831BA200BFFA01 /* MockBundle.swift in Sources */,
D04AACA5218BB72100CF713E /* BetaToolsViewModelTests.swift in Sources */,
1996AA332A5F477B00AE2ED0 /* PaymentMethodsViewModelTests.swift in Sources */,
1996AA332A5F477B00AE2ED0 /* PaymentMethodSettingsViewModelTests.swift in Sources */,
473DE018273C74BA0033331D /* ProjectRisksCellViewModelTests.swift in Sources */,
84F3C492251C87B400AEF24D /* UpdateActivityItemProviderTests.swift in Sources */,
D64850551FD879AB00B6AB91 /* ProjectActivityItemProviderTests.swift in Sources */,
Expand Down
16 changes: 8 additions & 8 deletions .../ViewModels/PaymentMethodsViewModel.swift → ...dels/PaymentMethodSettingsViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import Prelude
import ReactiveSwift
import StripePaymentSheet

public protocol PaymentMethodsViewModelInputs {
public protocol PaymentMethodSettingsViewModelInputs {
func failedToAddNewCard()
func didDelete(_ creditCard: UserCreditCards.CreditCard, visibleCellCount: Int)
func editButtonTapped()
Expand All @@ -15,7 +15,7 @@ public protocol PaymentMethodsViewModelInputs {
func viewDidLoad()
}

public protocol PaymentMethodsViewModelOutputs {
public protocol PaymentMethodSettingsViewModelOutputs {
var cancelAddNewCardLoadingState: Signal<Void, Never> { get }
var editButtonIsEnabled: Signal<Bool, Never> { get }
var editButtonTitle: Signal<String, Never> { get }
Expand All @@ -30,12 +30,12 @@ public protocol PaymentMethodsViewModelOutputs {
}

public protocol PaymentMethodsViewModelType {
var inputs: PaymentMethodsViewModelInputs { get }
var outputs: PaymentMethodsViewModelOutputs { get }
var inputs: PaymentMethodSettingsViewModelInputs { get }
var outputs: PaymentMethodSettingsViewModelOutputs { get }
}

public final class PaymentMethodsViewModel: PaymentMethodsViewModelType,
PaymentMethodsViewModelInputs, PaymentMethodsViewModelOutputs {
public final class PaymentMethodSettingsViewModel: PaymentMethodsViewModelType,
PaymentMethodSettingsViewModelInputs, PaymentMethodSettingsViewModelOutputs {
public init() {
self.reloadData = self.viewDidLoadProperty.signal

Expand Down Expand Up @@ -273,6 +273,6 @@ public final class PaymentMethodsViewModel: PaymentMethodsViewModelType,
public let showAlert: Signal<String, Never>
public let tableViewIsEditing: Signal<Bool, Never>

public var inputs: PaymentMethodsViewModelInputs { return self }
public var outputs: PaymentMethodsViewModelOutputs { return self }
public var inputs: PaymentMethodSettingsViewModelInputs { return self }
public var outputs: PaymentMethodSettingsViewModelOutputs { return self }
}
4 changes: 2 additions & 2 deletions ...Models/PaymentMethodsViewModelTests.swift → ...PaymentMethodSettingsViewModelTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import ReactiveSwift
@testable import Stripe
import XCTest

internal final class PaymentMethodsViewModelTests: TestCase {
private let vm = PaymentMethodsViewModel()
internal final class PaymentMethodSettingsViewModelTests: TestCase {
private let vm = PaymentMethodSettingsViewModel()
private let userTemplate = GraphUser.template |> \.storedCards .~ UserCreditCards.template
private let cancelLoadingState = TestObserver<Void, Never>()
private let editButtonIsEnabled = TestObserver<Bool, Never>()
Expand Down