Cliqz brand configuration - disabling cliqz services

chrmod · chrmod · commit 3203178ad888 · 2020-06-29T18:19:39.000+02:00
diff --git a/Branding/Cliqz/Features.swift b/Branding/Cliqz/Features.swift
@@ -14,9 +14,15 @@ extension Features.Search.AdditionalSearchEngines {
     }
 }
 
+extension Features.Home.DynamicBackgrounds {
+    public static var isEnabled: Bool {
+        return false
+    }
+}
+
 extension Features.Search {
     public static var keyboardReturnKeyBehavior: Features.Search.KeyboardReturnKeyBehavior {
-        return .dismiss
+        return .search
     }
     public static var defaultEngineName: String {
         return "Cliqz"
@@ -25,7 +31,7 @@ extension Features.Search {
 
 extension Features.Search.QuickSearch {
     public static var isEnabled: Bool {
-        return true
+        return false
     }
 }
 
@@ -49,7 +55,7 @@ extension Features.News {
 
 extension Features.Icons {
     public static var type: IconType {
-        return .cliqz
+        return .favicon
     }
 }
 
@@ -67,13 +73,13 @@ extension Features.ControlCenter.PrivacyStats.SearchStats {
 
 extension Features.Telemetry {
     public static var isEnabled: Bool {
-        return true
+        return false
     }
 }
 
 extension Features.TodayWidget {
     public static var isEnabled: Bool {
-        return true
+        return false
     }
 }
 
diff --git a/Branding/Cliqz/Intro/Onboarding+Cliqz.swift b/Branding/Cliqz/Intro/Onboarding+Cliqz.swift
@@ -11,7 +11,7 @@ import Shared
 public extension Onboarding {
 
     static var isEnabled: Bool {
-        return true
+        return false
     }
 
     static func presentingViewController(delegate: OnboardingViewControllerDelegate?) -> UIViewController? {
diff --git a/Branding/Ghostery/LaunchScreen.xib b/Branding/Ghostery/LaunchScreen.xib
@@ -35,7 +35,7 @@
     <resources>
         <image name="splash-Icon" width="154" height="154"/>
         <namedColor name="LaunchScreenBackground">
-            <color red="0.94899999999999995" green="0.94899999999999995" blue="0.97599999999999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.0" green="0.68199998140335083" blue="0.94099998474121094" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
     </resources>
 </document>
diff --git a/UserAgent.xcodeproj/project.pbxproj b/UserAgent.xcodeproj/project.pbxproj
@@ -67,7 +67,6 @@
 		2B0C81CE248E1BF8003F97B4 /* BrandColors.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2B0C81CD248E1BF8003F97B4 /* BrandColors.xcassets */; };
 		2B0E93692407A92300ED7703 /* NotificationCenter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3905274B1C874D35007E0BB7 /* NotificationCenter.framework */; };
 		2B0E936C2407A92300ED7703 /* TodayViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B0E936B2407A92300ED7703 /* TodayViewController.swift */; };
-		2B0E93732407A92300ED7703 /* Today.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 2B0E93682407A92300ED7703 /* Today.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		2B189393247535EF003DA87D /* DataAndPrivacy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B189392247535EF003DA87D /* DataAndPrivacy.swift */; };
 		2B18939524753898003DA87D /* DataAndPrivacy+Cliqz.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B18939424753898003DA87D /* DataAndPrivacy+Cliqz.swift */; };
 		2B18939624753C53003DA87D /* Strings+PrivacyStatement.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B76E43323A129DB001CF20E /* Strings+PrivacyStatement.swift */; };
@@ -1024,13 +1023,6 @@
 			remoteGlobalIDString = 288A2D851AB8B3260023ABC3;
 			remoteInfo = Shared;
 		};
-		2B0E93712407A92300ED7703 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = F84B21B61A090F8100AAB793 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 2B0E93672407A92300ED7703;
-			remoteInfo = Today;
-		};
 		2B308AC2242B2B4A009AF3D1 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = F84B21B61A090F8100AAB793 /* Project object */;
@@ -1252,7 +1244,6 @@
 			files = (
 				F84B22541A0920C600AAB793 /* ShareTo.appex in Embed App Extensions */,
 				2B308AC4242B2B4A009AF3D1 /* Siri.appex in Embed App Extensions */,
-				2B0E93732407A92300ED7703 /* Today.appex in Embed App Extensions */,
 				2BE258DF23BA2B4A0022ED28 /* OpenIn.appex in Embed App Extensions */,
 			);
 			name = "Embed App Extensions";
@@ -4344,7 +4335,6 @@
 				F84B22521A0920C600AAB793 /* PBXTargetDependency */,
 				2BE258DE23BA2B4A0022ED28 /* PBXTargetDependency */,
 				049DBB0B23E45C4500D2D38D /* PBXTargetDependency */,
-				2B0E93722407A92300ED7703 /* PBXTargetDependency */,
 				2B308AC3242B2B4A009AF3D1 /* PBXTargetDependency */,
 			);
 			name = Cliqz;
@@ -6362,11 +6352,6 @@
 			target = 288A2D851AB8B3260023ABC3 /* Shared */;
 			targetProxy = 288A2D9B1AB8B3260023ABC3 /* PBXContainerItemProxy */;
 		};
-		2B0E93722407A92300ED7703 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 2B0E93672407A92300ED7703 /* Today */;
-			targetProxy = 2B0E93712407A92300ED7703 /* PBXContainerItemProxy */;
-		};
 		2B308AC3242B2B4A009AF3D1 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 2B308ABC242B2B4A009AF3D1 /* Siri */;

Original file line number	Diff line number	Diff line change
`@@ -14,9 +14,15 @@ extension Features.Search.AdditionalSearchEngines {`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`
	`17`	`+extension Features.Home.DynamicBackgrounds {`
	`18`	`+ public static var isEnabled: Bool {`
	`19`	`+ return false`
	`20`	`+ }`
	`21`	`+}`
	`22`	`+`
`17`	`23`	`extension Features.Search {`
`18`	`24`	`public static var keyboardReturnKeyBehavior: Features.Search.KeyboardReturnKeyBehavior {`
`19`		`- return .dismiss`
	`25`	`+ return .search`
`20`	`26`	`}`
`21`	`27`	`public static var defaultEngineName: String {`
`22`	`28`	`return "Cliqz"`
`@@ -25,7 +31,7 @@ extension Features.Search {`
`25`	`31`
`26`	`32`	`extension Features.Search.QuickSearch {`
`27`	`33`	`public static var isEnabled: Bool {`
`28`		`- return true`
	`34`	`+ return false`
`29`	`35`	`}`
`30`	`36`	`}`
`31`	`37`
`@@ -49,7 +55,7 @@ extension Features.News {`
`49`	`55`
`50`	`56`	`extension Features.Icons {`
`51`	`57`	`public static var type: IconType {`
`52`		`- return .cliqz`
	`58`	`+ return .favicon`
`53`	`59`	`}`
`54`	`60`	`}`
`55`	`61`
`@@ -67,13 +73,13 @@ extension Features.ControlCenter.PrivacyStats.SearchStats {`
`67`	`73`
`68`	`74`	`extension Features.Telemetry {`
`69`	`75`	`public static var isEnabled: Bool {`
`70`		`- return true`
	`76`	`+ return false`
`71`	`77`	`}`
`72`	`78`	`}`
`73`	`79`
`74`	`80`	`extension Features.TodayWidget {`
`75`	`81`	`public static var isEnabled: Bool {`
`76`		`- return true`
	`82`	`+ return false`
`77`	`83`	`}`
`78`	`84`	`}`
`79`	`85`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ import Shared`
`11`	`11`	`public extension Onboarding {`
`12`	`12`
`13`	`13`	`static var isEnabled: Bool {`
`14`		`- return true`
	`14`	`+ return false`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`static func presentingViewController(delegate: OnboardingViewControllerDelegate?) -> UIViewController? {`