Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Added Block Ads setting

  • Loading branch information
mahmoud-adam85 authored and Tim Palade committed Mar 26, 2018
1 parent 796b675 commit b01c1c7b38ce7fcf990d163507910ebd7f476c55
@@ -53,6 +53,7 @@
1E3CBC252058213500898B05 /* CliqzOnOffSetting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E3CBC242058213500898B05 /* CliqzOnOffSetting.swift */; };
1EAFE4A3205934C8006A36B4 /* CliqzAppSettingsOptions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E3CBC162058057700898B05 /* CliqzAppSettingsOptions.swift */; };
1EAFE4CF205A5C0A006A36B4 /* LimitMobileDataUsageTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1EAFE4CE205A5C0A006A36B4 /* LimitMobileDataUsageTableViewController.swift */; };
1EAFE4DF205A604F006A36B4 /* AdBlockerSettingsTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1EAFE4DE205A604F006A36B4 /* AdBlockerSettingsTableViewController.swift */; };
2805F5A61B8BCA7A00268FD1 /* ReadingList.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E4D567181ADECE2700F1EFE7 /* ReadingList.framework */; };
28078A471B1507EF0053B46A /* ReadingList.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E4D567181ADECE2700F1EFE7 /* ReadingList.framework */; };
280CB1371C20E0A3005AF147 /* BookmarksSynchronizer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 280CB1361C20E0A3005AF147 /* BookmarksSynchronizer.swift */; };
@@ -1463,6 +1464,7 @@
1E3CBC2220581C4B00898B05 /* AutoForgetTabTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutoForgetTabTableViewController.swift; sourceTree = "<group>"; };
1E3CBC242058213500898B05 /* CliqzOnOffSetting.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CliqzOnOffSetting.swift; sourceTree = "<group>"; };
1EAFE4CE205A5C0A006A36B4 /* LimitMobileDataUsageTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LimitMobileDataUsageTableViewController.swift; sourceTree = "<group>"; };
1EAFE4DE205A604F006A36B4 /* AdBlockerSettingsTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdBlockerSettingsTableViewController.swift; sourceTree = "<group>"; };
280CB1361C20E0A3005AF147 /* BookmarksSynchronizer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = BookmarksSynchronizer.swift; path = Sync/Synchronizers/Bookmarks/BookmarksSynchronizer.swift; sourceTree = SOURCE_ROOT; };
28126F471C2F948E006466CC /* SQLiteBookmarksHelpers.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SQLiteBookmarksHelpers.swift; sourceTree = "<group>"; };
28126F6D1C2F94F9006466CC /* SQLiteBookmarksModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SQLiteBookmarksModel.swift; sourceTree = "<group>"; };
@@ -2489,6 +2491,7 @@
1E3CBC18205805E200898B05 /* HumanWebSettingsTableViewController.swift */,
1E3CBC2220581C4B00898B05 /* AutoForgetTabTableViewController.swift */,
1EAFE4CE205A5C0A006A36B4 /* LimitMobileDataUsageTableViewController.swift */,
1EAFE4DE205A604F006A36B4 /* AdBlockerSettingsTableViewController.swift */,
);
path = Settings;
sourceTree = "<group>";
@@ -5974,6 +5977,7 @@
7B0B1B9D1C1B6A3F00DF4AB5 /* InstructionsViewController.swift in Sources */,
D308E4E41A5306F500842685 /* SearchEngines.swift in Sources */,
3BCE6D3C1CEB9E4D0080928C /* ThirdPartySearchAlerts.swift in Sources */,
1EAFE4DF205A604F006A36B4 /* AdBlockerSettingsTableViewController.swift in Sources */,
745DAB301CDAAFAA00D44181 /* RecentlyClosedTabsPanel.swift in Sources */,
C45F44691D087DB600CB7EF0 /* TopTabsViewController.swift in Sources */,
4F0445DB203333BF00E2C0C7 /* TopSitesViewController.swift in Sources */,
@@ -0,0 +1,41 @@
//
// AdBlockerSettingsTableViewController.swift
// Client
//
// Created by Mahmoud Adam on 3/15/18.
// Copyright © 2018 Cliqz. All rights reserved.
//
import UIKit

class AdBlockerSettingsTableViewController: ToggleSubSettingsTableViewController {
// MARK:- Abstract methods Implementation
override func getViewName() -> String {
return "block_ads"
}

override func getToggles() -> [Bool] {
return [SettingsPrefs.shared.getAdBlockerPref(), SettingsPrefs.shared.getFairBlockingPref()]
}

override func getToggleTitles() -> [String] {
return [NSLocalizedString("Block Ads", tableName: "Cliqz", comment: "[Settings -> Block Ads] Block Ads"),
NSLocalizedString("Fair Mode", tableName: "Cliqz", comment: "[Settings -> Block Ads] Fair Mode")]
}

override func getSectionFooters() -> [String] {
return [NSLocalizedString("Cliqz Browser has to download some data packages first, before the ad-blocker works efficiently. For this, the app must be connected to Wi-Fi.", tableName: "Cliqz", comment: "[Settings -> Block Ads] Block Ads footer"),
NSLocalizedString("A \"fair\" mode that shows ads in clearly defined cases only will be added soon.", tableName: "Cliqz", comment: "[Settings -> Block Ads] Fair Mode footer")]
}

override func saveToggles(isOn: Bool, atIndex index: Int) {
index == 0 ? SettingsPrefs.shared.updateAdBlockerPref(isOn) : SettingsPrefs.shared.updateFairBlockingPref(isOn)
}

override func numberOfSections(in tableView: UITableView) -> Int {
if self.getToggles()[0] {
return 2
}
return 1
}
}
@@ -57,3 +57,16 @@ class LimitMobileDataUsageSetting: CliqzOnOffSetting {

}

class AdBlockerSetting: CliqzOnOffSetting {
override func getTitle() -> String {
return NSLocalizedString("Block Ads", tableName: "Cliqz", comment: "[Settings] Block Ads")
}

override func isOn() -> Bool {
return SettingsPrefs.shared.getAdBlockerPref()
}

override func getSubSettingViewController() -> SubSettingsTableViewController {
return AdBlockerSettingsTableViewController()
}
}
@@ -91,7 +91,8 @@ class CliqzAppSettingsTableViewController: AppSettingsTableViewController {
titleText: NSLocalizedString("Block Pop-up Windows", comment: "Block pop-up windows setting")),
BoolSetting(prefs: prefs, prefKey: "saveLogins", defaultValue: true,
titleText: NSLocalizedString("Save Logins", comment: "Setting to enable the built-in password manager")),
LimitMobileDataUsageSetting(settings: self)
LimitMobileDataUsageSetting(settings: self),
AdBlockerSetting(settings: self)
]

if AppConstants.MOZ_CLIPBOARD_BAR {
@@ -28,11 +28,11 @@ class ToggleSubSettingsTableViewController: SubSettingsTableViewController {
let control = UISwitch()
control.onTintColor = UIConstants.ControlTintColor
control.addTarget(self, action: #selector(switchValueChanged(_:)), for: UIControlEvents.valueChanged)
control.isOn = toggles[indexPath.row]
control.isOn = toggles[indexPath.section]
control.isEnabled = true
control.tag = indexPath.section

cell.textLabel?.text = toggleTitles[indexPath.row]
cell.textLabel?.text = toggleTitles[indexPath.section]
cell.accessoryView = control
cell.selectionStyle = .none
cell.isUserInteractionEnabled = true

0 comments on commit b01c1c7

Please sign in to comment.