Merge branch 'release/2.1.0'

Author: tobihagemann

.swiftformat

@@ -1,4 +1,4 @@
---minversion 0.49.0
+--minversion 0.49.2
 
 # format options
 
@@ -15,4 +15,4 @@
 # rules
 
 --enable isEmpty
---disable redundantReturn,trailingClosures
+--disable redundantReturn,trailingClosures,wrapMultilineStatementBraces

Cryptomator.xcodeproj/project.pbxproj

@@ -24,8 +24,8 @@
         "repositoryURL": "https://github.com/cryptomator/cloud-access-swift.git",
         "state": {
           "branch": null,
-          "revision": "a033fc732b5c7baa2dbc6134591e6fd5345c620e",
-          "version": "1.1.2"
+          "revision": "49555f1a9348003513f933b7a47845b658630b47",
+          "version": "1.1.3"
         }
       },
       {
@@ -42,8 +42,8 @@
         "repositoryURL": "https://github.com/cryptomator/cryptolib-swift.git",
         "state": {
           "branch": null,
-          "revision": "9bf1bece50de1a6f45410cf541ef346cc16b9fcc",
-          "version": "1.0.0"
+          "revision": "ac2d182a54cc3dc9e3025c906d045c4a8e76ccc4",
+          "version": "1.0.1"
         }
       },
       {

Cryptomator.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -44,6 +44,10 @@ class ChooseCloudViewController: BaseUITableViewController {
 		return cell
 	}
 
+	override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
+		return viewModel.headerTitle
+	}
+
 	// MARK: - UITableViewDelegate
 
 	override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {

Cryptomator/AddVault/ChooseCloudViewController.swift

@@ -11,5 +11,4 @@ import CryptomatorCommonCore
 struct ChooseCloudViewModel {
 	let clouds: [CloudProviderType]
 	let headerTitle: String
-	let headerUppercased = false
 }

Cryptomator/AddVault/ChooseCloudViewModel.swift

@@ -33,21 +33,15 @@ class SetVaultNameViewModel: SingleSectionTableViewModel, SetVaultNameViewModelP
 		return vaultNameCellViewModel.input.value.trimmingCharacters(in: .whitespacesAndNewlines)
 	}
 
-	// disallowed characters \ / : * ? " < > |
-	// cannot end with .
-	// swiftlint:disable:next force_try
-	private let regex = try! NSRegularExpression(pattern: "[\\\\/:\\*\\?\"<>\\|]|\\.$")
-
 	private lazy var subscribers = Set<AnyCancellable>()
 
+	// disallowed characters \ / : * ? " < > |
+	// cannot end with .
 	func getValidatedVaultName() throws -> String {
 		guard !trimmedVaultName.isEmpty else {
 			throw SetVaultNameViewModelError.emptyVaultName
 		}
-		let range = NSRange(location: 0, length: trimmedVaultName.utf16.count)
-		guard regex.firstMatch(in: trimmedVaultName, options: [], range: range) == nil else {
-			throw SetVaultNameViewModelError.invalidInput
-		}
+		try ItemNameValidator.validateName(trimmedVaultName)
 		return trimmedVaultName
 	}
 
@@ -61,14 +55,11 @@ class SetVaultNameViewModel: SingleSectionTableViewModel, SetVaultNameViewModelP
 
 enum SetVaultNameViewModelError: LocalizedError {
 	case emptyVaultName
-	case invalidInput
 
 	var errorDescription: String? {
 		switch self {
 		case .emptyVaultName:
 			return LocalizedString.getValue("addVault.createNewVault.setVaultName.error.emptyVaultName")
-		case .invalidInput:
-			return LocalizedString.getValue("addVault.createNewVault.setVaultName.error.invalidInput")
 		}
 	}
 }

Cryptomator/AddVault/CreateNewVault/SetVaultNameViewModel.swift

@@ -68,17 +68,16 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 		SKPaymentQueue.default().add(StoreObserver.shared)
 
 		// Create window
-		let navigationController = BaseNavigationController()
-		coordinator = MainCoordinator(navigationController: navigationController)
+		coordinator = MainCoordinator()
 		#if SNAPSHOTS
-		coordinator = SnapshotCoordinator(navigationController: navigationController)
+		coordinator = SnapshotCoordinator()
 		UIView.setAnimationsEnabled(false)
 		#endif
 		coordinator?.start()
 		StoreObserver.shared.fallbackDelegate = coordinator
 		window = UIWindow(frame: UIScreen.main.bounds)
 		window?.tintColor = UIColor(named: "primary")
-		window?.rootViewController = navigationController
+		window?.rootViewController = coordinator?.rootViewController
 		window?.makeKeyAndVisible()
 		return true
 	}

Cryptomator/AppDelegate.swift

@@ -13,6 +13,21 @@ class BaseNavigationController: UINavigationController {
 		return .lightContent
 	}
 
+	override var modalPresentationStyle: UIModalPresentationStyle {
+		get {
+			if useDefaultModalPresentationStyle {
+				return .formSheet
+			}
+			return super.modalPresentationStyle
+		}
+		set {
+			useDefaultModalPresentationStyle = false
+			super.modalPresentationStyle = newValue
+		}
+	}
+
+	private var useDefaultModalPresentationStyle = true
+
 	override func viewDidLoad() {
 		super.viewDidLoad()
 		let appearance = UINavigationBarAppearance()

Cryptomator/Common/BaseNavigationController.swift

@@ -16,3 +16,15 @@ class Bindable<Value> {
 		self.value = value
 	}
 }
+
+extension Bindable: Equatable where Value: Equatable {
+	static func == (lhs: Bindable<Value>, rhs: Bindable<Value>) -> Bool {
+		return lhs.value == rhs.value
+	}
+}
+
+extension Bindable: Hashable where Value: Hashable {
+	func hash(into hasher: inout Hasher) {
+		hasher.combine(value)
+	}
+}

Cryptomator/Common/Bindable.swift

@@ -0,0 +1,33 @@
+//
+//  CheckMarkCell.swift
+//  Cryptomator
+//
+//  Created by Philipp Schmid on 14.01.22.
+//  Copyright © 2022 Skymatic GmbH. All rights reserved.
+//
+
+import Combine
+import UIKit
+
+class CheckMarkCell: UITableViewCell, ConfigurableTableViewCell {
+	private var subscriber: AnyCancellable?
+
+	func configure(with viewModel: TableViewCellViewModel) {
+		guard let viewModel = viewModel as? CheckMarkCellViewModelType else {
+			return
+		}
+		textLabel?.text = viewModel.title
+		subscriber = viewModel.isSelected.$value.receive(on: DispatchQueue.main).sink { [weak self] isSelected in
+			if isSelected {
+				self?.accessoryType = .checkmark
+			} else {
+				self?.accessoryType = .none
+			}
+		}
+	}
+}
+
+protocol CheckMarkCellViewModelType {
+	var title: String? { get }
+	var isSelected: Bindable<Bool> { get }
+}

Cryptomator/Common/Cells/CheckMarkCell.swift

@@ -65,14 +65,20 @@ class BindableAttributedTextHeaderFooterView: AttributedTextHeaderFooterView {
 		guard let viewModel = viewModel as? BindableAttributedTextHeaderFooterViewModel else {
 			return
 		}
+		textView.attributedText = viewModel.attributedText.value
 		viewModel.attributedText.$value.receive(on: DispatchQueue.main).sink(receiveValue: { [weak self] attributedText in
-			UIView.setAnimationsEnabled(false)
-			self?.tableView?.performBatchUpdates({
-				self?.textView.attributedText = attributedText
-				self?.textView.font = self?.textLabel?.font
-				self?.textView.textColor = self?.textLabel?.textColor
-			})
-			UIView.setAnimationsEnabled(true)
+			self?.textView.attributedText = attributedText
+			self?.textView.font = self?.textLabel?.font
+			self?.textView.textColor = self?.textLabel?.textColor
+			self?.setNeedsLayout()
+			guard self?.tableView?.window != nil else {
+				return
+			}
+			UIView.performWithoutAnimation {
+				self?.tableView?.performBatchUpdates({
+					// performBatchUpdates call is needed to actually trigger an tableView (layout) update
+				})
+			}
 		}).store(in: &subscriber)
 	}
 }

Cryptomator/Common/HeaderFooter/AttributedTextHeaderFooterView.swift

@@ -16,12 +16,18 @@ class BaseHeaderFooterView: UITableViewHeaderFooterView, HeaderFooterViewModelCo
 
 	func configure(with viewModel: HeaderFooterViewModel) {
 		textLabel?.numberOfLines = 0
-		subscriber = viewModel.title.$value.sink(receiveValue: { [weak self] text in
-			UIView.setAnimationsEnabled(false)
-			self?.tableView?.performBatchUpdates({
-				self?.textLabel?.text = text
-			})
-			UIView.setAnimationsEnabled(true)
+		textLabel?.text = viewModel.title.value
+		subscriber = viewModel.title.$value.receive(on: DispatchQueue.main).sink(receiveValue: { [weak self] text in
+			self?.textLabel?.text = text
+			self?.setNeedsLayout()
+			guard self?.tableView?.window != nil else {
+				return
+			}
+			UIView.performWithoutAnimation {
+				self?.tableView?.performBatchUpdates({
+					// performBatchUpdates call is needed to actually trigger an tableView (layout) update
+				})
+			}
 		})
 	}
 }

Cryptomator/Common/HeaderFooter/BaseHeaderFooterView.swift

@@ -22,6 +22,8 @@ class ListViewController<T: TableViewCellViewModel>: BaseUITableViewController {
 	var dataSource: EditableDataSource<Section, T>?
 	private let viewModel: ListViewModel
 	private lazy var emptyListMessage = EmptyListMessage(message: viewModel.emptyListMessage)
+	private var firstTimeLoading = true
+	private var lastSelectedCellViewModel: T?
 
 	init(viewModel: ListViewModel) {
 		self.viewModel = viewModel
@@ -60,23 +62,22 @@ class ListViewController<T: TableViewCellViewModel>: BaseUITableViewController {
 		snapshot.appendItems(cells.compactMap({ $0 as? T }))
 		dataSource?.apply(snapshot, animatingDifferences: false) { [weak self] in
 			if snapshot.numberOfItems == 0 {
-				self?.header.isHidden = true
-				self?.tableView.backgroundView = self?.emptyListMessage
-				// Prevents `EmptyListMessage` from being placed under the navigation bar
-				self?.tableView.contentInsetAdjustmentBehavior = .never
-				self?.tableView.separatorStyle = .none
+				self?.hideHeaderAndShowEmptyListMessage()
 			} else {
 				self?.header.isHidden = false
 				self?.tableView.backgroundView = nil
 				self?.tableView.separatorStyle = .singleLine
 				self?.tableView.contentInsetAdjustmentBehavior = .automatic
+				self?.restoreSelection()
 			}
+			self?.firstTimeLoading = false
 		}
 	}
 
 	override func setEditing(_ editing: Bool, animated: Bool) {
 		super.setEditing(editing, animated: animated)
 		header.isEditing = editing
+		restoreSelection()
 	}
 
 	@objc func editButtonToggled() {
@@ -126,6 +127,10 @@ class ListViewController<T: TableViewCellViewModel>: BaseUITableViewController {
 		return configuration
 	}
 
+	override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+		lastSelectedCellViewModel = dataSource?.itemIdentifier(for: indexPath)
+	}
+
 	// MARK: - Internal
 
 	func removeRow(at indexPath: IndexPath) throws {
@@ -166,4 +171,31 @@ class ListViewController<T: TableViewCellViewModel>: BaseUITableViewController {
 			// no-op
 		}
 	}
+
+	func hideHeaderAndShowEmptyListMessage() {
+		hideHeaderAndShowEmptyListMessage(animated: !firstTimeLoading)
+	}
+
+	func hideHeaderAndShowEmptyListMessage(animated: Bool) {
+		if animated {
+			hideHeaderAnimated().then(showEmptyListMessageAnimated)
+		} else {
+			header.isHidden = true
+			tableView.backgroundView = emptyListMessage
+			// Prevents `EmptyListMessage` from being placed under the navigation bar
+			tableView.contentInsetAdjustmentBehavior = .never
+			tableView.separatorStyle = .none
+		}
+	}
+
+	private func restoreSelection() {
+		guard let splitViewController = splitViewController, !splitViewController.isCollapsed else {
+			return
+		}
+		let snapshot = dataSource?.snapshot()
+		let maybeLastSelectedCellViewModel = snapshot?.itemIdentifiers.first(where: { $0.hashValue == lastSelectedCellViewModel?.hashValue })
+		if let lastSelectedCellViewModel = maybeLastSelectedCellViewModel, let lastSelectedIndexPath = dataSource?.indexPath(for: lastSelectedCellViewModel) {
+			tableView.selectRow(at: lastSelectedIndexPath, animated: true, scrollPosition: .none)
+		}
+	}
 }