From ca2a91ef99c554c055e2f7ad78c836526fe53237 Mon Sep 17 00:00:00 2001
From: AliaksandrDvoineu <114568094+AliaksandrDvoineu@users.noreply.github.com>
Date: Tue, 13 Jun 2023 13:37:27 +0300
Subject: [PATCH] update logic for Firewall restart (#23)

Co-authored-by: Aliaksandr Dvoineu <av.dvoinev@gmail.com>
---
 .../BlockListContainerViewController.swift    | 29 +------------------
 LockdowniOS/CuratedListsViewController.swift  |  8 +++--
 LockdowniOS/CustomListsViewController.swift   |  2 +-
 3 files changed, 8 insertions(+), 31 deletions(-)

diff --git a/LockdowniOS/BlockListContainerViewController.swift b/LockdowniOS/BlockListContainerViewController.swift
index 1bb1c72..7d96956 100644
--- a/LockdowniOS/BlockListContainerViewController.swift
+++ b/LockdowniOS/BlockListContainerViewController.swift
@@ -11,7 +11,7 @@ import UIKit
 class BlockListContainerViewController: UIViewController {
     
     // MARK: - Properties
-    var didMakeChange = false
+    var didMakeChange = true
     
     private lazy var customNavigationView: CustomNavigationView = {
         let view = CustomNavigationView()
@@ -31,24 +31,8 @@ class BlockListContainerViewController: UIViewController {
         return view
     }()
     
-//    enum Page: CaseIterable {
-//        case curated
-//        case custom
-//
-//        var localizedTitle: String {
-//            switch self {
-//            case .curated:
-//                return NSLocalizedString("Curated", comment: "")
-//            case .custom:
-//                return NSLocalizedString("Custom", comment: "")
-//            }
-//        }
-//    }
-    
     private lazy var segmented: UISegmentedControl = {
         let view = UISegmentedControl()
-//        let view = UISegmentedControl(items: Page.allCases.map(\.localizedTitle))
-//        view.removeAllSegments()
         view.insertSegment(withTitle: "Curated", at: 0, animated: false)
         view.insertSegment(withTitle: "Custom", at: 1, animated: false)
         view.selectedSegmentIndex = 0
@@ -99,7 +83,6 @@ class BlockListContainerViewController: UIViewController {
         segmented.anchors.height.equal(40)
         
         updateView()
-        
     }
 }
 
@@ -133,30 +116,20 @@ private extension BlockListContainerViewController {
     }
     
     func add(asChildViewController viewController: UIViewController) {
-        // Add Child View Controller
         addChild(viewController)
 
-        // Add Child View as Subview
         view.addSubview(viewController.view)
-
-        // Define Constraints
         viewController.view.anchors.top.spacing(24, to: segmented.anchors.bottom)
         viewController.view.anchors.leading.pin()
         viewController.view.anchors.trailing.pin()
         viewController.view.anchors.bottom.pin()
 
-        // Notify Child View Controller
         viewController.didMove(toParent: self)
     }
     
     func remove(asChildViewController viewController: UIViewController) {
-        // Notify Child View Controller
         viewController.willMove(toParent: nil)
-
-        // Remove Child View From Superview
         viewController.view.removeFromSuperview()
-
-        // Notify Child View Controller
         viewController.removeFromParent()
     }
 }
diff --git a/LockdowniOS/CuratedListsViewController.swift b/LockdowniOS/CuratedListsViewController.swift
index ba4a6e5..6fdf4a1 100644
--- a/LockdowniOS/CuratedListsViewController.swift
+++ b/LockdowniOS/CuratedListsViewController.swift
@@ -13,7 +13,11 @@ final class CuratedListsViewController: UIViewController {
     
     // MARK: - Properties
     
-    var didMakeChange = false
+    var didMakeChange = false {
+        didSet{
+            
+        }
+    }
     var lockdownBlockLists: [LockdownGroup] = []
     var basicLockdownBlockLists: [LockdownGroup] = []
     var advancedLockdownBlockLists: [LockdownGroup] = []
@@ -40,7 +44,7 @@ final class CuratedListsViewController: UIViewController {
         curatedTableView.dataSource = self
         
         addTableView(curatedTableView) { tableview in
-            curatedTableView.anchors.top.pin(inset: 16)
+            curatedTableView.anchors.top.pin()
             curatedTableView.anchors.leading.pin()
             curatedTableView.anchors.trailing.pin()
             curatedTableView.anchors.bottom.pin()
diff --git a/LockdowniOS/CustomListsViewController.swift b/LockdowniOS/CustomListsViewController.swift
index cfc72b4..2fe1304 100644
--- a/LockdowniOS/CustomListsViewController.swift
+++ b/LockdowniOS/CustomListsViewController.swift
@@ -405,7 +405,7 @@ private extension CustomListsViewController {
                 if !getUserBlockedDomains().isEmpty {
                     tableView.clear()
                 }
-                
+                self.didMakeChange = true
                 self.reloadCustomBlockedDomains()
             }
         }