fw/apps/system_apps/settings_themes: use contrast compatible colors only

Signed-off-by: Elad Dvash <e.d.dvash@gmail.com>

Author: EladDv

src/fw/apps/system_apps/settings/settings_menu.c

@@ -56,10 +56,10 @@ static const SettingsModuleGetMetadata s_submodule_registry[] = {
   [SettingsMenuItemDateTime]      = settings_system_get_info,
 #endif
   [SettingsMenuItemDisplay]       = settings_display_get_info,
-  [SettingsMenuItemSystem]        = settings_system_get_info,
 #if PBL_COLOR
   [SettingsMenuItemThemes]        = settings_themes_get_info,
 #endif
+  [SettingsMenuItemSystem]        = settings_system_get_info,
 };
 
 const SettingsModuleMetadata *settings_menu_get_submodule_info(SettingsMenuItem category) {

src/fw/apps/system_apps/settings/settings_menu.h

@@ -37,11 +37,11 @@ typedef enum {
   SettingsMenuItemQuickLaunch,
   SettingsMenuItemDateTime,
   SettingsMenuItemDisplay,
-  SettingsMenuItemActivity,
-  SettingsMenuItemSystem,
 #if PBL_COLOR
   SettingsMenuItemThemes,
 #endif
+  SettingsMenuItemActivity,
+  SettingsMenuItemSystem,
   SettingsMenuItem_Count,
   SettingsMenuItem_Invalid
 } SettingsMenuItem;

src/fw/apps/system_apps/settings/settings_themes.c

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-
 #include "settings_themes.h"
 #include "settings_menu.h"
 #include "settings_option_menu.h"
 #include "settings_window.h"
 
 #include "applib/ui/dialogs/dialog.h"
 #include "applib/ui/dialogs/expandable_dialog.h"
+#include "applib/graphics/gtypes.h"
 #include "applib/graphics/graphics.h"
 #include "applib/ui/menu_layer.h"
 #include "kernel/pbl_malloc.h"
@@ -77,21 +77,10 @@ static void prv_draw_row_cb(SettingsCallbacks *context, GContext *ctx,
   menu_cell_basic_draw(ctx, cell_layer, i18n_get(title, data), i18n_get(subtitle, data), NULL);
 }
 
-static const char* color_names_short[ARRAY_LENGTH(s_color_definitions_short)];
-static bool color_names_short_initialized = false;
 static const char* color_names[ARRAY_LENGTH(s_color_definitions)];
 static bool color_names_initialized = false;
 
 static const char** prv_get_color_names(bool short_list) {
-  if (short_list) {
-    if (!color_names_short_initialized) {
-      for (size_t i = 0; i < ARRAY_LENGTH(s_color_definitions_short); i++) {
-        color_names_short[i] = (char*)s_color_definitions_short[i].name;
-      }
-      color_names_short_initialized = true;
-    }
-    return color_names_short;
-  }
   if (!color_names_initialized) {
     for (size_t i = 0; i < ARRAY_LENGTH(s_color_definitions); i++) {
       color_names[i] = (char*)s_color_definitions[i].name;
@@ -104,20 +93,13 @@ static const char** prv_get_color_names(bool short_list) {
 
 
 
-static int prv_color_to_index(GColor color, bool short_list, GColor default_color) {
+static int prv_color_to_index(GColor color, bool is_light, GColor default_color) {
   if (color.argb == GColorClear.argb || color.argb == default_color.argb) {
     return 0;
   }
-  if (short_list) {
-    for (size_t i = 0; i < ARRAY_LENGTH(s_color_definitions_short); i++) {
-      if ((uint8_t)(color.argb) == (uint8_t)(s_color_definitions_short[i].value.argb)) {
-        return i;
-      }
-    }
-    return -1;
-  }
   for (size_t i = 0; i < ARRAY_LENGTH(s_color_definitions); i++) {
-    if ((uint8_t)(color.argb) == (uint8_t)(s_color_definitions[i].value.argb)) {
+    GColor selected_color = is_light ?  s_color_definitions[i].light : s_color_definitions[i].dark;
+    if ((uint8_t)(color.argb) == (uint8_t)(selected_color.argb)) {
       return i;
     }
   }
@@ -135,7 +117,7 @@ static void prv_apps_color_menu_select(OptionMenu *option_menu, int selection, v
     shell_prefs_set_apps_menu_highlight_color(DEFAULT_APPS_HIGHLIGHT_COLOR);
   }
   else{
-    shell_prefs_set_apps_menu_highlight_color(s_color_definitions[selection].value);
+    shell_prefs_set_apps_menu_highlight_color(s_color_definitions[selection].light);
   }
   app_window_stack_remove(&option_menu->window, true /* animated */);
 }
@@ -147,18 +129,18 @@ static void prv_option_apps_menu_selection_will_change(OptionMenu *option_menu,
   if (new_row == old_row) {
     return;
   }
-  GColor color = s_color_definitions[new_row].value;
+  GColor color = s_color_definitions[new_row].light;
   if (color.argb != GColorClear.argb) {
-    option_menu_set_highlight_colors(option_menu, color, PBL_IF_COLOR_ELSE(GColorBlack, GColorWhite));
+    option_menu_set_highlight_colors(option_menu, color, PBL_COLOR ? GColorBlack : GColorWhite);
   }
   else {
-    option_menu_set_highlight_colors(option_menu, DEFAULT_APPS_HIGHLIGHT_COLOR, PBL_IF_COLOR_ELSE(GColorBlack, GColorWhite));
+    option_menu_set_highlight_colors(option_menu, DEFAULT_APPS_HIGHLIGHT_COLOR, PBL_COLOR ? GColorBlack : GColorWhite);
   }
 }
 
 static void prv_push_apps_color_menu(SettingsThemesData *data) {
   const char *title = i18n_noop("Apps Menu Accent");
-  int selected = prv_color_to_index(shell_prefs_get_apps_menu_highlight_color(), false, DEFAULT_APPS_HIGHLIGHT_COLOR);
+  int selected = prv_color_to_index(shell_prefs_get_apps_menu_highlight_color(), true, DEFAULT_APPS_HIGHLIGHT_COLOR);
   const char** color_names = prv_get_color_names(false);
   const OptionMenuCallbacks callbacks = {
     .select = prv_apps_color_menu_select,
@@ -174,99 +156,27 @@ static void prv_push_apps_color_menu(SettingsThemesData *data) {
   if (option_menu) {
     const bool animated = true;
     if (selected == 0) {
-      option_menu_set_highlight_colors(option_menu, DEFAULT_APPS_HIGHLIGHT_COLOR, PBL_IF_COLOR_ELSE(GColorBlack, GColorWhite));
+      option_menu_set_highlight_colors(option_menu, DEFAULT_APPS_HIGHLIGHT_COLOR, PBL_COLOR ? GColorBlack : GColorWhite);
     }
     else {
-      option_menu_set_highlight_colors(option_menu, s_color_definitions[selected].value, PBL_IF_COLOR_ELSE(GColorBlack, GColorWhite));
+      option_menu_set_highlight_colors(option_menu, s_color_definitions[selected].light, PBL_COLOR ? GColorBlack : GColorWhite);
     }
     app_window_stack_push(&option_menu->window, animated);
   }
 }
 
-
 /////////////////////////////
-// Short Apps Accent Color Settings
+// Settings Accent Color Settings
 /////////////////////////////
 
-static void prv_apps_color_menu_select_short(OptionMenu *option_menu, int selection, void *context) {
-  if (selection == 0){
-    /* Default option selected -> restore default color. */
-    shell_prefs_set_apps_menu_highlight_color(DEFAULT_APPS_HIGHLIGHT_COLOR);
-  }
-  else if (selection == ARRAY_LENGTH(s_color_definitions_short) - 1) {
-    /* "Show All..." -> open full color menu. */
-    prv_push_apps_color_menu((SettingsThemesData *)context);
-    return;
-  }
-  else{
-    shell_prefs_set_apps_menu_highlight_color(s_color_definitions[selection].value);
-  }
-  app_window_stack_remove(&option_menu->window, true /* animated */);
-}
-
-static void prv_option_apps_menu_selection_will_change_short(OptionMenu *option_menu,
-                                             uint16_t new_row,
-                                             uint16_t old_row,
-                                             void *context) {
-  if (new_row == old_row) {
-    return;
-  }
-  GColor color = s_color_definitions_short[new_row].value;
-  if (new_row >= ARRAY_LENGTH(s_color_definitions_short) - 1) {
-    /* "Show All..." selected -> preview current saved color. */
-    option_menu_set_highlight_colors(option_menu, shell_prefs_get_apps_menu_highlight_color(), PBL_IF_COLOR_ELSE(GColorBlack, GColorWhite));
-  }
-  else if (color.argb != GColorClear.argb) {
-    option_menu_set_highlight_colors(option_menu, color, PBL_IF_COLOR_ELSE(GColorBlack, GColorWhite));
-  }
-  else {
-    option_menu_set_highlight_colors(option_menu, DEFAULT_APPS_HIGHLIGHT_COLOR, PBL_IF_COLOR_ELSE(GColorBlack, GColorWhite));
-  }
-}
-
-
-static void prv_push_apps_color_menu_short(SettingsThemesData *data) {
-  const char *title = i18n_noop("Apps Menu Accent");
-  int selected = prv_color_to_index(shell_prefs_get_apps_menu_highlight_color(), true, DEFAULT_APPS_HIGHLIGHT_COLOR);
-  const char** color_names = prv_get_color_names(true);
-  const OptionMenuCallbacks callbacks = {
-    .select = prv_apps_color_menu_select_short,
-    .selection_will_change = prv_option_apps_menu_selection_will_change_short,
-  };
-  if (selected < 0) {
-    selected = ARRAY_LENGTH(s_color_definitions_short) - 1;
-  }
-  OptionMenu * const option_menu = settings_option_menu_create(
-      title, OptionMenuContentType_SingleLine, selected, &callbacks,
-      ARRAY_LENGTH(s_color_definitions_short), true /* icons_enabled */, color_names, data);
-
-  if (option_menu) {
-    const bool animated = true;
-    if (selected == 0) {
-      option_menu_set_highlight_colors(option_menu, DEFAULT_APPS_HIGHLIGHT_COLOR, PBL_IF_COLOR_ELSE(GColorBlack, GColorWhite));
-    }
-    else if (selected == ARRAY_LENGTH(s_color_definitions_short) - 1) {
-      // "Show All..." option selected
-      option_menu_set_highlight_colors(option_menu, shell_prefs_get_apps_menu_highlight_color(), PBL_IF_COLOR_ELSE(GColorBlack, GColorWhite));
-    }
-    else {
-      option_menu_set_highlight_colors(option_menu, s_color_definitions_short[selected].value, PBL_IF_COLOR_ELSE(GColorBlack, GColorWhite));
-    }
-    app_window_stack_push(&option_menu->window, animated);
-  }
-}
-
 
-/////////////////////////////
-// Settings Accent Color Settings
-/////////////////////////////
 static void prv_settings_color_menu_select(OptionMenu *option_menu, int selection, void *context) {
   if (selection == 0){
     /* Default option selected -> restore default color. */
     shell_prefs_set_settings_menu_highlight_color(DEFAULT_SETTINGS_HIGHLIGHT_COLOR);
   }
   else{
-    shell_prefs_set_settings_menu_highlight_color(s_color_definitions[selection].value);
+    shell_prefs_set_settings_menu_highlight_color(s_color_definitions[selection].dark);
   }
   app_window_stack_remove(&option_menu->window, true /* animated */);
 }
@@ -278,17 +188,17 @@ static void prv_option_settings_menu_selection_will_change(OptionMenu *option_me
   if (new_row == old_row) {
     return;
   }
-  GColor color = s_color_definitions[new_row].value;
+  GColor color = s_color_definitions[new_row].dark;
   if (color.argb != GColorClear.argb) {
-    option_menu_set_highlight_colors(option_menu, color, GColorWhite);
+    option_menu_set_highlight_colors(option_menu, color, PBL_COLOR ? GColorWhite : GColorBlack);
   }
   else {
-    option_menu_set_highlight_colors(option_menu, DEFAULT_SETTINGS_HIGHLIGHT_COLOR, GColorWhite);
+    option_menu_set_highlight_colors(option_menu, DEFAULT_SETTINGS_HIGHLIGHT_COLOR, PBL_COLOR ? GColorWhite : GColorBlack);
   }
 }
 
 static void prv_push_settings_color_menu(SettingsThemesData *data) {
-  const char *title = i18n_noop("Settings Accent");
+  const char *title = i18n_noop("Settings Menu Accent");
   int selected = prv_color_to_index(shell_prefs_get_settings_menu_highlight_color(), false, DEFAULT_SETTINGS_HIGHLIGHT_COLOR);
   const char** color_names = prv_get_color_names(false);
   const OptionMenuCallbacks callbacks = {
@@ -305,102 +215,27 @@ static void prv_push_settings_color_menu(SettingsThemesData *data) {
   if (option_menu) {
     const bool animated = true;
     option_menu_set_normal_colors(option_menu,
-                               PBL_IF_COLOR_ELSE(GColorBlack, GColorWhite),
-                               PBL_IF_COLOR_ELSE(GColorWhite, GColorBlack));
+                               PBL_COLOR ? GColorBlack : GColorWhite,
+                               PBL_COLOR ? GColorWhite : GColorBlack);
     if (selected == 0) {
-      option_menu_set_highlight_colors(option_menu, DEFAULT_SETTINGS_HIGHLIGHT_COLOR, GColorWhite);
+      option_menu_set_highlight_colors(option_menu, DEFAULT_SETTINGS_HIGHLIGHT_COLOR, PBL_COLOR ? GColorWhite : GColorBlack);
     }
     else {
-      option_menu_set_highlight_colors(option_menu, s_color_definitions[selected].value, GColorWhite);
+      option_menu_set_highlight_colors(option_menu, s_color_definitions[selected].dark, PBL_COLOR ? GColorWhite : GColorBlack);
     }
     app_window_stack_push(&option_menu->window, animated);
   }
 }
 
-
-/////////////////////////////
-// Short Settings Accent Color Settings
-/////////////////////////////
-static void prv_settings_color_menu_select_short(OptionMenu *option_menu, int selection, void *context) {
-  if (selection == 0){
-    /* Default option selected -> restore default color. */
-    shell_prefs_set_settings_menu_highlight_color(DEFAULT_SETTINGS_HIGHLIGHT_COLOR);
-  }
-  else if (selection == ARRAY_LENGTH(s_color_definitions_short) - 1) {
-    prv_push_settings_color_menu((SettingsThemesData *)context);
-    return;
-  }
-  else{
-    shell_prefs_set_settings_menu_highlight_color(s_color_definitions[selection].value);
-  }
-}
-
-static void prv_option_settings_menu_selection_will_change_short(OptionMenu *option_menu,
-                                             uint16_t new_row,
-                                             uint16_t old_row,
-                                             void *context) {
-  if (new_row == old_row) {
-    return;
-  }
-  GColor color = s_color_definitions[new_row].value;
-  if (new_row >= ARRAY_LENGTH(s_color_definitions_short) - 1) {
-    /* "Show All..." selected -> preview saved color. */
-    option_menu_set_highlight_colors(option_menu, shell_prefs_get_settings_menu_highlight_color(), GColorWhite);
-  }
-  else if (color.argb != GColorClear.argb) {
-    option_menu_set_highlight_colors(option_menu, color, GColorWhite);
-  }
-  else {
-    option_menu_set_highlight_colors(option_menu, DEFAULT_SETTINGS_HIGHLIGHT_COLOR, GColorWhite);
-  }
-}
-
-
-static void prv_push_settings_color_menu_short(SettingsThemesData *data) {
-  const char *title = i18n_noop("Settings Accent");
-  int selected = prv_color_to_index(shell_prefs_get_settings_menu_highlight_color(), true, DEFAULT_SETTINGS_HIGHLIGHT_COLOR);
-  const char** color_names = prv_get_color_names(true);
-  const OptionMenuCallbacks callbacks = {
-    .select = prv_settings_color_menu_select_short,
-    .selection_will_change = prv_option_settings_menu_selection_will_change_short,
-  };
-  if (selected < 0) {
-    selected = ARRAY_LENGTH(s_color_definitions_short) - 1;
-  }
-  OptionMenu * const option_menu = settings_option_menu_create(
-      title, OptionMenuContentType_SingleLine, selected, &callbacks,
-      ARRAY_LENGTH(s_color_definitions_short), true /* icons_enabled */, color_names, data);
-
-  if (option_menu) {
-    const bool animated = true;
-    option_menu_set_normal_colors(option_menu,
-                               PBL_IF_COLOR_ELSE(GColorBlack, GColorWhite),
-                               PBL_IF_COLOR_ELSE(GColorWhite, GColorBlack));
-    if (selected == 0) {
-      option_menu_set_highlight_colors(option_menu, DEFAULT_SETTINGS_HIGHLIGHT_COLOR, GColorWhite);
-    }
-    else if (selected == ARRAY_LENGTH(s_color_definitions_short) - 1) {
-      // "Show All..." option selected
-      option_menu_set_highlight_colors(option_menu, shell_prefs_get_settings_menu_highlight_color(), GColorWhite);
-    }
-    else {
-      option_menu_set_highlight_colors(option_menu, s_color_definitions_short[selected].value, GColorWhite);
-    }
-    app_window_stack_push(&option_menu->window, animated);
-  }
-}
-
-
-
 static void prv_select_click_cb(SettingsCallbacks *context, uint16_t row) {
 #if PBL_COLOR
   SettingsThemesData *data = (SettingsThemesData *)context;
   switch ((ThemesMenuIndex)row) {
     case ThemesMenuIndex_Apps:
-      prv_push_apps_color_menu_short(data);
+      prv_push_apps_color_menu(data);
       goto done;
     case ThemesMenuIndex_Settings:
-      prv_push_settings_color_menu_short(data);
+      prv_push_settings_color_menu(data);
       goto done;
     case ThemesMenuIndexCount:
       break;