From a6e441b7aaa83e49e99bb627494052f120e8a809 Mon Sep 17 00:00:00 2001
From: Dan Roundhill <dan@a8c.com>
Date: Tue, 22 Jan 2019 14:27:29 -0800
Subject: [PATCH 1/2] Use hard-coded values for "noteBodyFontPreviewColor"
 instead of the mojave secondary label color.

Fixes issue where checklists could display in the wrong color in the notes list.
---
 DB5/VSTheme.m                   | 2 +-
 Simplenote/Simplenote-DB5.plist | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/DB5/VSTheme.m b/DB5/VSTheme.m
index f3f50070f..a210f453b 100755
--- a/DB5/VSTheme.m
+++ b/DB5/VSTheme.m
@@ -164,7 +164,7 @@ - (NSColor *)getMojaveColorForKey: (NSString *)key {
             return NSColor.controlBackgroundColor;
         } else if ([key isEqualToString:@"textColor"] || [key isEqualToString:@"noteHeadlineFontColor"]) {
             return NSColor.textColor;
-        } else if ([key isEqualToString:@"secondaryTextColor"] || [key isEqualToString:@"noteBodyFontPreviewColor"]) {
+        } else if ([key isEqualToString:@"secondaryTextColor"]) {
             return NSColor.secondaryLabelColor;
         }
     }
diff --git a/Simplenote/Simplenote-DB5.plist b/Simplenote/Simplenote-DB5.plist
index b837800b1..4ca57e7e6 100755
--- a/Simplenote/Simplenote-DB5.plist
+++ b/Simplenote/Simplenote-DB5.plist
@@ -15,7 +15,7 @@
 		<key>dividerColor</key>
 		<string>dbdee0</string>
 		<key>secondaryTextColor</key>
-		<string>899199</string>
+		<string>808080</string>
 		<key>noteHeadlineFont</key>
 		<string>@boldFontName</string>
 		<key>noteHeadlineFontSize</key>
@@ -39,7 +39,7 @@
 		<key>noteBodyFontSize~ipad</key>
 		<string>19</string>
 		<key>noteBodyFontPreviewColor</key>
-		<string>@secondaryTextColor</string>
+		<string>808080</string>
 		<key>noteCellBackgroundSelectionColor</key>
 		<string>@lightBlueColor</string>
 		<key>noteSidePadding</key>
@@ -344,13 +344,13 @@
 		<key>textColor</key>
 		<string>dbdee0</string>
 		<key>secondaryTextColor</key>
-		<string>899199</string>
+		<string>999999</string>
 		<key>dividerColor</key>
 		<string>4b5157</string>
 		<key>noteHeadlineFontColor</key>
 		<string>@textColor</string>
 		<key>noteBodyFontPreviewColor</key>
-		<string>@secondaryTextColor</string>
+		<string>999999</string>
 		<key>noteCellBackgroundSelectionColor</key>
 		<string>@lightBlueColor</string>
 		<key>switchTintColor</key>

From 9343ae23c59c78e051674d407db02e4830bce1eb Mon Sep 17 00:00:00 2001
From: Dan Roundhill <dan@a8c.com>
Date: Tue, 22 Jan 2019 14:44:18 -0800
Subject: [PATCH 2/2] Reload the table view in applyStyle so that theme gets
 applied properly.

---
 Simplenote/NoteListViewController.m | 2 ++
 Simplenote/SimplenoteAppDelegate.m  | 1 +
 2 files changed, 3 insertions(+)

diff --git a/Simplenote/NoteListViewController.m b/Simplenote/NoteListViewController.m
index 60edc2aca..c375d0a0b 100644
--- a/Simplenote/NoteListViewController.m
+++ b/Simplenote/NoteListViewController.m
@@ -496,6 +496,8 @@ - (void)applyStyle
 {
     VSTheme *theme = [[VSThemeManager sharedManager] theme];
     statusField.textColor = [theme colorForKey:@"emptyListViewFontColor"];
+    
+    [self.tableView reloadData];
 }
 
 - (IBAction)filterNotes:(id)sender {
diff --git a/Simplenote/SimplenoteAppDelegate.m b/Simplenote/SimplenoteAppDelegate.m
index cef24fb0d..d515b0080 100644
--- a/Simplenote/SimplenoteAppDelegate.m
+++ b/Simplenote/SimplenoteAppDelegate.m
@@ -827,6 +827,7 @@ - (void)applyStyle
         [window applyMojaveThemeOverrideIfNecessary];
         [self.noteEditorViewController applyStyle];
         [self.noteEditorViewController fixChecklistColoring];
+        [self.noteListViewController applyStyle];
         return;
     }