Refactor settings to use unlockFullVersion terminology

Author: tobihagemann

Cryptomator/Purchase/Cells/TrialCell.swift

@@ -76,8 +76,7 @@ struct TrialCellViewModel: Hashable {
 	var expirationText: String {
 		let formatter = DateFormatter()
 		formatter.dateStyle = .short
-		let formattedExpirationDate = formatter.string(for: expirationDate) ?? "Invalid Date"
-		return String(format: LocalizedString.getValue("purchase.product.trial.expirationDate"), formattedExpirationDate)
+		return String(format: LocalizedString.getValue("purchase.product.trial.expirationDate"), formatter.string(from: expirationDate))
 	}
 
 	let expirationDate: Date

Cryptomator/Purchase/PurchaseAlert.swift

@@ -18,8 +18,7 @@ enum PurchaseAlert {
 	static func showForTrial(title: String, expirationDate: Date, on presentingViewController: UIViewController) -> Promise<Void> {
 		let formatter = DateFormatter()
 		formatter.dateStyle = .short
-		let formattedExpireDate = formatter.string(for: expirationDate) ?? "Invalid Date"
-		let message = String(format: LocalizedString.getValue("purchase.restorePurchase.validTrialFound.alert.message"), formattedExpireDate)
+		let message = String(format: LocalizedString.getValue("purchase.restorePurchase.validTrialFound.alert.message"), formatter.string(from: expirationDate))
 		return showAlert(title: title, message: message, on: presentingViewController)
 	}
 

Cryptomator/Settings/SettingsViewModel.swift

@@ -28,7 +28,7 @@ enum SettingsButtonAction: String {
 }
 
 enum SettingsSection: Int {
-	case purchaseStatusSection = 0
+	case unlockFullVersionSection = 0
 	case cloudServiceSection
 	case cacheSection
 	case aboutSection
@@ -46,22 +46,22 @@ class SettingsViewModel: TableViewModel<SettingsSection> {
 	}
 
 	override func getFooterTitle(for section: Int) -> String? {
-		guard sections[section].id == .aboutSection, hasFullAccess else { return nil }
-		return LocalizedString.getValue("settings.fullVersion.footer")
+		guard sections[section].id == .aboutSection, hasFullVersion else { return nil }
+		return LocalizedString.getValue("settings.aboutCryptomator.hasFullVersion.footer")
 	}
 
 	var showDebugModeWarning: AnyPublisher<Void, Never> {
 		return showDebugModeWarningPublisher.eraseToAnyPublisher()
 	}
 
-	private var hasFullAccess: Bool {
+	private var hasFullVersion: Bool {
 		cryptomatorSettings.hasRunningSubscription || cryptomatorSettings.fullVersionUnlocked
 	}
 
 	private var _sections: [Section<SettingsSection>] {
 		var sections: [Section<SettingsSection>] = []
-		if !hasFullAccess {
-			sections.append(Section(id: .purchaseStatusSection, elements: [purchaseStatusCellViewModel]))
+		if !hasFullVersion {
+			sections.append(Section(id: .unlockFullVersionSection, elements: [unlockFullVersionCellViewModel]))
 		}
 		sections.append(contentsOf: [
 			Section(id: .cloudServiceSection, elements: [
@@ -95,23 +95,21 @@ class SettingsViewModel: TableViewModel<SettingsSection> {
 		return elements
 	}
 
-	private var purchaseStatusCellViewModel: ButtonCellViewModel<SettingsButtonAction> {
+	private var unlockFullVersionCellViewModel: ButtonCellViewModel<SettingsButtonAction> {
 		let detailTitle: String
 		if let trialExpirationDate = cryptomatorSettings.trialExpirationDate, trialExpirationDate > Date() {
-			let dateFormatter = DateFormatter()
-			dateFormatter.dateStyle = .medium
-			dateFormatter.timeStyle = .none
-			detailTitle = String(format: LocalizedString.getValue("settings.trial.expirationDate"), dateFormatter.string(from: trialExpirationDate))
+			let formatter = DateFormatter()
+			formatter.dateStyle = .short
+			detailTitle = String(format: LocalizedString.getValue("settings.unlockFullVersion.trialExpirationDate"), formatter.string(from: trialExpirationDate))
 		} else {
-			detailTitle = LocalizedString.getValue("settings.freeTier.subtitle")
+			detailTitle = LocalizedString.getValue("settings.unlockFullVersion.detail")
 		}
 		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 = {

SharedResources/en.lproj/Localizable.strings

@@ -202,6 +202,7 @@
 "settings.title" = "Settings";
 "settings.aboutCryptomator" = "About Cryptomator";
 "settings.aboutCryptomator.title" = "Version %@ (%@)";
+"settings.aboutCryptomator.hasFullVersion.footer" = "You have unlocked the full version and gained write access to your vaults.";
 "settings.cacheSize" = "Cache Size";
 "settings.clearCache" = "Clear Cache";
 "settings.cloudServices" = "Cloud Services";
@@ -213,9 +214,8 @@
 "settings.sendLogFile" = "Send Log File";
 "settings.shortcutsGuide" = "Shortcuts Guide";
 "settings.unlockFullVersion" = "Unlock Full Version";
-"settings.fullVersion.footer" = "You have unlocked the full version and gained write access to your vaults.";
-"settings.trial.expirationDate" = "Trial Expiration Date: %@";
-"settings.freeTier.subtitle" = "Gain write access to your vaults.";
+"settings.unlockFullVersion.detail" = "Gain write access to your vaults.";
+"settings.unlockFullVersion.trialExpirationDate" = "Trial Expiration Date: %@";
 
 "sharePoint.enterURL.title" = "Enter SharePoint URL";
 "sharePoint.enterURL.placeholder" = "SharePoint Site URL";