Update view model when switching between entry and exit location

ios/MullvadVPN.xcodeproj/project.pbxproj

@@ -488,6 +488,7 @@
 		7A3353912AAA014400F0A71C /* SimulatorVPNConnection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A3353902AAA014400F0A71C /* SimulatorVPNConnection.swift */; };
 		7A3353932AAA089000F0A71C /* SimulatorTunnelInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A3353922AAA089000F0A71C /* SimulatorTunnelInfo.swift */; };
 		7A3353972AAA0F8600F0A71C /* OperationBlockObserverSupport.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A3353962AAA0F8600F0A71C /* OperationBlockObserverSupport.swift */; };
+		7A3EFAAB2BDFDAE800318736 /* RelaySelection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A3EFAAA2BDFDAE800318736 /* RelaySelection.swift */; };
 		7A3FD1B52AD4465A0042BEA6 /* AppMessageHandlerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A3FD1B42AD4465A0042BEA6 /* AppMessageHandlerTests.swift */; };
 		7A3FD1B72AD54ABD0042BEA6 /* AnyTransport.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58BDEB982A98F4ED00F578F2 /* AnyTransport.swift */; };
 		7A3FD1B82AD54AE60042BEA6 /* TimeServerProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58BDEB9A2A98F58600F578F2 /* TimeServerProxy.swift */; };
@@ -1873,6 +1874,7 @@
 		7A3353902AAA014400F0A71C /* SimulatorVPNConnection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SimulatorVPNConnection.swift; sourceTree = "<group>"; };
 		7A3353922AAA089000F0A71C /* SimulatorTunnelInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SimulatorTunnelInfo.swift; sourceTree = "<group>"; };
 		7A3353962AAA0F8600F0A71C /* OperationBlockObserverSupport.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OperationBlockObserverSupport.swift; sourceTree = "<group>"; };
+		7A3EFAAA2BDFDAE800318736 /* RelaySelection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelaySelection.swift; sourceTree = "<group>"; };
 		7A3FD1B42AD4465A0042BEA6 /* AppMessageHandlerTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppMessageHandlerTests.swift; sourceTree = "<group>"; };
 		7A42DEC82A05164100B209BE /* SettingsInputCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsInputCell.swift; sourceTree = "<group>"; };
 		7A45CFC22C05FF2F00D80B21 /* ScreenshotTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScreenshotTests.swift; sourceTree = "<group>"; };
@@ -2820,6 +2822,7 @@
 				F0BE65362B9F136A005CC385 /* LocationSectionHeaderView.swift */,
 				5888AD86227B17950051EB06 /* LocationViewController.swift */,
 				7AB3BEB42BD7A6CB00E34384 /* LocationViewControllerWrapper.swift */,
+				7A3EFAAA2BDFDAE800318736 /* RelaySelection.swift */,
 			);
 			path = SelectLocation;
 			sourceTree = "<group>";
@@ -5878,6 +5881,7 @@
 				5878F50029CDA742003D4BE2 /* UIView+AutoLayoutBuilder.swift in Sources */,
 				7A28826D2BAAC9DE00FD9F20 /* IPOverrideHeaderView.swift in Sources */,
 				A98502032B627B120061901E /* LocalNetworkProbe.swift in Sources */,
+				7A3EFAAB2BDFDAE800318736 /* RelaySelection.swift in Sources */,
 				7A6F2FA92AFD0842006D0856 /* CustomDNSDataSource.swift in Sources */,
 				58EF580B25D69D7A00AEBA94 /* ProblemReportSubmissionOverlayView.swift in Sources */,
 				5892A45E265FABFF00890742 /* EmptyTableViewHeaderFooterView.swift in Sources */,

ios/MullvadVPN/Coordinators/CustomLists/AddLocationsDataSource.swift

@@ -53,16 +53,6 @@ class AddLocationsDataSource:
         reloadWithSelectedLocations()
     }
 
-    // Called from `LocationDiffableDataSourceProtocol`.
-    func nodeShowsChildren(_ node: LocationNode) -> Bool {
-        isLocationInCustomList(node: node)
-    }
-
-    // Called from `LocationDiffableDataSourceProtocol`.
-    func nodeShouldBeSelected(_ node: LocationNode) -> Bool {
-        customListLocationNode.children.contains(node)
-    }
-
     private func reloadWithSelectedLocations() {
         var locationsList: [LocationCellViewModel] = []
         nodes.forEach { node in
@@ -161,6 +151,22 @@ extension AddLocationsDataSource: LocationCellDelegate {
     }
 }
 
+// MARK: - Called from LocationDiffableDataSourceProtocol
+
+extension AddLocationsDataSource {
+    func nodeShowsChildren(_ node: LocationNode) -> Bool {
+        isLocationInCustomList(node: node)
+    }
+
+    func nodeShouldBeSelected(_ node: LocationNode) -> Bool {
+        customListLocationNode.children.contains(node)
+    }
+
+    func excludedRelayTitle(_ node: LocationNode) -> String? {
+        nil // N/A
+    }
+}
+
 // MARK: - Toggle selection in table view
 
 fileprivate extension [LocationCellViewModel] {

ios/MullvadVPN/Coordinators/CustomLists/ListCustomListCoordinator.swift

@@ -60,9 +60,25 @@ class ListCustomListCoordinator: Coordinator, Presentable, Presenting {
 
         coordinator.didFinish = { [weak self] editCustomListCoordinator, action, list in
             guard let self else { return }
+
             popToList()
             editCustomListCoordinator.removeFromParent()
-            self.updateRelayConstraints(for: action, in: list)
+
+            var relayConstraints = tunnelManager.settings.relayConstraints
+            relayConstraints.entryLocations = self.updateRelayConstraint(
+                relayConstraints.entryLocations,
+                for: action,
+                in: list
+            )
+            relayConstraints.exitLocations = self.updateRelayConstraint(
+                relayConstraints.exitLocations,
+                for: action,
+                in: list
+            )
+
+            tunnelManager.updateSettings([.relayConstraints(relayConstraints)]) { [weak self] in
+                self?.tunnelManager.reconnectTunnel(selectNewRelay: true)
+            }
         }
 
         coordinator.didCancel = { [weak self] editCustomListCoordinator in
@@ -75,38 +91,39 @@ class ListCustomListCoordinator: Coordinator, Presentable, Presenting {
         addChild(coordinator)
     }
 
-    private func updateRelayConstraints(for action: EditCustomListCoordinator.FinishAction, in list: CustomList) {
-        var relayConstraints = tunnelManager.settings.relayConstraints
+    private func updateRelayConstraint(
+        _ relayConstraint: RelayConstraint<UserSelectedRelays>,
+        for action: EditCustomListCoordinator.FinishAction,
+        in list: CustomList
+    ) -> RelayConstraint<UserSelectedRelays> {
+        var relayConstraint = relayConstraint
 
-        guard let customListSelection = relayConstraints.exitLocations.value?.customListSelection,
+        guard let customListSelection = relayConstraint.value?.customListSelection,
               customListSelection.listId == list.id
-        else { return }
+        else { return relayConstraint }
 
         switch action {
         case .save:
-            // TODO: - Add entry locations
             if customListSelection.isList {
                 let selectedRelays = UserSelectedRelays(
                     locations: list.locations,
                     customListSelection: UserSelectedRelays.CustomListSelection(listId: list.id, isList: true)
                 )
-                relayConstraints.exitLocations = .only(selectedRelays)
+                relayConstraint = .only(selectedRelays)
             } else {
                 let selectedConstraintIsRemovedFromList = list.locations.filter {
-                    relayConstraints.exitLocations.value?.locations.contains($0) ?? false
+                    relayConstraint.value?.locations.contains($0) ?? false
                 }.isEmpty
 
                 if selectedConstraintIsRemovedFromList {
-                    relayConstraints.exitLocations = .only(UserSelectedRelays(locations: []))
+                    relayConstraint = .only(UserSelectedRelays(locations: []))
                 }
             }
         case .delete:
-            relayConstraints.exitLocations = .only(UserSelectedRelays(locations: []))
+            relayConstraint = .only(UserSelectedRelays(locations: []))
         }
 
-        tunnelManager.updateSettings([.relayConstraints(relayConstraints)]) { [weak self] in
-            self?.tunnelManager.reconnectTunnel(selectNewRelay: true)
-        }
+        return relayConstraint
     }
 
     private func popToList() {

ios/MullvadVPN/Coordinators/LocationCoordinator.swift

@@ -54,10 +54,10 @@ class LocationCoordinator: Coordinator, Presentable, Presenting {
     }
 
     func start() {
-        // TODO: - the location should be defined whether it's Entry or Exit location
         let locationViewControllerWrapper = LocationViewControllerWrapper(
             customListRepository: customListRepository,
-            selectedRelays: tunnelManager.settings.relayConstraints.exitLocations.value
+            constraints: tunnelManager.settings.relayConstraints,
+            multihopEnabled: tunnelManager.settings.tunnelMultihopState == .on
         )
         locationViewControllerWrapper.delegate = self
 
@@ -155,18 +155,25 @@ extension LocationCoordinator: RelayCacheTrackerObserver {
 }
 
 extension LocationCoordinator: LocationViewControllerWrapperDelegate {
-    func didSelectRelays(relays: UserSelectedRelays) {
+    func didSelectEntryRelays(_ relays: UserSelectedRelays) {
         var relayConstraints = tunnelManager.settings.relayConstraints
-        relayConstraints.exitLocations = .only(relays)
+        relayConstraints.entryLocations = .only(relays)
 
         tunnelManager.updateSettings([.relayConstraints(relayConstraints)]) {
             self.tunnelManager.startTunnel()
         }
+    }
+
+    func didSelectExitRelays(_ relays: UserSelectedRelays) {
+        var relayConstraints = tunnelManager.settings.relayConstraints
+        relayConstraints.exitLocations = .only(relays)
 
-        didFinish?(self)
+        tunnelManager.updateSettings([.relayConstraints(relayConstraints)]) {
+            self.tunnelManager.startTunnel()
+        }
     }
 
-    func didUpdateFilter(filter: RelayFilter) {
+    func didUpdateFilter(_ filter: RelayFilter) {
         var relayConstraints = tunnelManager.settings.relayConstraints
         relayConstraints.filter = .only(filter)
 

ios/MullvadVPN/UI appearance/UIColor+Palette.swift

@@ -137,7 +137,7 @@ extension UIColor {
     }
 
     enum SegmentedControl {
-        static let backgroundColor = UIColor(red: 0.18, green: 0.33, blue: 0.49, alpha: 1.0)
+        static let backgroundColor = UIColor(red: 0.14, green: 0.25, blue: 0.38, alpha: 1.0)
         static let selectedColor = successColor
     }
 

ios/MullvadVPN/View controllers/RelayFilter/RelayFilterView.swift

@@ -94,7 +94,7 @@ class RelayFilterView: UIView {
         contentContainer.spacing = UIMetrics.FilterView.labelSpacing
 
         addConstrainedSubviews([contentContainer]) {
-            contentContainer.pinEdges(.init([.top(4), .bottom(0)]), to: self)
+            contentContainer.pinEdges(.init([.top(7), .bottom(0)]), to: self)
             contentContainer.pinEdges(.init([.leading(4), .trailing(4)]), to: layoutMarginsGuide)
         }
     }

ios/MullvadVPN/View controllers/SelectLocation/LocationCell.swift

@@ -72,7 +72,7 @@ class LocationCell: UITableViewCell {
 
     var isDisabled = false {
         didSet {
-            updateDisabled()
+            updateDisabled(isDisabled)
             updateBackgroundColor()
             updateStatusIndicatorColor()
         }
@@ -150,7 +150,7 @@ class LocationCell: UITableViewCell {
 
         updateCollapseImage()
         updateAccessibilityCustomActions()
-        updateDisabled()
+        updateDisabled(isDisabled)
         updateBackgroundColor()
         setLayoutMargins()
 
@@ -207,7 +207,7 @@ class LocationCell: UITableViewCell {
         statusIndicator.backgroundColor = statusIndicatorColor()
     }
 
-    private func updateDisabled() {
+    private func updateDisabled(_ isDisabled: Bool) {
         locationLabel.alpha = isDisabled ? 0.2 : 1
         collapseButton.alpha = isDisabled ? 0.2 : 1
 
@@ -339,9 +339,17 @@ extension LocationCell {
             }
         }
 
+        setExcludedRelayTitle(item.excludedRelayTitle)
         setBehavior(behavior)
     }
 
+    private func setExcludedRelayTitle(_ title: String?) {
+        if let title {
+            locationLabel.text! += " (\(title))"
+            updateDisabled(true)
+        }
+    }
+
     private func setBehavior(_ newBehavior: LocationCellBehavior) {
         self.behavior = newBehavior
         updateLeadingImage()

ios/MullvadVPN/View controllers/SelectLocation/LocationCellViewModel.swift

@@ -13,26 +13,29 @@ struct LocationCellViewModel: Hashable {
     let node: LocationNode
     var indentationLevel = 0
     var isSelected = false
+    var excludedRelayTitle: String?
 
     func hash(into hasher: inout Hasher) {
         hasher.combine(node)
         hasher.combine(node.children.count)
         hasher.combine(section)
         hasher.combine(isSelected)
-        hasher.combine(indentationLevel)
     }
 
     static func == (lhs: Self, rhs: Self) -> Bool {
         lhs.node == rhs.node &&
             lhs.node.children.count == rhs.node.children.count &&
             lhs.section == rhs.section &&
-            lhs.isSelected == rhs.isSelected &&
-            lhs.indentationLevel == rhs.indentationLevel
+            lhs.isSelected == rhs.isSelected
     }
 }
 
 extension [LocationCellViewModel] {
-    mutating func addSubNodes(from item: LocationCellViewModel, at indexPath: IndexPath) {
+    mutating func addSubNodes(
+        from item: LocationCellViewModel,
+        at indexPath: IndexPath,
+        excludedRelayTitleCallback: ((LocationNode) -> String?)?
+    ) {
         let section = LocationSection.allCases[indexPath.section]
         let row = indexPath.row + 1
 
@@ -41,7 +44,8 @@ extension [LocationCellViewModel] {
                 section: section,
                 node: $0,
                 indentationLevel: item.indentationLevel + 1,
-                isSelected: item.isSelected
+                isSelected: false,
+                excludedRelayTitle: excludedRelayTitleCallback?($0)
             )
         }