Allow deleting custom lists

Author: Jon Petersson

ios/MullvadSettings/CustomListRepository.swift

@@ -18,7 +18,7 @@ public enum CustomRelayListError: LocalizedError, Equatable {
         switch self {
         case .duplicateName:
             NSLocalizedString(
-                "DUPLICATE_CUSTOM_LIST_ERROR",
+                "DUPLICATE_CUSTOM_LISTS_ERROR",
                 tableName: "CustomListRepository",
                 value: "Name is already taken.",
                 comment: ""

ios/MullvadVPN/Coordinators/CustomLists/AddCustomListCoordinator.swift

@@ -36,14 +36,14 @@ class AddCustomListCoordinator: Coordinator, Presentable, Presenting {
         controller.delegate = self
 
         controller.navigationItem.title = NSLocalizedString(
-            "CUSTOM_LIST_NAVIGATION_EDIT_TITLE",
+            "CUSTOM_LISTS_NAVIGATION_EDIT_TITLE",
             tableName: "CustomLists",
             value: "New custom list",
             comment: ""
         )
 
         controller.saveBarButton.title = NSLocalizedString(
-            "CUSTOM_LIST_NAVIGATION_CREATE_BUTTON",
+            "CUSTOM_LISTS_NAVIGATION_CREATE_BUTTON",
             tableName: "CustomLists",
             value: "Create",
             comment: ""

ios/MullvadVPN/Coordinators/CustomLists/CustomListViewController.swift

@@ -86,16 +86,6 @@ class CustomListViewController: UIViewController {
     }
 
     private func configureNavigationItem() {
-<<<<<<< HEAD
-=======
-        navigationItem.title = NSLocalizedString(
-            "CUSTOM_LIST_NAVIGATION_EDIT_TITLE",
-            tableName: "CustomLists",
-            value: subject.value.name,
-            comment: ""
-        )
-
->>>>>>> ba5bb4354 (Add UI for creating and editing a custom list)
         navigationItem.leftBarButtonItem = UIBarButtonItem(
             systemItem: .cancel,
             primaryAction: UIAction(handler: { _ in

ios/MullvadVPN/Coordinators/CustomLists/EditCustomListCoordinator.swift

@@ -11,9 +11,14 @@ import MullvadSettings
 import Routing
 import UIKit
 
-class EditCustomListCoordinator: Coordinator, Presentable {
+class EditCustomListCoordinator: Coordinator, Presentable, Presenting {
     let navigationController: UINavigationController
     let customListInteractor: CustomListInteractorProtocol
+    let subject: CurrentValueSubject<CustomListViewModel, Never>
+
+    lazy var alertPresenter: AlertPresenter = {
+        AlertPresenter(context: self)
+    }()
 
     var presentedViewController: UIViewController {
         navigationController
@@ -25,18 +30,18 @@ class EditCustomListCoordinator: Coordinator, Presentable {
     ) {
         self.navigationController = navigationController
         self.customListInteractor = customListInteractor
-    }
 
-    func start() {
-        let subject = CurrentValueSubject<CustomListViewModel, Never>(
+        subject = CurrentValueSubject<CustomListViewModel, Never>(
             CustomListViewModel(
                 id: UUID(),
                 name: "A list",
                 locations: [],
                 tableSections: [.name, .editLocations, .deleteList]
             )
         )
+    }
 
+    func start() {
         let controller = CustomListViewController(interactor: customListInteractor, subject: subject)
         controller.delegate = self
 
@@ -57,7 +62,41 @@ extension EditCustomListCoordinator: CustomListViewControllerDelegate {
     }
 
     func customListDidDelete() {
-        dismiss(animated: true)
+        let presentation = AlertPresentation(
+            id: "api-custom-lists-delete-list-alert",
+            icon: .alert,
+            message: NSLocalizedString(
+                "CUSTOM_LISTS_DELETE_PROMPT",
+                tableName: "APIAccess",
+                value: "Delete \(subject.value.name)?",
+                comment: ""
+            ),
+            buttons: [
+                AlertAction(
+                    title: NSLocalizedString(
+                        "CUSTOM_LISTS_DELETE_BUTTON",
+                        tableName: "APIAccess",
+                        value: "Delete",
+                        comment: ""
+                    ),
+                    style: .destructive,
+                    handler: {
+                        self.customListInteractor.deleteCustomList(id: self.subject.value.id)
+                    }
+                ),
+                AlertAction(
+                    title: NSLocalizedString(
+                        "CUSTOM_LISTS_CANCEL_BUTTON",
+                        tableName: "APIAccess",
+                        value: "Cancel",
+                        comment: ""
+                    ),
+                    style: .default
+                )
+            ]
+        )
+
+        alertPresenter.showAlert(presentation: presentation, animated: true)
     }
 
     func showLocations() {

ios/MullvadVPN/Coordinators/SelectLocationCoordinator.swift

@@ -70,7 +70,7 @@ class SelectLocationCoordinator: Coordinator, Presentable, Presenting, RelayCach
             guard let self else { return }
 
 //            let coordinator = makeRelayFilterCoordinator(forModalPresentation: true)
-            let coordinator = AddCustomListCoordinator(
+            let coordinator = EditCustomListCoordinator(
                 navigationController: CustomNavigationController(),
                 customListInteractor: CustomListInteractor(repository: CustomListRepository())
             )

ios/MullvadVPN/Coordinators/Settings/APIAccess/Edit/EditAccessMethodViewController.swift

@@ -333,7 +333,7 @@ class EditAccessMethodViewController: UITableViewController {
             id: "api-access-methods-delete-method-alert",
             icon: .alert,
             message: NSLocalizedString(
-                "METHOD_SETTINGS_SAVE_PROMPT",
+                "METHOD_SETTINGS_DELETE_PROMPT",
                 tableName: "APIAccess",
                 value: "Delete \(methodName)?",
                 comment: ""