[IB2-31] Cliqz Home Panel

ghostery · May 11, 2018 · 37cfdc817baa8e52084198e3be79eb639c73ffed · 37cfdc8
1 parent 2149a88
commit 37cfdc817baa8e52084198e3be79eb639c73ffed
diff --git a/Client.xcodeproj/project.pbxproj b/Client.xcodeproj/project.pbxproj
@@ -496,6 +496,7 @@
 		AF77B88C2099FFC300E7A0C4 /* AntiPhishingDetector.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF77B88B2099FFC300E7A0C4 /* AntiPhishingDetector.swift */; };
 		AF77B88E209A022A00E7A0C4 /* NSData+GZIP.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF77B88D209A022A00E7A0C4 /* NSData+GZIP.swift */; };
 		AF77B890209A05E200E7A0C4 /* ConnectionManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF77B88F209A05E200E7A0C4 /* ConnectionManager.swift */; };
+		AF77B8C5209B132700E7A0C4 /* CliqzHomePanelViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF77B8C4209B132700E7A0C4 /* CliqzHomePanelViewController.swift */; };
 		AF7FDDBC205949AA00AA2280 /* ExpandableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF7FDDAD205949A900AA2280 /* ExpandableView.swift */; };
 		AF99C8A2206935F0009404FF /* GhosteryButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF99C8A1206935F0009404FF /* GhosteryButton.swift */; };
 		AFA1DE072088AF9600B27B8A /* AdBlocker in Resources */ = {isa = PBXBuildFile; fileRef = AFA1DDF82088AF9600B27B8A /* AdBlocker */; };
@@ -510,6 +511,7 @@
 		AFA9FB0B208E04FA0028CA1B /* DictionaryExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFA9FB0A208E04FA0028CA1B /* DictionaryExtensions.swift */; };
 		AFA9FB0D208E135E0028CA1B /* ControlCenterDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFA9FB0C208E135E0028CA1B /* ControlCenterDelegate.swift */; };
 		AFE484D32056838500554B2E /* CliqzURLBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFE484D22056838500554B2E /* CliqzURLBar.swift */; };
+		AFF2874E209B54F6001E9B59 /* CliqzHomePanels.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFF2874D209B54F6001E9B59 /* CliqzHomePanels.swift */; };
 		C400467C1CF4E43E00B08303 /* BackForwardListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C400467B1CF4E43E00B08303 /* BackForwardListViewController.swift */; };
 		C40046FA1CF8E0B200B08303 /* BackForwardListAnimator.swift in Sources */ = {isa = PBXBuildFile; fileRef = C40046F91CF8E0B200B08303 /* BackForwardListAnimator.swift */; };
 		C45F44691D087DB600CB7EF0 /* TopTabsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C45F44681D087DB600CB7EF0 /* TopTabsViewController.swift */; };
@@ -1958,6 +1960,7 @@
 		AF77B88B2099FFC300E7A0C4 /* AntiPhishingDetector.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AntiPhishingDetector.swift; sourceTree = "<group>"; };
 		AF77B88D209A022A00E7A0C4 /* NSData+GZIP.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSData+GZIP.swift"; sourceTree = "<group>"; };
 		AF77B88F209A05E200E7A0C4 /* ConnectionManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConnectionManager.swift; sourceTree = "<group>"; };
+		AF77B8C4209B132700E7A0C4 /* CliqzHomePanelViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CliqzHomePanelViewController.swift; sourceTree = "<group>"; };
 		AF7FDDAD205949A900AA2280 /* ExpandableView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ExpandableView.swift; sourceTree = "<group>"; };
 		AF99C8A1206935F0009404FF /* GhosteryButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GhosteryButton.swift; sourceTree = "<group>"; };
 		AFA1DDF82088AF9600B27B8A /* AdBlocker */ = {isa = PBXFileReference; lastKnownFileType = folder; path = AdBlocker; sourceTree = "<group>"; };
@@ -1973,6 +1976,7 @@
 		AFA9FB0C208E135E0028CA1B /* ControlCenterDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ControlCenterDelegate.swift; sourceTree = "<group>"; };
 		AFE484D22056838500554B2E /* CliqzURLBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CliqzURLBar.swift; sourceTree = "<group>"; };
 		AFECF63AADEF4013C5D72D77 /* Pods-Client.firefox.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Client.firefox.xcconfig"; path = "Pods/Target Support Files/Pods-Client/Pods-Client.firefox.xcconfig"; sourceTree = "<group>"; };
+		AFF2874D209B54F6001E9B59 /* CliqzHomePanels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CliqzHomePanels.swift; sourceTree = "<group>"; };
 		C400467B1CF4E43E00B08303 /* BackForwardListViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BackForwardListViewController.swift; sourceTree = "<group>"; };
 		C40046F91CF8E0B200B08303 /* BackForwardListAnimator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BackForwardListAnimator.swift; sourceTree = "<group>"; };
 		C45F44681D087DB600CB7EF0 /* TopTabsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TopTabsViewController.swift; sourceTree = "<group>"; };
@@ -3390,6 +3394,7 @@
 				1EDF91B5208A339800200100 /* Tab Tray */,
 				1EDF91722087445600200100 /* Share Menu */,
 				1E4C0DA820A1A27D00D5941B /* Storage */,
+				AF77B8B5209B130400E7A0C4 /* HomePanel */,
 				1E7B769F206B9C4900FD0BA5 /* Connect */,
 				1EDF0B20207B868000856493 /* QuerySuggestions */,
 				4FF07D712063C754001385A8 /* MyOffrz */,
@@ -3608,6 +3613,15 @@
 				AF77B88F209A05E200E7A0C4 /* ConnectionManager.swift */,
 			);
 			path = "Anti-Phishing";
+            sourceTree = "<group>";
+        };
+		AF77B8B5209B130400E7A0C4 /* HomePanel */ = {
+			isa = PBXGroup;
+			children = (
+				AF77B8C4209B132700E7A0C4 /* CliqzHomePanelViewController.swift */,
+				AFF2874D209B54F6001E9B59 /* CliqzHomePanels.swift */,
+			);
+			path = HomePanel;
 			sourceTree = "<group>";
 		};
 		AF99C8B120693627009404FF /* UI */ = {
@@ -6505,6 +6519,7 @@
 				E4CD9F2D1A6DC91200318571 /* TabLocationView.swift in Sources */,
 				0BB5B2881AC0A2B90052877D /* SnackBar.swift in Sources */,
 				AF6FA99520652DF200D7F9F0 /* PersistentSet.swift in Sources */,
+				AF77B8C5209B132700E7A0C4 /* CliqzHomePanelViewController.swift in Sources */,
 				7BEFC6801BFF68C30059C952 /* QuickActions.swift in Sources */,
 				AFA9FACA208DFA120028CA1B /* ControlCenterDataSource.swift in Sources */,
 				AF77B890209A05E200E7A0C4 /* ConnectionManager.swift in Sources */,

 				4F30F5122051670C0049E4F6 /* QuerySuggestionBridge.m in Sources */,
 				3BB50E201D627539004B33DF /* ActivityStreamPanel.swift in Sources */,
 				4FF07D872063C99E001385A8 /* OffrzEmptyView.swift in Sources */,
+				AFF2874E209B54F6001E9B59 /* CliqzHomePanels.swift in Sources */,
 				4F30F5192051670C0049E4F6 /* UserAgentConstants.swift in Sources */,
 				4F3046B1204FF18700C99162 /* AppStatus.swift in Sources */,
 				F84B22241A09122500AAB793 /* HomePanelViewController.swift in Sources */,
diff --git a/Client/Frontend/Browser/BrowserViewController.swift b/Client/Frontend/Browser/BrowserViewController.swift
@@ -40,7 +40,10 @@ private struct BrowserViewControllerUX {
 }
 
 class BrowserViewController: UIViewController {
+    /* Cliqz: Replace HomePanel
     var homePanelController: HomePanelViewController?
+    */
+    var homePanelController: CliqzHomePanelViewController?
     var webViewContainer: UIView!
     /* Cliqz: Replace URLBar
     var urlBar: URLBarView!
@@ -706,7 +709,10 @@ class BrowserViewController: UIViewController {
         homePanelIsInline = inline
 
         if homePanelController == nil {
+            /* Cliqz: Replace HomePanel
             let homePanelController = HomePanelViewController()
+            */
+            let homePanelController = CliqzHomePanelViewController()
             homePanelController.profile = profile
             homePanelController.delegate = self
             homePanelController.url = tabManager.selectedTab?.url?.displayURL

diff --git a/Client/Frontend/Home/HomePanels.swift b/Client/Frontend/Home/HomePanels.swift
@@ -19,10 +19,7 @@ class HomePanels {
     let enabledPanels = [
         HomePanelDescriptor(
             makeViewController: { profile in
-				/* Cliqz: Replaced ActivityStreamPanel with Freshtab
                     return ActivityStreamPanel(profile: profile)
-				*/
-				return FreshtabViewController(profile: profile)
             },
             imageName: "TopSites",
             accessibilityLabel: NSLocalizedString("Top sites", comment: "Panel accessibility label"),
@@ -41,10 +38,7 @@ class HomePanels {
                 controller.interactivePopGestureRecognizer?.delegate = nil
                 return controller
             },
-			/* Cliqz: changed the icon
             imageName: "Bookmarks",
-			*/
-			imageName: "Favorite",
             accessibilityLabel: NSLocalizedString("Bookmarks", comment: "Panel accessibility label"),
             accessibilityIdentifier: "HomePanels.Bookmarks"),
 
@@ -57,27 +51,17 @@ class HomePanels {
                 controller.interactivePopGestureRecognizer?.delegate = nil
                 return controller
             },
-			/* Cliqz: changed the icon
             imageName: "History",
-			*/
-			imageName: "CliqzHistory",
             accessibilityLabel: NSLocalizedString("History", comment: "Panel accessibility label"),
             accessibilityIdentifier: "HomePanels.History"),
 
         HomePanelDescriptor(
             makeViewController: { profile in
-			/* Cliqz: removed Reading List panel
                 let controller = ReadingListPanel()
                 controller.profile = profile
                 return controller
-			*/
-				let controller = OffrzViewController(dataSource: OffrzDataSource.shared)
-				return controller
             },
-			/* Cliqz: changed the icon
             imageName: "ReadingList",
-			*/
-			imageName: "Offrz",
             accessibilityLabel: NSLocalizedString("Reading list", comment: "Panel accessibility label"),
             accessibilityIdentifier: "HomePanels.ReadingList"),
         ]