Added option to tint custom glyphs with selected color

epetousis · Mar 1, 2017 · 8580793 · 8580793
1 parent 0699f33
commit 8580793
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 14 deletions.
diff --git a/Headers.h b/Headers.h
@@ -70,6 +70,10 @@
 - (void)_setDrawsAsBackdropOverlay:(_Bool)arg1;
 @end
 
+@interface UIImage (Private)
+- (UIImage *)_flatImageWithColor:(UIColor *)color;
+@end
+
 @interface SBDashBoardViewController : UIViewController
 @end
 

diff --git a/LockGlyphX.xm b/LockGlyphX.xm
@@ -95,7 +95,7 @@ static BOOL hidePressHomeToUnlockLabel;
 static BOOL overridePressHomeToUnlockText;
 static BOOL hideWhenMusicControlsAreVisible;
 static BOOL moveBackWhenMusicControlsAreVisible;
-
+static BOOL applyColorToCustomGlyphs;
 static UIColor *primaryColorOverride;
 static UIColor *secondaryColorOverride;
 static BOOL overrideIsForCustomCover;
@@ -105,6 +105,7 @@ static NSString *CFColor = @"ColorFlowLockScreenColorizationNotification";
 static NSString *CCRevert = @"CustomCoverLockScreenColourResetNotification";
 static NSString *CCColor = @"CustomCoverLockScreenColourUpdateNotification";
 
+
 static CGFloat getDefaultYOffset() {
     return hidePressHomeToUnlockLabel ? kDefaultYOffsetWithLockLabelHidden : kDefaultYOffset;
 }
@@ -177,6 +178,7 @@ static void loadPreferences() {
     useHoldToReaderAnimation = !CFPreferencesCopyAppValue(CFSTR("useHoldToReaderAnimation"), kPrefsAppID) ? NO : [CFBridgingRelease(CFPreferencesCopyAppValue(CFSTR("useHoldToReaderAnimation"), kPrefsAppID)) boolValue];
 	hideWhenMusicControlsAreVisible = !CFPreferencesCopyAppValue(CFSTR("hideWhenMusicControlsAreVisible"), kPrefsAppID) ? YES : [CFBridgingRelease(CFPreferencesCopyAppValue(CFSTR("hideWhenMusicControlsAreVisible"), kPrefsAppID)) boolValue];
 	moveBackWhenMusicControlsAreVisible = !CFPreferencesCopyAppValue(CFSTR("moveBackWhenMusicControlsAreVisible"), kPrefsAppID) ? NO : [CFBridgingRelease(CFPreferencesCopyAppValue(CFSTR("moveBackWhenMusicControlsAreVisible"), kPrefsAppID)) boolValue];
+	applyColorToCustomGlyphs = !CFPreferencesCopyAppValue(CFSTR("applyColorToCustomGlyphs"), kPrefsAppID) ? NO : [CFBridgingRelease(CFPreferencesCopyAppValue(CFSTR("applyColorToCustomGlyphs"), kPrefsAppID)) boolValue];
 
 	// load theme bundle
 	NSURL *bundleURL = [NSURL fileURLWithPath:kThemePath];
@@ -214,6 +216,10 @@ static void loadPreferences() {
 	}
 }
 
+static void prefsCallback(CFNotificationCenterRef center, void *observer, CFStringRef name, const void *object, CFDictionaryRef userInfo) {
+	loadPreferences();
+}
+
 static void performFingerScanAnimation(void) {
 	if (fingerglyph && [fingerglyph respondsToSelector:@selector(setState:animated:completionHandler:)]) {
 		doingScanAnimation = YES;
@@ -305,29 +311,28 @@ static void performShakeFingerFailAnimation(void) {
 	fingerglyph.primaryColor = activePrimaryColor();
 	fingerglyph.secondaryColor = activeSecondaryColor();
 
-	// check for theme
+	// check for theme image
 	if (themeAssets && ([[NSFileManager defaultManager] fileExistsAtPath:[themeAssets pathForResource:@"IdleImage" ofType:@"png"]] || [[NSFileManager defaultManager] fileExistsAtPath:[themeAssets pathForResource:@"IdleImage@2x" ofType:@"png"]])) {
 		UIImage *customImage = [UIImage imageWithContentsOfFile:[themeAssets pathForResource:@"IdleImage" ofType:@"png"]];
 
-		// set glyph to custom image mode
-		[fingerglyph setCustomImage:customImage.CGImage withAlignmentEdgeInsets:UIEdgeInsetsZero];
-		[fingerglyph setState:kGlyphStateCustom animated:NO completionHandler:nil];
+		// apply color override if required
+		if (applyColorToCustomGlyphs && fingerglyph.secondaryColor) {
+			customImage = [customImage _flatImageWithColor:fingerglyph.secondaryColor];
+		}
 
 		// resize the custom glyph to the size of the image?
 		// CGRect frame = fingerglyph.frame;
 		// frame.size = customImage.size;
 		// fingerglyph.frame = frame;
 
+		[fingerglyph setCustomImage:customImage.CGImage withAlignmentEdgeInsets:UIEdgeInsetsZero];
+		[fingerglyph setState:kGlyphStateCustom animated:NO completionHandler:nil];
 		usingDefaultGlyph = NO;
 	} else {
 		[fingerglyph setState:getIdleGlyphState() animated:NO completionHandler:nil];
 		usingDefaultGlyph = YES;
 	}
 
-	// set blend mode?
-	// [fingerglyph _setDrawsAsBackdropOverlayWithBlendMode:kCGBlendModePlusDarker];
-	// fingerglyph.tintColor = [UIColor colorWithWhite:0 alpha:0.50];
-
 	// position glyph
 	[fingerglyph updatePositionWithOrientation:[[UIApplication sharedApplication] statusBarOrientation]];
 
@@ -345,7 +350,7 @@ static void performShakeFingerFailAnimation(void) {
 	[self addSubview:fingerglyph];
 
 	// handle when music controls are showing
-	SBDashBoardMainPageViewController *pvc = (SBDashBoardMainPageViewController *)self.pageViewController;	
+	SBDashBoardMainPageViewController *pvc = (SBDashBoardMainPageViewController *)self.pageViewController;
 	if (pvc.contentViewController.showingMediaControls) {
 		if (hideWhenMusicControlsAreVisible) {
 			fingerglyph.hidden = YES;
@@ -878,7 +883,7 @@ static void performShakeFingerFailAnimation(void) {
 
 		CFNotificationCenterAddObserver(CFNotificationCenterGetDarwinNotifyCenter(),
 			NULL,
-			(CFNotificationCallback)loadPreferences,
+			(CFNotificationCallback)prefsCallback,
 			kSettingsChangedNotification,
 			NULL,
 			CFNotificationSuspensionBehaviorDeliverImmediately

diff --git a/Prefs/Resources/LockGlyphXPrefs-Appearance.plist b/Prefs/Resources/LockGlyphXPrefs-Appearance.plist
@@ -68,7 +68,7 @@
 			<key>label</key>
             <string>COLOURS_HEADER_TEXT</string>
 		</dict>
-		<!-- Fingerprint Color -->
+		<!-- Glyph Color -->
 		<dict>
 			<key>cell</key>
 			<string>PSLinkCell</string>
@@ -114,6 +114,23 @@
 			<key>color_postNotification</key>
 			<string>com.evilgoldfish.lockglyphx.settingschanged</string>
 		</dict>
+		<!-- Apply To Custom Glyphs -->
+		<dict>
+			<key>cell</key>
+			<string>PSSwitchCell</string>
+			<key>cellClass</key>
+			<string>LGXSwitchCell</string>
+			<key>default</key>
+			<false/>
+			<key>defaults</key>
+			<string>com.evilgoldfish.lockglyphx</string>
+			<key>key</key>
+			<string>applyColorToCustomGlyphs</string>
+			<key>label</key>
+			<string>COLOURS_IDLECOLOUR_OVERRIDE_LABEL</string>
+			<key>PostNotification</key>
+			<string>com.evilgoldfish.lockglyphx.settingschanged</string>
+		</dict>
 		<!-- Reset Colors -->
 		<dict>
 			<key>cell</key>

diff --git a/Prefs/Resources/en.lproj/Localizable.strings b/Prefs/Resources/en.lproj/Localizable.strings
@@ -34,8 +34,10 @@
 "THEMES_THEMESELECT_LABEL" = "Theme";
 "APPEARANCE_HIDE_RING_LABEL" = "Hide ring";
 "COLOURS_HEADER_TEXT" = "Colours";
-"COLOURS_IDLECOLOUR_LABEL" = "Fingerprint colour";
+"COLOURS_IDLECOLOUR_LABEL" = "Glyph colour";
+"COLOURS_IDLECOLOUR_OVERRIDE_LABEL" = "Apply to custom glyphs";
 "COLOURS_SCANCOLOUR_LABEL" = "Scanning colour";
+
 "COLOURS_RESET_LABEL" = "Reset colours to default";
 "LOCKLABEL_HEADER_TEXT" = "Press Home To Unlock";
 "LOCKLABEL_DISABLED_LABEL" = "Hide text";

diff --git a/Prefs/Resources/en_US.lproj/Localizable.strings b/Prefs/Resources/en_US.lproj/Localizable.strings
@@ -12,7 +12,7 @@
 
 /* Appearance Page */
 "COLOURS_HEADER_TEXT" = "Colors";
-"COLOURS_IDLECOLOUR_LABEL" = "Fingerprint color";
+"COLOURS_IDLECOLOUR_LABEL" = "Glyph color";
 "COLOURS_SCANCOLOUR_LABEL" = "Scanning color";
 "COLOURS_RESET_LABEL" = "Reset colors to default";