fw/apps/system: Apply dark mode to system apps

Signed-off-by: Andrew McOlash <amcolash@gmail.com>

Author: amcolash

src/fw/apps/system/alarms/alarms.c

@@ -353,7 +353,7 @@ static void prv_push_alarms_app_opened_dialog(AlarmsAppData *data) {
   const char *header = i18n_get("Smart Alarm", data);
   ExpandableDialog *expandable_dialog = expandable_dialog_create_with_params(
       header, RESOURCE_ID_SMART_ALARM_TINY, first_use_text,
-      GColorBlack, GColorWhite, NULL, RESOURCE_ID_ACTION_BAR_ICON_CHECK,
+      system_theme_get_fg_color(), system_theme_get_bg_color(), NULL, RESOURCE_ID_ACTION_BAR_ICON_CHECK,
       prv_alarms_app_opened_click_handler);
 
   expandable_dialog_set_action_bar_background_color(expandable_dialog, ALARMS_APP_HIGHLIGHT_COLOR);
@@ -403,8 +403,6 @@ static void prv_handle_init(void) {
   layer_add_child(&data->window.layer, menu_layer_get_layer(&data->menu_layer));
 
   status_bar_layer_init(&data->status_layer);
-  status_bar_layer_set_colors(&data->status_layer, PBL_IF_COLOR_ELSE(GColorWhite, GColorBlack),
-                              PBL_IF_COLOR_ELSE(GColorBlack, GColorWhite));
   status_bar_layer_set_separator_mode(&data->status_layer, StatusBarLayerSeparatorModeNone);
   layer_add_child(&data->window.layer, status_bar_layer_get_layer(&data->status_layer));
 

src/fw/apps/system/health/health.c

@@ -16,6 +16,7 @@
 #include "pbl/services/activity/activity_private.h"
 #include "pbl/services/timeline/timeline.h"
 #include "resource/resource_ids.auto.h"
+#include "shell/system_theme.h"
 #include "system/logging.h"
 
 // Health app versions
@@ -84,8 +85,8 @@ static void prv_show_insights_onboarding_dialog(void) {
       "Insights Onboarding",
       RESOURCE_ID_HEALTH_ICON_MOON,
       text,
-      GColorBlack,
-      GColorWhite,
+      system_theme_get_fg_color(),
+      system_theme_get_bg_color(),
       NULL,
       RESOURCE_ID_ACTION_BAR_ICON_CHECK,
       expandable_dialog_close_cb);

src/fw/apps/system/health/hr_detail_card.c

@@ -9,6 +9,7 @@
 #include "pbl/services/i18n/i18n.h"
 #include "pbl/services/activity/activity.h"
 #include "pbl/services/activity/health_util.h"
+#include "shell/system_theme.h"
 
 #include <stdio.h>
 
@@ -89,7 +90,7 @@ Window *health_hr_detail_card_create(HealthData *health_data) {
     .num_headings = card_data->num_headings,
     .headings = card_data->headings,
     .weekly_max = max_progress,
-    .bg_color = GColorWhite,
+    .bg_color = system_theme_get_bg_color(),
     .num_zones = card_data->num_zones,
     .zones = card_data->zones,
     .data = card_data,

src/fw/apps/system/launcher/default/app_glance_structured.c

@@ -13,6 +13,7 @@
 #include "resource/resource_ids.auto.h"
 #include "pbl/services/timeline/attribute.h"
 #include "shell/prefs.h"
+#include "shell/system_theme.h"
 #include "system/passert.h"
 #include "util/attributes.h"
 #include "util/string.h"
@@ -87,16 +88,9 @@ static void prv_structured_glance_icon_bitmap_processor_post_func(
 
 GColor launcher_app_glance_structured_get_highlight_color(
     LauncherAppGlanceStructured *structured_glance) {
-#if PBL_COLOR
-  if (structured_glance->glance.is_highlighted) {
-    GColor highlight_bg = shell_prefs_get_theme_highlight_color();
-    return gcolor_legible_over(highlight_bg);
-  } else {
-    return GColorBlack;
-  }
-#else
-  return structured_glance->glance.is_highlighted ? GColorWhite : GColorBlack;
-#endif
+  return structured_glance->glance.is_highlighted ?
+      gcolor_legible_over(shell_prefs_get_theme_highlight_color()) :
+      system_theme_get_fg_color();
 }
 
 static GColor prv_get_icon_tint_color(LauncherAppGlanceStructured *structured_glance) {
@@ -362,7 +356,7 @@ static GTextNode *prv_create_structured_glance_title_subtitle_node(
   GTextNode *title_node = prv_structured_glance_create_title_text_node(structured_glance);
   // We require a valid title node
   PBL_ASSERTN(title_node);
-  
+
   // Push the margin a bit closer
 #if PBL_DISPLAY_HEIGHT >= 200 && PBL_RECT
   title_node->margin.h = -3;

src/fw/apps/system/music.c

@@ -690,7 +690,9 @@ static void prv_no_music_window_click_config(void *context) {
 static MusicNoMusicWindow *prv_create_no_music_window(void) {
   MusicNoMusicWindow *window = app_malloc_check(sizeof(MusicNoMusicWindow));
   window_init(&window->window, WINDOW_NAME("NoMusicWindow"));
-  window_set_background_color(&window->window, PBL_IF_COLOR_ELSE(GColorLightGray, GColorWhite));
+  window_set_background_color(&window->window, PBL_IF_COLOR_ELSE(
+    system_theme_is_dark_mode() ? GColorDarkGray : GColorLightGray,
+    GColorWhite));
   window_set_window_handlers(&window->window, &(WindowHandlers) {
       .unload = prv_unload_no_music_window
   });
@@ -713,7 +715,7 @@ static MusicNoMusicWindow *prv_create_no_music_window(void) {
                                   &NO_MUSIC_TEXT_RECT,
                                   i18n_get("START PLAYBACK\nON YOUR PHONE", window),
                                   fonts_get_system_font(config->no_music_font_key),
-                                  GColorBlack, GColorClear, GTextAlignmentCenter,
+                                  system_theme_get_fg_color(), GColorClear, GTextAlignmentCenter,
                                   GTextOverflowModeTrailingEllipsis);
   layer_add_child(&window->window.layer, &window->bitmap_layer.layer);
   layer_add_child(&window->window.layer, &window->text_layer.layer);
@@ -834,15 +836,17 @@ static void prv_configure_music_text_layer(
     TextLayer *text_layer, char* text_buffer, const GRect *rect, int16_t y_offset,
     GTextAlignment align, GFont font) {
   text_layer_init_with_parameters(text_layer, rect, text_buffer, font,
-                                  GColorBlack, GColorClear, align, GTextOverflowModeFill);
+                                  system_theme_get_fg_color(), GColorClear, align, GTextOverflowModeFill);
   layer_set_bounds(&text_layer->layer, &GRect(0, -y_offset,
                                               rect->size.w, rect->size.h + y_offset));
 }
 
 static void prv_init_ui(Window *window) {
   MusicAppData *data = window_get_user_data(window);
 
-  window_set_background_color(window, PBL_IF_COLOR_ELSE(GColorLightGray, GColorWhite));
+  window_set_background_color(window, PBL_IF_COLOR_ELSE(
+    system_theme_is_dark_mode() ? GColorDarkGray : GColorLightGray,
+    GColorWhite));
 
   const GSize WINDOW_SIZE = window->layer.bounds.size;
 
@@ -896,7 +900,7 @@ static void prv_init_ui(Window *window) {
 
   progress_layer_init(&data->track_pos_bar, &track_rect);
   progress_layer_set_background_color(&data->track_pos_bar,
-                                      PBL_IF_COLOR_ELSE(GColorBlack, GColorWhite));
+                                      PBL_IF_COLOR_ELSE(system_theme_get_bg_color(), GColorWhite));
   progress_layer_set_foreground_color(&data->track_pos_bar,
                                       PBL_IF_COLOR_ELSE(GColorRed, GColorBlack));
   progress_layer_set_corner_radius(&data->track_pos_bar, config->track_corner_radius);
@@ -915,7 +919,7 @@ static void prv_init_ui(Window *window) {
                                                           WINDOW_SIZE.w);
   status_layer_frame.size.w = STATUS_BAR_LAYER_WIDTH;
   layer_set_frame(&status_layer->layer, &status_layer_frame);
-  status_bar_layer_set_colors(&data->status_layer, GColorClear, GColorBlack);
+  status_bar_layer_set_colors(&data->status_layer, GColorClear, system_theme_get_fg_color());
   layer_add_child(&data->window.layer, &status_layer->layer);
 
   music_get_pos(&data->track_pos, &data->track_length);

src/fw/apps/system/notifications.c

@@ -711,10 +711,10 @@ static void prv_window_load(Window *window) {
       .select_click = prv_select_callback,
   });
 
-  menu_layer_set_normal_colors(menu_layer, GColorWhite, GColorBlack);
+  menu_layer_set_normal_colors(menu_layer, system_theme_get_bg_color(), system_theme_get_fg_color());
   menu_layer_set_highlight_colors(menu_layer,
-                                  PBL_IF_COLOR_ELSE(DEFAULT_NOTIFICATION_COLOR, GColorBlack),
-                                  GColorWhite);
+                                  PBL_IF_COLOR_ELSE(DEFAULT_NOTIFICATION_COLOR, system_theme_get_fg_color()),
+                                  system_theme_get_bg_color());
 
   menu_layer_set_click_config_onto_window(menu_layer, window);
   menu_layer_set_scroll_wrap_around(menu_layer, shell_prefs_get_menu_scroll_wrap_around_enable());
@@ -730,14 +730,14 @@ static void prv_window_load(Window *window) {
                                   &GRect(horizontal_margin, window->layer.bounds.size.h / 2 - 15,
                                          window->layer.bounds.size.w - horizontal_margin,
                                          window->layer.bounds.size.h / 2),
-                                  i18n_get("No notifications", data), font, GColorBlack,
-                                  GColorWhite, GTextAlignmentCenter,
+                                  i18n_get("No notifications", data), font, system_theme_get_fg_color(),
+                                  system_theme_get_bg_color(), GTextAlignmentCenter,
                                   GTextOverflowModeTrailingEllipsis);
   layer_add_child(&window->layer, text_layer_get_layer(text_layer));
 
 #if PBL_ROUND
   GColor bg_color = GColorClear;
-  GColor fg_color = GColorBlack;
+  GColor fg_color = system_theme_get_fg_color();
 
   StatusBarLayer *status_bar = &data->status_bar_layer;
   status_bar_layer_init(status_bar);

src/fw/apps/system/weather/layout.c

@@ -27,6 +27,7 @@
 #include "pbl/services/timeline/timeline_resources.h"
 #include "pbl/services/weather/weather_service.h"
 #include "pbl/services/weather/weather_types.h"
+#include "shell/system_theme.h"
 #include "system/logging.h"
 #include "system/passert.h"
 #include "util/size.h"
@@ -318,8 +319,8 @@ static void prv_content_indicator_setup_direction(ContentIndicator *content_indi
                                                   ContentIndicatorDirection direction) {
   content_indicator_configure_direction(content_indicator, direction, &(ContentIndicatorConfig) {
     .layer = indicator_layer,
-    .colors.foreground = GColorBlack,
-    .colors.background = GColorWhite,
+    .colors.foreground = system_theme_get_fg_color(),
+    .colors.background = system_theme_get_bg_color(),
   });
 }
 

src/fw/apps/system/workout/selection.c

@@ -176,7 +176,7 @@ WorkoutSelectionWindow *workout_selection_push(SelectWorkoutCallback select_work
     .draw_row = prv_draw_row_callback,
     .select_click = prv_select_callback,
   });
-  menu_layer_set_normal_colors(menu_layer, GColorWhite, GColorBlack);
+  menu_layer_set_normal_colors(menu_layer, system_theme_get_bg_color(), system_theme_get_fg_color());
   menu_layer_set_highlight_colors(menu_layer,
                                   PBL_IF_COLOR_ELSE(GColorYellow, GColorBlack),
                                   PBL_IF_COLOR_ELSE(GColorBlack, GColorWhite));