Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Split select location view into two sections
- Loading branch information
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| // | ||
| // CustomListsDataSource.swift | ||
| // MullvadVPN | ||
| // | ||
| // Created by Jon Petersson on 2024-02-22. | ||
| // Copyright © 2024 Mullvad VPN AB. All rights reserved. | ||
| // | ||
|
|
||
| import Foundation | ||
| import MullvadREST | ||
| import MullvadSettings | ||
| import MullvadTypes | ||
|
|
||
| class CustomListsDataSource: LocationDataSourceProtocol { | ||
| private(set) var nodes = [LocationNode]() | ||
| private(set) var repository: CustomListRepositoryProtocol | ||
|
|
||
| init(repository: CustomListRepositoryProtocol) { | ||
| self.repository = repository | ||
| } | ||
|
|
||
| var searchableNodes: [LocationNode] { | ||
| nodes.flatMap { $0.children } | ||
| } | ||
|
|
||
| func reload(allLocationNodes: [LocationNode]) { | ||
| nodes = repository.fetchAll().map { list in | ||
| let listNode = LocationListNode( | ||
| nodeName: list.name, | ||
| nodeCode: list.name.lowercased(), | ||
| locations: list.locations, | ||
| customList: list | ||
| ) | ||
|
|
||
| listNode.children = list.locations.compactMap { location in | ||
| copy(location, from: allLocationNodes, withParent: listNode) | ||
| } | ||
|
|
||
| listNode.forEachDescendant { _, node in | ||
| node.nodeCode = "\(listNode.nodeCode)-\(node.nodeCode)" | ||
| } | ||
|
|
||
| return listNode | ||
| } | ||
| } | ||
|
|
||
| func node(by locations: [RelayLocation], for customList: CustomList) -> LocationNode? { | ||
| guard let customListNode = nodes.first(where: { $0.nodeName == customList.name }) | ||
| else { return nil } | ||
|
|
||
| if locations.count > 1 { | ||
| return customListNode | ||
| } else { | ||
| return switch locations.first { | ||
| case let .country(countryCode): | ||
| customListNode.nodeFor(nodeCode: "\(customListNode.nodeCode)-\(countryCode)") | ||
| case let .city(_, cityCode): | ||
| customListNode.nodeFor(nodeCode: "\(customListNode.nodeCode)-\(cityCode)") | ||
| case let .hostname(_, _, hostCode): | ||
| customListNode.nodeFor(nodeCode: "\(customListNode.nodeCode)-\(hostCode)") | ||
| case .none: | ||
| nil | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func customList(by id: UUID) -> CustomList? { | ||
| repository.fetch(by: id) | ||
| } | ||
|
|
||
| private func copy( | ||
| _ location: RelayLocation, | ||
| from allLocationNodes: [LocationNode], | ||
| withParent parentNode: LocationNode | ||
| ) -> LocationNode? { | ||
| let rootNode = RootNode(children: allLocationNodes) | ||
|
|
||
| return switch location { | ||
| case let .country(countryCode): | ||
| rootNode | ||
| .countryFor(countryCode: countryCode)?.copy(withParent: parentNode) | ||
|
|
||
| case let .city(countryCode, cityCode): | ||
| rootNode | ||
| .countryFor(countryCode: countryCode)?.copy(withParent: parentNode) | ||
| .cityFor(cityCode: cityCode) | ||
|
|
||
| case let .hostname(countryCode, cityCode, hostCode): | ||
| rootNode | ||
| .countryFor(countryCode: countryCode)?.copy(withParent: parentNode) | ||
| .cityFor(cityCode: cityCode)? | ||
| .hostFor(hostCode: hostCode) | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| // | ||
| // SettingsValidationErrorConfiguration.swift | ||
| // MullvadVPN | ||
| // | ||
| // Created by Jon Petersson on 2024-02-16. | ||
| // Copyright © 2024 Mullvad VPN AB. All rights reserved. | ||
| // | ||
|
|
||
| import UIKit | ||
|
|
||
| struct SettingsValidationErrorConfiguration: UIContentConfiguration, Equatable { | ||
| var errors: [CustomListFieldValidationError] = [] | ||
| var directionalLayoutMargins: NSDirectionalEdgeInsets = UIMetrics.SettingsCell.settingsValidationErrorLayoutMargins | ||
|
|
||
| func makeContentView() -> UIView & UIContentView { | ||
| return SettingsValidationErrorContentView(configuration: self) | ||
| } | ||
|
|
||
| func updated(for state: UIConfigurationState) -> Self { | ||
| return self | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| // | ||
| // SettingsValidationErrorContentView.swift | ||
| // MullvadVPN | ||
| // | ||
| // Created by Jon Petersson on 2024-02-16. | ||
| // Copyright © 2024 Mullvad VPN AB. All rights reserved. | ||
| // | ||
|
|
||
| import UIKit | ||
|
|
||
| class SettingsValidationErrorContentView: UIView, UIContentView { | ||
| let contentView = UIStackView() | ||
|
|
||
| var icon: UIImageView { | ||
| let view = UIImageView(image: UIImage(resource: .iconAlert).withTintColor(.dangerColor)) | ||
| view.heightAnchor.constraint(equalToConstant: 14).isActive = true | ||
| view.widthAnchor.constraint(equalTo: view.heightAnchor, multiplier: 1).isActive = true | ||
| return view | ||
| } | ||
|
|
||
| var configuration: UIContentConfiguration { | ||
| get { | ||
| actualConfiguration | ||
| } | ||
| set { | ||
| guard let newConfiguration = newValue as? SettingsValidationErrorConfiguration else { return } | ||
|
|
||
| let previousConfiguration = actualConfiguration | ||
| actualConfiguration = newConfiguration | ||
|
|
||
| configureSubviews(previousConfiguration: previousConfiguration) | ||
| } | ||
| } | ||
|
|
||
| private var actualConfiguration: SettingsValidationErrorConfiguration | ||
|
|
||
| func supports(_ configuration: UIContentConfiguration) -> Bool { | ||
| configuration is SettingsValidationErrorConfiguration | ||
| } | ||
|
|
||
| init(configuration: SettingsValidationErrorConfiguration) { | ||
| actualConfiguration = configuration | ||
|
|
||
| super.init(frame: CGRect(x: 0, y: 0, width: 100, height: 44)) | ||
|
|
||
| addSubviews() | ||
| configureSubviews() | ||
| } | ||
|
|
||
| required init?(coder: NSCoder) { | ||
| fatalError("init(coder:) has not been implemented") | ||
| } | ||
|
|
||
| private func addSubviews() { | ||
| contentView.axis = .vertical | ||
| contentView.spacing = 6 | ||
|
|
||
| addConstrainedSubviews([contentView]) { | ||
| contentView.pinEdgesToSuperviewMargins() | ||
| } | ||
| } | ||
|
|
||
| private func configureSubviews(previousConfiguration: SettingsValidationErrorConfiguration? = nil) { | ||
| guard actualConfiguration != previousConfiguration else { return } | ||
|
|
||
| configureLayoutMargins() | ||
|
|
||
| contentView.arrangedSubviews.forEach { view in | ||
| view.removeFromSuperview() | ||
| } | ||
|
|
||
| actualConfiguration.errors.forEach { error in | ||
| let label = UILabel() | ||
| label.text = error.errorDescription | ||
| label.numberOfLines = 0 | ||
| label.font = .systemFont(ofSize: 13) | ||
| label.textColor = .white.withAlphaComponent(0.6) | ||
|
|
||
| let stackView = UIStackView(arrangedSubviews: [icon, label]) | ||
| stackView.alignment = .top | ||
| stackView.spacing = 6 | ||
|
|
||
| contentView.addArrangedSubview(stackView) | ||
| } | ||
| } | ||
|
|
||
| private func configureLayoutMargins() { | ||
| directionalLayoutMargins = actualConfiguration.directionalLayoutMargins | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.