From fc83f55e00226fe3b2716d553a3b07481f65bbb1 Mon Sep 17 00:00:00 2001
From: mac-user669 <cooper@cooperhull.com>
Date: Wed, 5 Feb 2020 12:28:33 -0500
Subject: [PATCH] Light mode color picker

---
 Tweak.xm                             | 13 +++++++---
 ZenithDark.h                         |  3 ++-
 zenithdarkprefs/Resources/Root.plist | 37 ++++++++++++++++++++++++++--
 3 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/Tweak.xm b/Tweak.xm
index 7124c80..7ed6d52 100644
--- a/Tweak.xm
+++ b/Tweak.xm
@@ -4,7 +4,6 @@
 Dark Mode for Zenith's Grabber view!
 Copyright 2020 J.K. Hayslip (@iKilledAppl3) & ToxicAppl3 INSDC/iKilledAppl3 LLC.
 All code was written for learning purposes and credit must be given to the original author.
-
 Written for Cooper Hull, @mac-user669.
 */
 
@@ -16,6 +15,14 @@ Written for Cooper Hull, @mac-user669.
 -(void)traitCollectionDidChange:(UITraitCollection *)previousTraitCollection {
    %orig(previousTraitCollection);
   if (kEnabled) { 
+    NSString* colourString = NULL;
+    NSDictionary* preferencesDictionary = [NSDictionary dictionaryWithContentsOfFile: @"/var/mobile/Library/Preferences/com.mac-user669.zenithdark.plist"];
+    if(preferencesDictionary)
+    {
+        colourString = [preferencesDictionary objectForKey: @"kCustomLightColor"];
+    }
+
+    UIColor* lightColor = [SparkColourPickerUtils colourWithString: colourString withFallback: @"#FFFFFF:0.7"];
   // if the tweak is enabled and the version is iOS 13 or later run our code
     if (@available(iOS 13, *)) {
     if (self.traitCollection.userInterfaceStyle == UIUserInterfaceStyleDark) {
@@ -23,7 +30,7 @@ Written for Cooper Hull, @mac-user669.
     }
 
     else {
-     [self setBackgroundColor:kLightColor];
+     [self setBackgroundColor:lightColor];
     }
   }
 }
@@ -100,4 +107,4 @@ static void PreferencesChangedCallback(CFNotificationCenterRef center, void *obs
 
 dlopen ("/Library/MobileSubstrate/DynamicLibraries/Zenith.dylib", RTLD_NOW);      // We use this to make sure we load Zenith's dynamic library at runtime so we can modify it with our tweak.
 
-}
+}
\ No newline at end of file
diff --git a/ZenithDark.h b/ZenithDark.h
index 7a80d81..37bbb8a 100644
--- a/ZenithDark.h
+++ b/ZenithDark.h
@@ -36,6 +36,7 @@ NSMutableDictionary *prefs;
 // Stock Zenith color we are using macros so we can call it later if need be.
 #define kLightColor [UIColor colorWithWhite:1.0 alpha:0.7]
 
-#define kColor1 [UIColor redColor]
+#define kColor1 [UIColor redColor] // Color used for testing
+
 // the PLIST path where all user settings are stored.
 #define PLIST_PATH @"/var/mobile/Library/Preferences/com.mac-user669.zenithdark.plist"
diff --git a/zenithdarkprefs/Resources/Root.plist b/zenithdarkprefs/Resources/Root.plist
index 370f4c8..c05f6f1 100644
--- a/zenithdarkprefs/Resources/Root.plist
+++ b/zenithdarkprefs/Resources/Root.plist
@@ -49,6 +49,7 @@
 			<key>footerText</key>
 			<string>Default: #000000:0.44</string>
 		</dict>
+
 		<dict>
 			<key>cell</key>
 			<string>PSLinkCell</string>
@@ -66,12 +67,44 @@
 				<true/>
 			</dict>
 			<key>label</key>
-			<string>Color</string>
+			<string>Dark Color</string>
 			<key>key</key>
 			<string>kCustomDarkColor</string>
 			<key>PostNotification</key>
 			<string>com.mac-user669.zenithdark.prefschanged</string>
 		</dict>
+		<dict>
+			<key>cell</key>
+			<string>PSGroupCell</string>
+			<key>label</key>
+			<string></string>
+			<key>footerText</key>
+			<string>Default: #FFFFFF:0.7</string>
+		</dict>
+
+		<dict>
+			<key>cell</key>
+			<string>PSLinkCell</string>
+			<key>cellClass</key>
+			<string>SparkColourPickerCell</string>
+			<key>libsparkcolourpicker</key>
+			<dict>
+				<key>defaults</key>
+				<string>com.mac-user669.zenithdark</string>
+				<key>key</key>
+				<string>kCustomLightColor</string>
+				<key>fallback</key>
+				<string>#FFFFFF:0.7</string>
+				<key>alpha</key>
+				<true/>
+			</dict>
+			<key>label</key>
+			<string>Light Color</string>
+			<key>key</key>
+			<string>kCustomLightColor</string>
+			<key>PostNotification</key>
+			<string>com.mac-user669.zenithdark.prefschanged</string>
+		</dict>
 
 		<dict>
 			<key>cell</key>
@@ -133,7 +166,7 @@
 				<key>title</key>
 				<string>Reset</string>
 				<key>prompt</key>
-				<string>Reset all settings?</string>
+				<string>Reset settings?</string>
 				<key>okTitle</key>
 				<string>Reset</string>
 				<key>cancelTitle</key>