Added Help section

ghostery · Mar 26, 2018 · 9cf1c642d2060ce18dd9ae17ee1209124f0924d2 · 9cf1c64
1 parent b01c1c7
commit 9cf1c642d2060ce18dd9ae17ee1209124f0924d2
Unified Split

Showing with 135 additions and 23 deletions.

+4 −0 Client.xcodeproj/project.pbxproj

+59 −0 Cliqz/Settings/CliqzAppSettingsOptions.swift

+28 −23 Cliqz/Settings/CliqzAppSettingsTableViewController.swift

+44 −0 Cliqz/Settings/ShowCliqzPageSetting.swift
diff --git a/Client.xcodeproj/project.pbxproj b/Client.xcodeproj/project.pbxproj
@@ -54,6 +54,7 @@
 		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 */; };
+		1EAFE4E1205AE35E006A36B4 /* ShowCliqzPageSetting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1EAFE4E0205AE35E006A36B4 /* ShowCliqzPageSetting.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 */; };
@@ -1465,6 +1466,7 @@
 		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>"; };
+		1EAFE4E0205AE35E006A36B4 /* ShowCliqzPageSetting.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShowCliqzPageSetting.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>"; };
@@ -2485,6 +2487,7 @@
 			children = (
 				1E3CBC142057D83700898B05 /* CliqzAppSettingsTableViewController.swift */,
 				1E3CBC242058213500898B05 /* CliqzOnOffSetting.swift */,
+				1EAFE4E0205AE35E006A36B4 /* ShowCliqzPageSetting.swift */,
 				1E3CBC162058057700898B05 /* CliqzAppSettingsOptions.swift */,
 				1E3CBC1A2058064000898B05 /* SubSettingsTableViewController.swift */,
 				1E3CBC202058149900898B05 /* ToggleSubSettingsTableViewController.swift */,
@@ -5957,6 +5960,7 @@
 				7B3631EA1C244FEE00D12AF9 /* Theme.swift in Sources */,
 				3B61CD491F2A74EF00D38DE1 /* PocketFeed.swift in Sources */,
 				4F30F52420517A6B0049E4F6 /* LogoPlaceholder.swift in Sources */,
+				1EAFE4E1205AE35E006A36B4 /* ShowCliqzPageSetting.swift in Sources */,
 				396E38F11EE0C8EC00CC180F /* FxAPushMessageHandler.swift in Sources */,
 				E66C5B481BDA81050051AA93 /* UIImage+ImageEffects.m in Sources */,
 				4F69309A2048185600FB0B2E /* TopSitesDataSource.swift in Sources */,

diff --git a/Cliqz/Settings/CliqzAppSettingsOptions.swift b/Cliqz/Settings/CliqzAppSettingsOptions.swift
@@ -70,3 +70,62 @@ class AdBlockerSetting: CliqzOnOffSetting {
         return AdBlockerSettingsTableViewController()
     }
 }
+
+
+class SupportSetting: Setting {
+
+    override var title: NSAttributedString? {
+        return NSAttributedString(string: NSLocalizedString("FAQ & Support", tableName: "Cliqz", comment: "[Settings] FAQ & Support"),attributes: [NSForegroundColorAttributeName: UIConstants.HighlightBlue])
+    }
+
+    override var url: URL? {
+        return URL(string: "https://cliqz.com/support")
+    }
+
+    override func onClick(_ navigationController: UINavigationController?) {
+        navigationController?.dismiss(animated: true, completion: {})
+        self.delegate?.settingsOpenURLInNewTab(self.url!)
+
+        // TODO: Telemetry
+        /*
+        // Cliqz: log telemetry signal
+        let contactSignal = TelemetryLogEventType.Settings("main", "click", "contact", nil, nil)
+        TelemetryLogger.sharedInstance.logEvent(contactSignal)
+        */
+    }
+
+}
+
+class CliqzTipsAndTricksSetting: ShowCliqzPageSetting {
+
+    override func getTitle() -> String {
+        return NSLocalizedString("Get the best out of CLIQZ", tableName: "Cliqz", comment: "[Settings] Get the best out of CLIQZ")
+    }
+
+    override func getPageName() -> String {
+        return "tips-ios"
+    }
+}
+
+class ReportWebsiteSetting: ShowCliqzPageSetting {
+
+    override func getTitle() -> String {
+        return NSLocalizedString("Report Website", tableName: "Cliqz", comment: "[Settings] Report Website")
+    }
+
+    override func getPageName() -> String {
+        return "report-url"
+    }
+}
+
+class MyOffrzSetting: ShowCliqzPageSetting {
+
+    override func getTitle() -> String {
+        return NSLocalizedString("About MyOffrz", tableName: "Cliqz", comment: "[Settings] About MyOffrz")
+    }
+
+    override func getPageName() -> String {
+        return "myoffrz"
+    }
+}
+
diff --git a/Cliqz/Settings/CliqzAppSettingsTableViewController.swift b/Cliqz/Settings/CliqzAppSettingsTableViewController.swift
@@ -35,15 +35,11 @@ class CliqzAppSettingsTableViewController: AppSettingsTableViewController {
         let privacySettings = generatePrivacySettings(prefs: prefs)
         settings += [ SettingSection(title: NSAttributedString(string: privacyTitle), children: privacySettings)]
 
-
-        settings += [
-            SettingSection(title: NSAttributedString(string: NSLocalizedString("Support", comment: "Support section title")), children: [
-                OpenSupportPageSetting(delegate: settingsDelegate),
-                ]),
-            SettingSection(title: NSAttributedString(string: NSLocalizedString("About", comment: "About settings section title")), children: [
-                VersionSetting(settings: self)
-                ])]
-
+        // Help Settings
+        let helpTitle = NSLocalizedString("Help", tableName: "Cliqz", comment: "[Settings] Help section header")
+        let helpSettings = generateHelpSettings(prefs: prefs)
+        settings += [ SettingSection(title: NSAttributedString(string: helpTitle), children: helpSettings)]
+
         return settings
     }
 
@@ -109,21 +105,30 @@ class CliqzAppSettingsTableViewController: AppSettingsTableViewController {
 
     private func generatePrivacySettings(prefs: Prefs) -> [Setting] {
 
-        var privacySettings = [Setting]()
-        privacySettings.append(LoginsSetting(settings: self, delegate: settingsDelegate))
-        privacySettings.append(TouchIDPasscodeSetting(settings: self))
-        privacySettings += [AutoForgetTabSetting(settings: self)]
-
-        privacySettings += [
-            BoolSetting(prefs: prefs,
-                        prefKey: "settings.closePrivateTabs",
-                        defaultValue: false,
-                        titleText: NSLocalizedString("Close Private Tabs", tableName: "PrivateBrowsing", comment: "Setting for closing private tabs"),
-                        statusText: NSLocalizedString("When Leaving Private Browsing", tableName: "PrivateBrowsing", comment: "Will be displayed in Settings under 'Close Private Tabs'"))
-        ]
-
-        privacySettings.append(ClearPrivateDataSetting(settings: self))
+        let privacySettings = [ LoginsSetting(settings: self, delegate: settingsDelegate),
+                                TouchIDPasscodeSetting(settings: self),
+                                AutoForgetTabSetting(settings: self),
+                                BoolSetting(prefs: prefs,
+                                            prefKey: "settings.closePrivateTabs",
+                                            defaultValue: false,
+                                            titleText: NSLocalizedString("Close Private Tabs", tableName: "PrivateBrowsing", comment: "Setting for closing private tabs"),
+                                            statusText: NSLocalizedString("When Leaving Private Browsing", tableName: "PrivateBrowsing", comment: "Will be displayed in Settings under 'Close Private Tabs'")),
+                                ClearPrivateDataSetting(settings: self)]
 
         return privacySettings
     }
+
+    private func generateHelpSettings(prefs: Prefs) -> [Setting] {
+
+        let helpSettings = [
+            SupportSetting(delegate: settingsDelegate),
+            CliqzTipsAndTricksSetting(),
+            ReportWebsiteSetting(),
+            MyOffrzSetting()
+        ]
+
+        return helpSettings
+    }
+
+
 }
diff --git a/Cliqz/Settings/ShowCliqzPageSetting.swift b/Cliqz/Settings/ShowCliqzPageSetting.swift
@@ -0,0 +1,44 @@
+//
+//  ShowCliqzPageSetting.swift
+//  Client
+//
+//  Created by Mahmoud Adam on 3/15/18.
+//  Copyright © 2018 Cliqz. All rights reserved.
+//
+
+import UIKit
+
+class ShowCliqzPageSetting: Setting {
+
+    override var accessoryType: UITableViewCellAccessoryType { return .disclosureIndicator }
+
+    override var title: NSAttributedString? {
+        return NSAttributedString(string: getTitle(), attributes: [NSForegroundColorAttributeName: SettingsUX.TableViewRowTextColor])
+    }
+
+    override func onClick(_ navigationController: UINavigationController?) {
+        setUpAndPushSettingsContentViewController(navigationController)
+
+        // TODO: Telemetry
+        /*
+         // Cliqz: log telemetry signal
+         let contactSignal = TelemetryLogEventType.Settings("main", "click", getViewName(), nil, nil)
+         TelemetryLogger.sharedInstance.logEvent(contactSignal)
+         */
+    }
+
+    override var url: URL? {
+        if let languageCode = Locale.current.regionCode, languageCode == "de"{
+            return URL(string: "https://cliqz.com/\(getPageName())")
+        }
+        return URL(string: "https://cliqz.com/en/\(getPageName())")
+    }
+
+    func getTitle() -> String {
+        return ""
+    }
+
+    func getPageName() -> String {
+        return ""
+    }
+}