diff --git a/intl/msg_hash_us.c b/intl/msg_hash_us.c index 18f9ab41a4..639a6c9685 100644 --- a/intl/msg_hash_us.c +++ b/intl/msg_hash_us.c @@ -2129,6 +2129,8 @@ const char *msg_hash_to_str_us(enum msg_hash_enums msg) return "Red"; case MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_YELLOW: return "Yellow"; + case MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_NVIDIA_SHIELD: + return "Shield"; case MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_GREEN: return "Green"; case MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_DARK_BLUE: diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c index 3d69a76a55..f8f7893813 100644 --- a/menu/cbs/menu_cbs_get_value.c +++ b/menu/cbs/menu_cbs_get_value.c @@ -821,6 +821,11 @@ static void menu_action_setting_disp_set_label_materialui_menu_color_theme( msg_hash_to_str( MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_DARK_BLUE), len); break; + case MATERIALUI_THEME_NVIDIA_SHIELD: + strlcpy(s, + msg_hash_to_str( + MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_NVIDIA_SHIELD), len); + break; default: break; } diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c index d0670e6ec0..d27c753a4d 100644 --- a/menu/drivers/materialui.c +++ b/menu/drivers/materialui.c @@ -799,6 +799,9 @@ static void mui_frame(void *data) float blue_grey_500[16] = {0}; float blue_grey_50[16] = {0}; float yellow_200[16] = {0}; + float color_nv_header[16] = {0}; + float color_nv_body[16] = {0}; + float color_nv_accent[16] = {0}; unsigned width = 0; unsigned height = 0; unsigned ticker_limit = 0; @@ -846,6 +849,9 @@ static void mui_frame(void *data) hex32_to_rgba_normalized(0x607D8B, blue_grey_500, 1.00); hex32_to_rgba_normalized(0xCFD8DC, blue_grey_50, 0.90); hex32_to_rgba_normalized(0xC8E6C9, green_50, 0.90); + hex32_to_rgba_normalized(0x282F37, color_nv_header,1.00); + hex32_to_rgba_normalized(0x202427, color_nv_body, 1.00); + hex32_to_rgba_normalized(0x77B900, color_nv_accent,1.00); clearcolor.r = 1.0f; clearcolor.g = 1.0f; @@ -915,9 +921,23 @@ static void mui_frame(void *data) TODO/FIXME - Maybe make this track the footer's bg color or vice-versa e.g. clearcolor.r = &footer_bg_color[0]; clearcolor.g = &footer_bg_color[4]; */ - clearcolor.r = 0.13f; - clearcolor.g = 0.13f; - clearcolor.b = 0.13f; + clearcolor.r = 0.13f; + clearcolor.g = 0.13f; + clearcolor.b = 0.13f; + break; + case MATERIALUI_THEME_NVIDIA_SHIELD: + header_bg_color = color_nv_header; + body_bg_color = color_nv_body; + highlighted_entry_color = color_nv_accent; + footer_bg_color = color_nv_body; + active_tab_marker_color = color_nv_accent; + + font_normal_color = 0xbbc0c4ff; + font_hover_color = 0xffffffff; + + clearcolor.r = color_nv_body[0]; + clearcolor.g = color_nv_body[1]; + clearcolor.b = color_nv_body[2]; break; } diff --git a/menu/menu_display.h b/menu/menu_display.h index cc4212645d..39aae6603c 100644 --- a/menu/menu_display.h +++ b/menu/menu_display.h @@ -36,7 +36,8 @@ enum materialui_color_theme MATERIALUI_THEME_DARK_BLUE, MATERIALUI_THEME_GREEN, MATERIALUI_THEME_RED, - MATERIALUI_THEME_YELLOW + MATERIALUI_THEME_YELLOW, + MATERIALUI_THEME_NVIDIA_SHIELD }; enum menu_display_prim_type diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 1f39e8a956..6fa532a62f 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -6964,7 +6964,7 @@ static bool setting_append_list( parent_group, general_write_handler, general_read_handler); - menu_settings_list_current_add_range(list, list_info, 0, 5, 1, true, true); + menu_settings_list_current_add_range(list, list_info, 0, 6, 1, true, true); menu_settings_list_current_add_enum_idx(list, list_info, MENU_ENUM_LABEL_MATERIALUI_MENU_COLOR_THEME); } diff --git a/msg_hash.h b/msg_hash.h index 50908eca04..d61cbea71c 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -309,6 +309,7 @@ enum msg_hash_enums MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_RED, MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_GREEN, MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_YELLOW, + MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_NVIDIA_SHIELD, MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_DARK_BLUE, MENU_ENUM_LABEL_VALUE_INPUT_POLL_TYPE_BEHAVIOR_LATE,