This repository has been archived by the owner. It is now read-only.
Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Added Region setting
- Loading branch information
1 parent
67c8484
commit c7c668968c6efa48c5c540e6504f02d95a5ee164
Showing
with
148 additions
and 30 deletions.
- +4 −0 Client.xcodeproj/project.pbxproj
- +1 −8 Cliqz/Search/CliqzSearchViewController.swift
- +2 −8 Cliqz/Search/QuerySuggestions.swift
- +20 −12 Cliqz/Services/SettingsPrefs.swift
- +35 −0 Cliqz/Settings/CliqzAppSettingsOptions.swift
- +3 −2 Cliqz/Settings/CliqzAppSettingsTableViewController.swift
- +83 −0 Cliqz/Settings/RegionalSettingsTableViewController.swift
| @@ -0,0 +1,83 @@ | ||
| // | ||
| // RegionalSettingsTableViewController.swift | ||
| // Client | ||
| // | ||
| // Created by Mahmoud Adam on 3/16/18. | ||
| // Copyright © 2018 Mozilla. All rights reserved. | ||
| // | ||
| import UIKit | ||
|
|
||
| class RegionalSettingsTableViewController: SubSettingsTableViewController { | ||
|
|
||
| let regions = SettingsPrefs.SearchBackendOptions | ||
| let telemetrySignalViewName = "search_results_from" | ||
| static let regionsLocalizedStrings = ["region-DE" : NSLocalizedString("region-DE", tableName: "Cliqz", value: "Germany", comment: "Localized String for German region"), | ||
| "region-FR" : NSLocalizedString("region-FR", tableName: "Cliqz", value: "France", comment: "Localized String for France region"), | ||
| "region-US" : NSLocalizedString("region-US", tableName: "Cliqz", value: "United States", comment: "Localized String for United States region")] | ||
| var selectedRegion: String { | ||
| get { | ||
| return SettingsPrefs.shared.getRegionPref() | ||
| } | ||
| } | ||
|
|
||
| override func didReceiveMemoryWarning() { | ||
| super.didReceiveMemoryWarning() | ||
| // Dispose of any resources that can be recreated. | ||
| } | ||
|
|
||
| // MARK: - Table view data source | ||
| override func numberOfSections(in tableView: UITableView) -> Int { | ||
| return 1 | ||
| } | ||
|
|
||
| override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { | ||
| return regions.count | ||
| } | ||
|
|
||
| override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { | ||
| let region = regions[indexPath.item] | ||
| let cell = getUITableViewCell() | ||
|
|
||
| cell.textLabel?.text = RegionalSettingsTableViewController.getLocalizedRegionName(region) | ||
|
|
||
| if region == selectedRegion { | ||
| // Cliqz: Mark selected the row of default search engine | ||
| self.tableView.selectRow(at: indexPath, animated: false, scrollPosition: .none) | ||
| cell.accessoryType = UITableViewCellAccessoryType.checkmark | ||
| } | ||
| cell.selectionStyle = .none | ||
| return cell | ||
| } | ||
|
|
||
| override func getViewName() -> String { | ||
| return telemetrySignalViewName | ||
| } | ||
|
|
||
| override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { | ||
| let region = regions[indexPath.item] | ||
| SettingsPrefs.shared.updateRegionPref(region) | ||
| tableView.cellForRow(at: indexPath)?.accessoryType = UITableViewCellAccessoryType.checkmark | ||
|
|
||
| // TODO: Telemetry | ||
| /* | ||
| let settingsBackSignal = TelemetryLogEventType.Settings(telemetrySignalViewName, "click", region, nil, nil) | ||
| TelemetryLogger.sharedInstance.logEvent(settingsBackSignal) | ||
| */ | ||
|
|
||
| } | ||
|
|
||
| override func tableView(_ tableView: UITableView, didDeselectRowAt indexPath: IndexPath) { | ||
| tableView.cellForRow(at: indexPath)?.accessoryType = UITableViewCellAccessoryType.none | ||
| } | ||
|
|
||
| static func getLocalizedRegionName(_ region: String) -> String { | ||
| let regionKey = "region-\(region)" | ||
| if let localizedRegion = regionsLocalizedStrings[regionKey] { | ||
| return localizedRegion | ||
| } | ||
| return "Undefined Region" | ||
| } | ||
|
|
||
| } |