@@ -13,17 +13,18 @@ final class ListSettingsViewController: UIViewController {
1313
1414 // MARK: - Properties
1515
16+ var listName = " "
17+ var descriptionText = " "
18+
1619 var blockedList : UserBlockListsGroup ?
1720
1821 weak var blockListVC : BlockListViewController ?
1922
20- var titleName = " "
21-
2223 var didMakeChange = false
2324
2425 lazy var navigationView : ConfiguredNavigationView = {
2526 let view = ConfiguredNavigationView ( )
26- view. titleLabel. text = titleName
27+ view. titleLabel. text = listName
2728 view. leftNavButton. setTitle ( NSLocalizedString ( " BACK " , comment: " " ) , for: . normal)
2829 view. leftNavButton. setImage ( UIImage ( systemName: " chevron.left " ) , for: . normal)
2930 view. leftNavButton. addTarget ( self , action: #selector( backButtonClicked) , for: . touchUpInside)
@@ -36,13 +37,15 @@ final class ListSettingsViewController: UIViewController {
3637 private lazy var switchBlockingView : SwitchBlockingView = {
3738 let view = SwitchBlockingView ( )
3839 view. titleLabel. text = NSLocalizedString ( " Blocking " , comment: " " )
40+ view. switchView. addTarget ( self , action: #selector( toggleBlocking) , for: . valueChanged)
3941 return view
4042 } ( )
4143
4244 private lazy var subMenu : ListsSubmenuView = {
4345 let view = ListsSubmenuView ( )
4446 view. topButton. setTitle ( NSLocalizedString ( " Export List... " , comment: " " ) , for: . normal)
4547 view. topButton. setImage ( UIImage ( named: " icn_export_folder " ) , for: . normal)
48+ view. topButton. addTarget ( self , action: #selector( exportList) , for: . touchUpInside)
4649 view. bottomButton. setTitle ( NSLocalizedString ( " Delete List... " , comment: " " ) , for: . normal)
4750 view. bottomButton. setImage ( UIImage ( named: " icn_trash " ) , for: . normal)
4851 view. bottomButton. addTarget ( self , action: #selector( deleteList) , for: . touchUpInside)
@@ -55,6 +58,10 @@ final class ListSettingsViewController: UIViewController {
5558 override func viewDidLoad( ) {
5659 super. viewDidLoad ( )
5760 view. backgroundColor = . secondarySystemBackground
61+ if let list = blockedList {
62+ switchBlockingView. switchView. isOn = list. enabled
63+ }
64+
5865 configureUI ( )
5966 configureTableView ( )
6067 }
@@ -84,8 +91,9 @@ final class ListSettingsViewController: UIViewController {
8491 subMenu. anchors. trailing. marginsPin ( )
8592 subMenu. isHidden = true
8693
87- // let tap = UITapGestureRecognizer(target: self, action: #selector(hideSubmenu))
88- // view.addGestureRecognizer(tap)
94+ let tap = UITapGestureRecognizer ( target: self , action: #selector( hideSubmenu) )
95+ tap. cancelsTouchesInView = false
96+ view. addGestureRecognizer ( tap)
8997 }
9098
9199 func configureTableView( ) {
@@ -144,10 +152,12 @@ extension ListSettingsViewController: UITableViewDataSource {
144152 }
145153
146154 func tableView( _ tableView: UITableView , numberOfRowsInSection section: Int ) -> Int {
155+ let userBlockedLists = getBlockedLists ( ) . userBlockListsDefaults
156+ let numberOfDomains = userBlockedLists [ listName] ? . domains. count
147157
148158 switch section {
149159 case 0 , 1 : return 1
150- case 2 : return getUserBlockedDomains ( ) . count
160+ case 2 : return numberOfDomains ?? 0
151161 default : return 0
152162 }
153163 }
@@ -157,27 +167,29 @@ extension ListSettingsViewController: UITableViewDataSource {
157167 }
158168
159169 func tableView( _ tableView: UITableView , cellForRowAt indexPath: IndexPath ) -> UITableViewCell {
160-
161- let domains = getUserBlockedDomains ( )
170+ let userBlockedLists = getBlockedLists ( ) . userBlockListsDefaults
171+ let domains = userBlockedLists [ listName ] ? . domains
162172
163173 switch indexPath. section {
164174 case 0 :
165175 guard let cell = tableView. dequeueReusableCell ( withIdentifier: ListBlockedTableViewCell . identifier, for: indexPath) as? ListBlockedTableViewCell else {
166176 return UITableViewCell ( )
167177 }
168- cell. label. text = title
178+ cell. label. text = userBlockedLists [ listName ] ? . name
169179 return cell
170180 case 1 :
171181 guard let cell = tableView. dequeueReusableCell ( withIdentifier: ListBlockedTableViewCell . identifier, for: indexPath) as? ListBlockedTableViewCell else {
172182 return UITableViewCell ( )
173183 }
174- cell. label. text = " Description "
184+
185+ cell. label. text = userBlockedLists [ listName] ? . description ?? " Description "
186+
175187 return cell
176188 case 2 :
177189 guard let cell = tableView. dequeueReusableCell ( withIdentifier: DomainsBlockedTableViewCell . identifier, for: indexPath) as? DomainsBlockedTableViewCell else {
178190 return UITableViewCell ( )
179191 }
180- cell. label. text = " reroi.com "
192+ cell. label. text = domains ? [ indexPath . row ] . name
181193 return cell
182194 default :
183195 return UITableViewCell ( )
@@ -189,9 +201,11 @@ extension ListSettingsViewController: UITableViewDataSource {
189201 switch indexPath. section {
190202 case 0 :
191203 let vc = ListDetailViewController ( )
204+ vc. listName = listName
192205 navigationController? . pushViewController ( vc, animated: true )
193206 case 1 :
194207 let vc = ListDescriptionViewController ( )
208+ vc. listName = listName
195209 navigationController? . pushViewController ( vc, animated: true )
196210 default :
197211 break
@@ -213,7 +227,13 @@ extension ListSettingsViewController {
213227 func saveNewDomain( userEnteredDomainName: String ) {
214228 didMakeChange = true
215229 DDLogInfo ( " Adding custom domain - \( userEnteredDomainName) " )
216- addUserBlockedDomain ( domain: userEnteredDomainName. lowercased ( ) )
230+
231+ let domains = getBlockedLists ( ) . userBlockListsDefaults
232+ let userList = domains [ listName]
233+
234+ if let list = userList {
235+ addDomainToBlockedList ( domain: userEnteredDomainName, for: list. name. lowercased ( ) )
236+ }
217237 tableView. reloadData ( )
218238 }
219239
@@ -253,8 +273,51 @@ extension ListSettingsViewController {
253273 style: UIAlertAction . Style. destructive,
254274 handler: { [ weak self] ( _) in
255275 guard let self else { return }
256- self . tableView. reloadData ( )
276+ if let vc = self . blockListVC {
277+ vc. didMakeChange = true
278+ }
279+
280+
281+ if let list = self . blockedList {
282+ deleteBlockedList ( listName: list. name)
283+ }
284+ self . backButtonClicked ( )
257285 } ) )
258286 self . present ( alert, animated: true , completion: nil )
259287 }
288+
289+ @objc func toggleBlocking( sender: UISwitch ) {
290+ let sender = switchBlockingView. switchView
291+ setBlockingEnabled ( sender. isOn)
292+ }
293+
294+ func setBlockingEnabled( _ isEnabled: Bool ) {
295+ if let vc = self . blockListVC {
296+ vc. didMakeChange = true
297+ }
298+
299+ let domains = getBlockedLists ( ) . userBlockListsDefaults
300+ var userList = domains [ listName]
301+
302+ userList? . enabled = isEnabled
303+
304+ var data = getBlockedLists ( )
305+ data. userBlockListsDefaults [ listName] = userList
306+ let encodedData = try ? JSONEncoder ( ) . encode ( data)
307+ defaults. set ( encodedData, forKey: kUserBlockedLists)
308+ }
309+
310+ @objc func exportList( _ sender: UIButton ) {
311+ let domains = getBlockedLists ( ) . userBlockListsDefaults
312+ var domainsList = domains [ listName] ? . domains
313+
314+ guard let url = domainsList? . first? . exportToURL ( ) else { return }
315+
316+ let activity = UIActivityViewController (
317+ activityItems: [ " Export your domains " , url] ,
318+ applicationActivities: nil
319+ )
320+ activity. popoverPresentationController? . sourceView = sender
321+ present ( activity, animated: true , completion: nil )
322+ }
260323}
0 commit comments