fw/apps/system_apps/settings_themes: fix crashing, move menu item up 2 positions

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

Author: EladDv

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

@@ -117,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].dark);
+    shell_prefs_set_apps_menu_highlight_color(s_color_definitions[selection].light);
   }
   app_window_stack_remove(&option_menu->window, true /* animated */);
 }
@@ -129,7 +129,7 @@ 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].dark;
+  GColor color = s_color_definitions[new_row].light;
   if (color.argb != GColorClear.argb) {
     option_menu_set_highlight_colors(option_menu, color, PBL_COLOR ? GColorBlack : GColorWhite);
   }
@@ -140,7 +140,7 @@ static void prv_option_apps_menu_selection_will_change(OptionMenu *option_menu,
 
 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,
@@ -159,7 +159,7 @@ static void prv_push_apps_color_menu(SettingsThemesData *data) {
       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].dark, PBL_COLOR ? 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);
   }
@@ -168,13 +168,15 @@ static void prv_push_apps_color_menu(SettingsThemesData *data) {
 /////////////////////////////
 // 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].light);
+    shell_prefs_set_settings_menu_highlight_color(s_color_definitions[selection].dark);
   }
   app_window_stack_remove(&option_menu->window, true /* animated */);
 }
@@ -186,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].light;
+  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 = {
@@ -216,10 +218,10 @@ static void prv_push_settings_color_menu(SettingsThemesData *data) {
                                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].light, 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);
   }