Merge pull request #289 from Automattic/fix/checklist-preview-color

Fix checklists displaying in wrong color in the notes list.
Automattic · Jan 22, 2019 · 4d920b6 · 4d920b6
2 parents 1c75979 + 9343ae2
commit 4d920b6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git 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/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/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>

diff --git 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;
     }