Skip to content

Commit 6f482bc

Browse files
author
Jon Petersson
committed
Add UI for creating a custom list
1 parent 83ad7e2 commit 6f482bc

13 files changed

+548
-11
lines changed

‎ios/MullvadVPN.xcodeproj/project.pbxproj

+56-8
Large diffs are not rendered by default.

‎ios/MullvadVPN.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"pins" : [
3+
{
4+
"identity" : "swift-log",
5+
"kind" : "remoteSourceControl",
6+
"location" : "https://github.com/apple/swift-log.git",
7+
"state" : {
8+
"revision" : "173f567a2dfec11d74588eea82cecea555bdc0bc",
9+
"version" : "1.4.0"
10+
}
11+
},
12+
{
13+
"identity" : "wireguard-apple",
14+
"kind" : "remoteSourceControl",
15+
"location" : "https://github.com/mullvad/wireguard-apple.git",
16+
"state" : {
17+
"revision" : "11a00c20dc03f2751db47e94f585c0778c7bde82"
18+
}
19+
}
20+
],
21+
"version" : 2
22+
}

‎ios/MullvadVPN/Coordinators/SelectLocationCoordinator.swift

+5-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
//
88

99
import MullvadREST
10+
import MullvadSettings
1011
import MullvadTypes
1112
import Routing
1213
import UIKit
@@ -67,8 +68,11 @@ class SelectLocationCoordinator: Coordinator, Presentable, Presenting, RelayCach
6768

6869
selectLocationViewController.navigateToFilter = { [weak self] in
6970
guard let self else { return }
71+
//
72+
// let coordinator = makeRelayFilterCoordinator(forModalPresentation: true)
73+
// coordinator.start()
7074

71-
let coordinator = makeRelayFilterCoordinator(forModalPresentation: true)
75+
let coordinator = AddCustomListViewCoordinator(navigationController: CustomNavigationController(), customListRepository: CustomListRepository())
7276
coordinator.start()
7377

7478
presentChild(coordinator, animated: true)

‎ios/MullvadVPN/Coordinators/Settings/APIAccess/Edit/MethodSettings/MethodSettingsViewController.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//
88

99
import Combine
10-
import struct MullvadTypes.Duration
10+
import MullvadTypes
1111
import UIKit
1212

1313
/// The view controller providing the interface for editing method settings
@@ -20,7 +20,7 @@ class MethodSettingsViewController: UITableViewController {
2020

2121
private let subject: CurrentValueSubject<AccessMethodViewModel, Never>
2222
private let interactor: EditAccessMethodInteractorProtocol
23-
private var cancellables = Set<AnyCancellable>()
23+
private var cancellables = Set<Combine.AnyCancellable>()
2424
private var alertPresenter: AlertPresenter
2525
private var inputValidationErrors: [AccessMethodFieldValidationError] = []
2626
private var contentValidationErrors: [AccessMethodFieldValidationError] = []

‎ios/MullvadVPN/UI appearance/UIMetrics.swift

+1
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ enum UIMetrics {
8484
static let apiAccessLayoutMargins = NSDirectionalEdgeInsets(top: 20, leading: 16, bottom: 20, trailing: 16)
8585
static let apiAccessInsetLayoutMargins = NSDirectionalEdgeInsets(top: 8, leading: 16, bottom: 8, trailing: 16)
8686
static let apiAccessCellHeight: CGFloat = 44
87+
static let customListsCellHeight: CGFloat = 44
8788
static let apiAccessSwitchCellTrailingMargin: CGFloat = apiAccessInsetLayoutMargins.trailing - 4
8889
static let apiAccessPickerListContentInsetTop: CGFloat = 16
8990
}

‎ios/MullvadVPN/View controllers/SelectLocation/CustomLists/Add/AddCustomListCoordinator.swift

+89
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
//
2+
// AddCustomListViewCoordinator.swift
3+
// MullvadVPN
4+
//
5+
// Created by Jon Petersson on 2024-02-14.
6+
// Copyright © 2024 Mullvad VPN AB. All rights reserved.
7+
//
8+
9+
import Combine
10+
import MullvadSettings
11+
import Routing
12+
import UIKit
13+
14+
class AddCustomListViewCoordinator: Coordinator, Presentable, Presenting {
15+
let navigationController: UINavigationController
16+
let customListRepository: CustomListRepositoryProtocol
17+
18+
var presentedViewController: UIViewController {
19+
navigationController
20+
}
21+
22+
init(
23+
navigationController: UINavigationController,
24+
customListRepository: CustomListRepositoryProtocol
25+
) {
26+
self.navigationController = navigationController
27+
self.customListRepository = customListRepository
28+
}
29+
30+
func start() {
31+
let subject = CurrentValueSubject<CustomListViewModel, Never>(CustomListViewModel(name: "", locations: []))
32+
let controller = AddCustomListViewController(subject: subject)
33+
34+
setUpControllerNavigationItem(controller)
35+
// controller.delegate = self
36+
37+
navigationController.pushViewController(controller, animated: false)
38+
}
39+
40+
private func setUpControllerNavigationItem(_ controller: AddCustomListViewController) {
41+
controller.navigationItem.title = NSLocalizedString(
42+
"CUSTOM_LIST_NAVIGATION_ADD_TITLE",
43+
tableName: "CustomLists",
44+
value: "New custom list",
45+
comment: ""
46+
)
47+
48+
// controller.saveBarButton.title = NSLocalizedString(
49+
// "CUSTOM_LIST_NAVIGATION_ADD_BUTTON",
50+
// tableName: "CustomLists",
51+
// value: "Create",
52+
// comment: ""
53+
// )
54+
55+
controller.navigationItem.leftBarButtonItem = UIBarButtonItem(
56+
systemItem: .cancel,
57+
primaryAction: UIAction(handler: { _ in
58+
self.dismiss(animated: true)
59+
})
60+
)
61+
}
62+
63+
// private func getViewModelSubjectFromStore() -> CurrentValueSubject<CustomListViewModel, Never> {
64+
// let customList = customListRepository.fetch(by: <#T##UUID#>)
65+
// return CurrentValueSubject<CustomListViewModel, Never>(persistentMethod?.toViewModel() ?? .init())
66+
// }
67+
}
68+
69+
//extension AddAccessMethodCoordinator: MethodSettingsViewControllerDelegate {
70+
// func accessMethodDidSave(_ accessMethod: PersistentAccessMethod) {
71+
// dismiss(animated: true)
72+
// }
73+
//
74+
// func controllerShouldShowProtocolPicker(_ controller: MethodSettingsViewController) {
75+
// let picker = AccessMethodProtocolPicker(navigationController: navigationController)
76+
//
77+
// picker.present(currentValue: subject.value.method) { [weak self] newMethod in
78+
// self?.subject.value.method = newMethod
79+
// }
80+
// }
81+
//
82+
// func controllerShouldShowShadowsocksCipherPicker(_ controller: MethodSettingsViewController) {
83+
// let picker = ShadowsocksCipherPicker(navigationController: navigationController)
84+
//
85+
// picker.present(currentValue: subject.value.shadowsocks.cipher) { [weak self] selectedCipher in
86+
// self?.subject.value.shadowsocks.cipher = selectedCipher
87+
// }
88+
// }
89+
//}

‎ios/MullvadVPN/View controllers/SelectLocation/CustomLists/Add/AddCustomListViewController.swift

+146
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,146 @@
1+
//
2+
// AddCustomListViewController.swift
3+
// MullvadVPN
4+
//
5+
// Created by Jon Petersson on 2024-02-14.
6+
// Copyright © 2024 Mullvad VPN AB. All rights reserved.
7+
//
8+
9+
import Combine
10+
import UIKit
11+
12+
class AddCustomListViewController: UITableViewController {
13+
// private let interactor: EditAccessMethodInteractorProtocol
14+
private let subject: CurrentValueSubject<CustomListViewModel, Never>
15+
private var cancellables = Set<AnyCancellable>()
16+
private var dataSource: CustomListDataSource?
17+
18+
private lazy var cellConfiguration: CustomListCellConfiguration = {
19+
return CustomListCellConfiguration(tableView: tableView, subject: subject)
20+
}()
21+
22+
lazy var saveBarButton: UIBarButtonItem = {
23+
let barButtonItem = UIBarButtonItem(
24+
title: NSLocalizedString("SAVE_NAVIGATION_BUTTON", tableName: "CustomLists", value: "Create", comment: ""),
25+
primaryAction: UIAction { [weak self] _ in
26+
self?.onSave()
27+
}
28+
)
29+
barButtonItem.style = .done
30+
return barButtonItem
31+
}()
32+
33+
// weak var delegate: MethodSettingsViewControllerDelegate?
34+
35+
init(
36+
subject: CurrentValueSubject<CustomListViewModel, Never>
37+
// interactor: EditAccessMethodInteractorProtocol
38+
) {
39+
self.subject = subject
40+
// self.interactor = interactor
41+
42+
super.init(style: .insetGrouped)
43+
}
44+
45+
required init?(coder: NSCoder) {
46+
fatalError("init(coder:) has not been implemented")
47+
}
48+
49+
override func viewDidLoad() {
50+
super.viewDidLoad()
51+
52+
view.directionalLayoutMargins = UIMetrics.contentLayoutMargins
53+
view.backgroundColor = .secondaryColor
54+
55+
navigationItem.rightBarButtonItem = saveBarButton
56+
isModalInPresentation = true
57+
58+
configureTableView()
59+
configureDataSource()
60+
}
61+
62+
// MARK: - UITableViewDelegate
63+
64+
override func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
65+
UIMetrics.SettingsCell.customListsCellHeight
66+
}
67+
68+
override func tableView(_ tableView: UITableView, shouldHighlightRowAt indexPath: IndexPath) -> Bool {
69+
guard let itemIdentifier = dataSource?.itemIdentifier(for: indexPath) else { return false }
70+
return itemIdentifier.isSelectable
71+
}
72+
73+
override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
74+
tableView.deselectRow(at: indexPath, animated: false)
75+
76+
let itemIdentifier = dataSource?.itemIdentifier(for: indexPath)
77+
78+
switch itemIdentifier {
79+
case .locations:
80+
showLocations()
81+
default:
82+
break
83+
}
84+
}
85+
86+
// MARK: - Pickers handling
87+
88+
private func showLocations() {
89+
view.endEditing(false)
90+
// delegate?.controllerShouldShowProtocolPicker(self)
91+
}
92+
93+
// MARK: - Data source handling
94+
95+
private func configureDataSource() {
96+
tableView.registerReusableViews(from: CustomListItemIdentifier.CellIdentifier.self)
97+
98+
dataSource = CustomListDataSource(
99+
tableView: tableView,
100+
cellProvider: { [weak self] _, indexPath, itemIdentifier in
101+
guard let self else { return nil }
102+
103+
return cellConfiguration.dequeueCell(
104+
at: indexPath,
105+
for: itemIdentifier,
106+
validationErrors: [.name]
107+
)
108+
}
109+
)
110+
111+
dataSource?.update(
112+
newValue: subject.value,
113+
animated: false
114+
)
115+
116+
117+
118+
// subject.withPreviousValue()
119+
// .sink { [weak self] previousValue, newValue in
120+
// print(newValue)
121+
// }
122+
// .store(in: &cancellables)
123+
}
124+
125+
private func configureTableView() {
126+
tableView.delegate = self
127+
tableView.backgroundColor = .secondaryColor
128+
tableView.separatorColor = .secondaryColor
129+
// tableView.separatorInset.left = UIMetrics.SettingsCell.apiAccessInsetLayoutMargins.leading
130+
}
131+
132+
// MARK: - Misc
133+
134+
private func onSave() {
135+
// interactor.saveAccessMethod()
136+
//
137+
// DispatchQueue.main.asyncAfter(deadline: .now() + transitionDelay.timeInterval) { [weak self] in
138+
// guard
139+
// let self,
140+
// let accessMethod = try? subject.value.intoPersistentAccessMethod()
141+
// else { return }
142+
//
143+
// delegate?.accessMethodDidSave(accessMethod)
144+
// }
145+
}
146+
}

‎ios/MullvadVPN/View controllers/SelectLocation/CustomLists/Add/CustomListCellConfiguration.swift

+90
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
//
2+
// CustomListCellConfiguration.swift
3+
// MullvadVPN
4+
//
5+
// Created by Jon Petersson on 2024-02-14.
6+
// Copyright © 2024 Mullvad VPN AB. All rights reserved.
7+
//
8+
9+
import Combine
10+
import UIKit
11+
12+
class CustomListCellConfiguration {
13+
private let tableView: UITableView
14+
private let subject: CurrentValueSubject<CustomListViewModel, Never>
15+
16+
init(tableView: UITableView, subject: CurrentValueSubject<CustomListViewModel, Never>) {
17+
self.tableView = tableView
18+
self.subject = subject
19+
}
20+
21+
func dequeueCell(
22+
at indexPath: IndexPath,
23+
for itemIdentifier: CustomListItemIdentifier,
24+
validationErrors: [CustomListFieldValidationError]
25+
) -> UITableViewCell {
26+
let cell = tableView.dequeueReusableView(withIdentifier: itemIdentifier.cellIdentifier, for: indexPath)
27+
28+
configureBackground(cell: cell, itemIdentifier: itemIdentifier, validationErrors: validationErrors)
29+
30+
switch itemIdentifier {
31+
case .name:
32+
configureName(cell, itemIdentifier: itemIdentifier)
33+
case .locations:
34+
configureLocations(cell, itemIdentifier: itemIdentifier)
35+
}
36+
37+
return cell
38+
}
39+
40+
private func configureBackground(
41+
cell: UITableViewCell,
42+
itemIdentifier: CustomListItemIdentifier,
43+
validationErrors: [CustomListFieldValidationError]
44+
) {
45+
configureErrorState(cell: cell, itemIdentifier: itemIdentifier, validationErrors: validationErrors)
46+
47+
guard let cell = cell as? DynamicBackgroundConfiguration else { return }
48+
49+
cell.setAutoAdaptingBackgroundConfiguration(.mullvadListGroupedCell(), selectionType: .dimmed)
50+
}
51+
52+
private func configureName(_ cell: UITableViewCell, itemIdentifier: CustomListItemIdentifier) {
53+
var contentConfiguration = TextCellContentConfiguration()
54+
55+
contentConfiguration.text = itemIdentifier.text
56+
contentConfiguration.setPlaceholder(type: .required)
57+
contentConfiguration.textFieldProperties = .withSmartFeaturesDisabled()
58+
contentConfiguration.inputText = subject.value.name
59+
contentConfiguration.editingEvents.onChange = subject.bindTextAction(to: \.name)
60+
61+
cell.contentConfiguration = contentConfiguration
62+
}
63+
64+
private func configureLocations(_ cell: UITableViewCell, itemIdentifier: CustomListItemIdentifier) {
65+
var contentConfiguration = UIListContentConfiguration.mullvadValueCell(tableStyle: tableView.style)
66+
67+
contentConfiguration.text = itemIdentifier.text
68+
cell.contentConfiguration = contentConfiguration
69+
70+
if let cell = cell as? CustomCellDisclosureHandling {
71+
cell.disclosureType = .chevron
72+
}
73+
}
74+
75+
private func configureErrorState(
76+
cell: UITableViewCell,
77+
itemIdentifier: CustomListItemIdentifier,
78+
validationErrors: [CustomListFieldValidationError]
79+
) {
80+
let itemsWithError = CustomListItemIdentifier.fromFieldValidationErrors(validationErrors)
81+
82+
if itemsWithError.contains(itemIdentifier) {
83+
cell.layer.cornerRadius = 10
84+
cell.layer.borderWidth = 1
85+
cell.layer.borderColor = UIColor.Cell.validationErrorBorderColor.cgColor
86+
} else {
87+
cell.layer.borderWidth = 0
88+
}
89+
}
90+
}

0 commit comments

Comments
 (0)