Replace PurchaseStatusCell with ButtonCellViewModel

tobihagemann · tobihagemann · commit a24cc049298b · 2025-11-24T17:17:36.000+01:00
diff --git a/Cryptomator.xcodeproj/project.pbxproj b/Cryptomator.xcodeproj/project.pbxproj
@@ -440,8 +440,6 @@
 		74F5DC1F26DD036D00AFE989 /* StoreManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74F5DC1E26DD036D00AFE989 /* StoreManager.swift */; };
 		74FC576125ADED030003ED27 /* VaultCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74FC576025ADED030003ED27 /* VaultCell.swift */; };
 		988E23D6223540118B002237 /* ShareVaultCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 988E23D6223540118B002238 /* ShareVaultCoordinator.swift */; };
-		B32024D32ED0778800E82B07 /* PurchaseStatusCellViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B32024D22ED0778800E82B07 /* PurchaseStatusCellViewModel.swift */; };
-		B32024D42ED0778800E82B07 /* PurchaseStatusCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B32024D12ED0778800E82B07 /* PurchaseStatusCell.swift */; };
 		B330CB452CB5735300C21E03 /* UnauthorizedErrorViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B330CB442CB5735000C21E03 /* UnauthorizedErrorViewController.swift */; };
 		B34C53262D142B1000F30FE9 /* EnterSharePointURLViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B34C53252D142B0700F30FE9 /* EnterSharePointURLViewController.swift */; };
 		B34C53282D142B5800F30FE9 /* EnterSharePointURLViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B34C53272D142B5400F30FE9 /* EnterSharePointURLViewModel.swift */; };
@@ -1065,8 +1063,6 @@
 		74F5DC1E26DD036D00AFE989 /* StoreManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StoreManager.swift; sourceTree = "<group>"; };
 		74FC576025ADED030003ED27 /* VaultCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VaultCell.swift; sourceTree = "<group>"; };
 		988E23D6223540118B002238 /* ShareVaultCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareVaultCoordinator.swift; sourceTree = "<group>"; };
-		B32024D12ED0778800E82B07 /* PurchaseStatusCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PurchaseStatusCell.swift; sourceTree = "<group>"; };
-		B32024D22ED0778800E82B07 /* PurchaseStatusCellViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PurchaseStatusCellViewModel.swift; sourceTree = "<group>"; };
 		B330CB442CB5735000C21E03 /* UnauthorizedErrorViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnauthorizedErrorViewController.swift; sourceTree = "<group>"; };
 		B34C53252D142B0700F30FE9 /* EnterSharePointURLViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EnterSharePointURLViewController.swift; sourceTree = "<group>"; };
 		B34C53272D142B5400F30FE9 /* EnterSharePointURLViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EnterSharePointURLViewModel.swift; sourceTree = "<group>"; };
@@ -2050,8 +2046,6 @@
 				740D3683266A1B180058744D /* SettingsCoordinator.swift */,
 				740D367D266A18DF0058744D /* SettingsViewController.swift */,
 				740D3681266A19150058744D /* SettingsViewModel.swift */,
-				B32024D12ED0778800E82B07 /* PurchaseStatusCell.swift */,
-				B32024D22ED0778800E82B07 /* PurchaseStatusCellViewModel.swift */,
 				7408E6CB26779BC200D7FAEA /* About */,
 			);
 			path = Settings;
@@ -2811,8 +2805,6 @@
 				4AA22C1E261CA94700A17486 /* UsernameFieldCell.swift in Sources */,
 				B3C397FE2EB10FC0001280AC /* ShareVaultViewController.swift in Sources */,
 				988E23D6223540118B002237 /* ShareVaultCoordinator.swift in Sources */,
-				B32024D32ED0778800E82B07 /* PurchaseStatusCellViewModel.swift in Sources */,
-				B32024D42ED0778800E82B07 /* PurchaseStatusCell.swift in Sources */,
 				4A136132276770BB0077EB7F /* SnapshotVaultListViewModel.swift in Sources */,
 				4AED9A79286B4DF500352951 /* S3Authenticating.swift in Sources */,
 				747C35172762A3F500E4CA28 /* AttributedTextHeaderFooterViewModel.swift in Sources */,
diff --git a/Cryptomator/AddVault/OpenExistingVault/OpenExistingVaultChooseFolderViewController.swift b/Cryptomator/AddVault/OpenExistingVault/OpenExistingVaultChooseFolderViewController.swift
@@ -45,7 +45,7 @@ class OpenExistingVaultChooseFolderViewController: ChooseFolderViewController {
 
 	override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
 		if viewModel.foundMasterkey {
-			let cell = addVaultButtonViewModel.type.init()
+			let cell = addVaultButtonViewModel.type.init(style: addVaultButtonViewModel.cellStyle, reuseIdentifier: nil)
 			cell.configure(with: addVaultButtonViewModel)
 			return cell
 		} else {
diff --git a/Cryptomator/Common/Cells/BindableTableViewCellViewModel.swift b/Cryptomator/Common/Cells/BindableTableViewCellViewModel.swift
@@ -39,6 +39,10 @@ class TableViewCellViewModel: Hashable {
 		fatalError("not implemented")
 	}
 
+	var cellStyle: UITableViewCell.CellStyle {
+		return .default
+	}
+
 	private let identifier = UUID()
 
 	static func == (lhs: TableViewCellViewModel, rhs: TableViewCellViewModel) -> Bool {
diff --git a/Cryptomator/Common/Cells/ButtonCellViewModel.swift b/Cryptomator/Common/Cells/ButtonCellViewModel.swift
@@ -9,20 +9,16 @@
 import UIKit
 
 class ButtonCellViewModel<T>: BindableTableViewCellViewModel {
-	override var type: ConfigurableTableViewCell.Type { ButtonTableViewCell.self }
+	private let preferredCellStyle: UITableViewCell.CellStyle
+	override var cellStyle: UITableViewCell.CellStyle { preferredCellStyle }
 	let action: T
-	init(action: T, title: String, titleTextColor: UIColor? = .cryptomatorPrimary, detailTitle: String? = nil, isEnabled: Bool = true, selectionStyle: UITableViewCell.SelectionStyle = .default, accessoryType: UITableViewCell.AccessoryType = .none) {
+	init(action: T, title: String, titleTextColor: UIColor? = .cryptomatorPrimary, detailTitle: String? = nil, image: UIImage? = nil, isEnabled: Bool = true, selectionStyle: UITableViewCell.SelectionStyle = .default, accessoryType: UITableViewCell.AccessoryType = .none, cellStyle: UITableViewCell.CellStyle = .value1) {
 		self.action = action
-		super.init(title: title, titleTextColor: titleTextColor, detailTitle: detailTitle, isEnabled: isEnabled, selectionStyle: selectionStyle, accessoryType: accessoryType)
+		self.preferredCellStyle = cellStyle
+		super.init(title: title, titleTextColor: titleTextColor, detailTitle: detailTitle, image: image, isEnabled: isEnabled, selectionStyle: selectionStyle, accessoryType: accessoryType)
 	}
 
-	static func createDisclosureButton(action: T, title: String, detailTitle: String? = nil, accessoryType: UITableViewCell.AccessoryType = .disclosureIndicator, isEnabled: Bool = true) -> ButtonCellViewModel<T> {
-		return ButtonCellViewModel(action: action, title: title, titleTextColor: nil, detailTitle: detailTitle, isEnabled: isEnabled, accessoryType: accessoryType)
-	}
-}
-
-class ButtonTableViewCell: TableViewCell {
-	override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
-		super.init(style: .value1, reuseIdentifier: reuseIdentifier)
+	static func createDisclosureButton(action: T, title: String, detailTitle: String? = nil, image: UIImage? = nil, accessoryType: UITableViewCell.AccessoryType = .disclosureIndicator, isEnabled: Bool = true, cellStyle: UITableViewCell.CellStyle = .value1) -> ButtonCellViewModel<T> {
+		return ButtonCellViewModel(action: action, title: title, titleTextColor: nil, detailTitle: detailTitle, image: image, isEnabled: isEnabled, accessoryType: accessoryType, cellStyle: cellStyle)
 	}
 }
diff --git a/Cryptomator/Common/Cells/LoadingButtonCell.swift b/Cryptomator/Common/Cells/LoadingButtonCell.swift
@@ -8,7 +8,7 @@
 
 import UIKit
 
-class LoadingButtonCell: ButtonTableViewCell {
+class LoadingButtonCell: TableViewCell {
 	private lazy var loadingIndicator: UIActivityIndicatorView = {
 		let loadingIndicator = UIActivityIndicatorView(style: .medium)
 		loadingIndicator.hidesWhenStopped = true
diff --git a/Cryptomator/Common/Cells/SystemSymbolButtonCell.swift b/Cryptomator/Common/Cells/SystemSymbolButtonCell.swift
@@ -9,7 +9,7 @@
 import Foundation
 import UIKit
 
-class SystemSymbolButtonCell: ButtonTableViewCell {
+class SystemSymbolButtonCell: TableViewCell {
 	override func configure(with viewModel: TableViewCellViewModel) {
 		super.configure(with: viewModel)
 		guard let viewModel = viewModel as? SystemSymbolNameProviding else {
diff --git a/Cryptomator/Common/ChooseFolder/CreateNewFolderViewController.swift b/Cryptomator/Common/ChooseFolder/CreateNewFolderViewController.swift
@@ -35,7 +35,7 @@ class CreateNewFolderViewController: SingleSectionStaticUITableViewController {
 
 	override func configureDataSource() {
 		dataSource = BaseDiffableDataSource<SingleSection, TableViewCellViewModel>(viewModel: viewModel, tableView: tableView) { _, _, cellViewModel -> UITableViewCell? in
-			let cell = cellViewModel.type.init()
+			let cell = cellViewModel.type.init(style: cellViewModel.cellStyle, reuseIdentifier: nil)
 			cell.configure(with: cellViewModel)
 			if let textFieldCell = cell as? TextFieldCell {
 				let imageConfiguration = UIImage.SymbolConfiguration(font: UIFont.preferredFont(forTextStyle: .title2))
diff --git a/Cryptomator/Common/StaticUITableViewController.swift b/Cryptomator/Common/StaticUITableViewController.swift
@@ -27,7 +27,7 @@ class StaticUITableViewController<SectionType: Hashable>: BaseUITableViewControl
 
 	func configureDataSource() {
 		dataSource = BaseDiffableDataSource<SectionType, TableViewCellViewModel>(viewModel: viewModel, tableView: tableView) { _, _, cellViewModel -> UITableViewCell? in
-			let cell = cellViewModel.type.init()
+			let cell = cellViewModel.type.init(style: cellViewModel.cellStyle, reuseIdentifier: nil)
 			cell.configure(with: cellViewModel)
 			return cell
 		}
diff --git a/Cryptomator/Settings/PurchaseStatusCell.swift b/Cryptomator/Settings/PurchaseStatusCell.swift
diff --git a/Cryptomator/Settings/PurchaseStatusCellViewModel.swift b/Cryptomator/Settings/PurchaseStatusCellViewModel.swift
diff --git a/Cryptomator/Settings/SettingsViewController.swift b/Cryptomator/Settings/SettingsViewController.swift
@@ -134,11 +134,6 @@ class SettingsViewController: StaticUITableViewController<SettingsSection> {
 		case .none:
 			break
 		}
-
-		if dataSource?.itemIdentifier(for: indexPath) is PurchaseStatusCellViewModel {
-			tableView.deselectRow(at: indexPath, animated: true)
-			coordinator?.showUnlockFullVersion()
-		}
 	}
 
 	private func refreshRows() {
diff --git a/Cryptomator/Settings/SettingsViewModel.swift b/Cryptomator/Settings/SettingsViewModel.swift
@@ -45,10 +45,19 @@ class SettingsViewModel: TableViewModel<SettingsSection> {
 		return _sections
 	}
 
+	override func getFooterTitle(for section: Int) -> String? {
+		guard sections[section].id == .aboutSection, hasFullAccess else { return nil }
+		return LocalizedString.getValue("settings.fullVersion.footer")
+	}
+
 	var showDebugModeWarning: AnyPublisher<Void, Never> {
 		return showDebugModeWarningPublisher.eraseToAnyPublisher()
 	}
 
+	private var hasFullAccess: Bool {
+		cryptomatorSettings.hasRunningSubscription || cryptomatorSettings.fullVersionUnlocked
+	}
+
 	private var _sections: [Section<SettingsSection>] {
 		var sections: [Section<SettingsSection>] = []
 		if !hasFullAccess {
@@ -76,15 +85,6 @@ class SettingsViewModel: TableViewModel<SettingsSection> {
 		return sections
 	}
 
-	override func getFooterTitle(for section: Int) -> String? {
-		guard sections[section].id == .aboutSection, hasFullAccess else { return nil }
-		return LocalizedString.getValue("settings.fullVersion.footer")
-	}
-
-	private var hasFullAccess: Bool {
-		cryptomatorSettings.hasRunningSubscription || cryptomatorSettings.fullVersionUnlocked
-	}
-
 	private var aboutSectionElements: [TableViewCellViewModel] {
 		var elements: [TableViewCellViewModel] = [
 			ButtonCellViewModel.createDisclosureButton(action: SettingsButtonAction.showAbout, title: LocalizedString.getValue("settings.aboutCryptomator"))
@@ -95,28 +95,25 @@ class SettingsViewModel: TableViewModel<SettingsSection> {
 		return elements
 	}
 
-	private let cacheSizeCellViewModel = LoadingWithLabelCellViewModel(title: LocalizedString.getValue("settings.cacheSize"))
-	private let clearCacheButtonCellViewModel = ButtonCellViewModel<SettingsButtonAction>(action: .clearCache, title: LocalizedString.getValue("settings.clearCache"), isEnabled: false)
-
-	private var cryptomatorSettings: CryptomatorSettings
-
-	private var purchaseStatusCellViewModel: PurchaseStatusCellViewModel {
-		let subtitle: String
+	private var purchaseStatusCellViewModel: ButtonCellViewModel<SettingsButtonAction> {
+		let detailTitle: String
 		if let trialExpirationDate = cryptomatorSettings.trialExpirationDate, trialExpirationDate > Date() {
 			let dateFormatter = DateFormatter()
 			dateFormatter.dateStyle = .medium
 			dateFormatter.timeStyle = .none
-			subtitle = String(format: LocalizedString.getValue("settings.trial.expirationDate"), dateFormatter.string(from: trialExpirationDate))
+			detailTitle = String(format: LocalizedString.getValue("settings.trial.expirationDate"), dateFormatter.string(from: trialExpirationDate))
 		} else {
-			subtitle = LocalizedString.getValue("settings.freeTier.subtitle")
+			detailTitle = LocalizedString.getValue("settings.freeTier.subtitle")
 		}
-		return PurchaseStatusCellViewModel(
-			iconName: "checkmark.seal.fill",
-			title: LocalizedString.getValue("settings.unlockFullVersion"),
-			subtitle: subtitle
-		)
+		let image = UIImage(systemName: "checkmark.seal.fill", withConfiguration: UIImage.SymbolConfiguration(pointSize: 22))
+		return ButtonCellViewModel.createDisclosureButton(action: .showUnlockFullVersion, title: LocalizedString.getValue("settings.unlockFullVersion"), detailTitle: detailTitle, image: image, cellStyle: .subtitle)
 	}
 
+	private let cacheSizeCellViewModel = LoadingWithLabelCellViewModel(title: LocalizedString.getValue("settings.cacheSize"))
+	private let clearCacheButtonCellViewModel = ButtonCellViewModel<SettingsButtonAction>(action: .clearCache, title: LocalizedString.getValue("settings.clearCache"), isEnabled: false)
+
+	private var cryptomatorSettings: CryptomatorSettings
+
 	private lazy var debugModeViewModel: SwitchCellViewModel = {
 		let viewModel = SwitchCellViewModel(title: LocalizedString.getValue("settings.debugMode"), isOn: cryptomatorSettings.debugModeEnabled)
 		bindDebugModeViewModel(viewModel)
diff --git a/Cryptomator/VaultDetail/VaultDetailViewController.swift b/Cryptomator/VaultDetail/VaultDetailViewController.swift
@@ -106,7 +106,7 @@ class VaultDetailViewController: BaseUITableViewController {
 
 	override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
 		let cellViewModel = viewModel.cellViewModel(for: indexPath)
-		let cell = cellViewModel.type.init()
+		let cell = cellViewModel.type.init(style: cellViewModel.cellStyle, reuseIdentifier: nil)
 		cell.configure(with: cellViewModel)
 		return cell
 	}

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,10 @@ class TableViewCellViewModel: Hashable {`
`39`	`39`	`fatalError("not implemented")`
`40`	`40`	`}`
`41`	`41`
	`42`	`+ var cellStyle: UITableViewCell.CellStyle {`
	`43`	`+ return .default`
	`44`	`+ }`
	`45`	`+`
`42`	`46`	`private let identifier = UUID()`
`43`	`47`
`44`	`48`	`static func == (lhs: TableViewCellViewModel, rhs: TableViewCellViewModel) -> Bool {`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ class StaticUITableViewController<SectionType: Hashable>: BaseUITableViewControl`
`27`	`27`
`28`	`28`	`func configureDataSource() {`
`29`	`29`	`dataSource = BaseDiffableDataSource<SectionType, TableViewCellViewModel>(viewModel: viewModel, tableView: tableView) { _, _, cellViewModel -> UITableViewCell? in`
`30`		`- let cell = cellViewModel.type.init()`
	`30`	`+ let cell = cellViewModel.type.init(style: cellViewModel.cellStyle, reuseIdentifier: nil)`
`31`	`31`	`cell.configure(with: cellViewModel)`
`32`	`32`	`return cell`
`33`	`33`	`}`