update demoui assets

This commit is contained in:
lixianjing 2023-08-24 18:05:12 +08:00
parent 40cad14e0d
commit 7b42cfa060
3 changed files with 3 additions and 356 deletions

View File

@ -83,8 +83,6 @@
#include "../res/assets/default/inc/images/uiex_editor_TextUnderscore.res"
#include "../res/assets/default/inc/images/uiex_keyboard_backspace_n.res"
#include "../res/assets/default/inc/images/uiex_keyboard_backspace_p.res"
#include "../res/assets/default/inc/images/uiex_keyboard_CN.res"
#include "../res/assets/default/inc/images/uiex_keyboard_EN.res"
#include "../res/assets/default/inc/images/uiex_loading_repeat_bg.res"
#include "../res/assets/default/inc/images/uiex_logo.res"
#include "../res/assets/default/inc/images/uiex_Portraitmenu_n.res"
@ -197,8 +195,6 @@ ret_t assets_init_default(void) {
assets_manager_add(am, image_uiex_editor_TextUnderscore);
assets_manager_add(am, image_uiex_keyboard_backspace_n);
assets_manager_add(am, image_uiex_keyboard_backspace_p);
assets_manager_add(am, image_uiex_keyboard_CN);
assets_manager_add(am, image_uiex_keyboard_EN);
assets_manager_add(am, image_uiex_loading_repeat_bg);
assets_manager_add(am, image_uiex_logo);
assets_manager_add(am, image_uiex_Portraitmenu_n);
@ -231,239 +227,11 @@ ret_t assets_init_default(void) {
}
/*** default end ***/
/*** dark ***/
#ifndef WITH_FS_RES
extern TK_CONST_DATA_ALIGN(const unsigned char strings_en_US[]);
#include "../res/assets/dark/inc/styles/uiex.data"
#include "../res/assets/dark/inc/styles/uiex_dialog_confirm.data"
#include "../res/assets/dark/inc/styles/uiex_dialog_info.data"
#include "../res/assets/dark/inc/styles/uiex_dialog_warn.data"
#include "../res/assets/dark/inc/styles/uiex_keyboard.data"
extern TK_CONST_DATA_ALIGN(const unsigned char style_dialog_toast[]);
extern TK_CONST_DATA_ALIGN(const unsigned char ui_uiex_dlg_center_scale[]);
extern TK_CONST_DATA_ALIGN(const unsigned char ui_uiex_dlg_fade[]);
extern TK_CONST_DATA_ALIGN(const unsigned char ui_uiex_dlg_popdown[]);
extern TK_CONST_DATA_ALIGN(const unsigned char ui_uiex_dlg_popup[]);
extern TK_CONST_DATA_ALIGN(const unsigned char ui_uiex_htranslate[]);
extern TK_CONST_DATA_ALIGN(const unsigned char ui_uiex_kb_ascii[]);
extern TK_CONST_DATA_ALIGN(const unsigned char ui_uiex_kb_default[]);
extern TK_CONST_DATA_ALIGN(const unsigned char ui_uiex_kb_foo[]);
extern TK_CONST_DATA_ALIGN(const unsigned char ui_uiex_kb_uint[]);
extern TK_CONST_DATA_ALIGN(const unsigned char ui_uiex_menu_bar[]);
extern TK_CONST_DATA_ALIGN(const unsigned char ui_uiex_menu_landscape[]);
extern TK_CONST_DATA_ALIGN(const unsigned char ui_uiex_overlay[]);
extern TK_CONST_DATA_ALIGN(const unsigned char ui_uiex_page_animate[]);
extern TK_CONST_DATA_ALIGN(const unsigned char ui_uiex_page_button[]);
extern TK_CONST_DATA_ALIGN(const unsigned char ui_uiex_page_chart[]);
extern TK_CONST_DATA_ALIGN(const unsigned char ui_uiex_page_checkbox[]);
extern TK_CONST_DATA_ALIGN(const unsigned char ui_uiex_page_color[]);
extern TK_CONST_DATA_ALIGN(const unsigned char ui_uiex_page_date_time[]);
extern TK_CONST_DATA_ALIGN(const unsigned char ui_uiex_page_edit[]);
extern TK_CONST_DATA_ALIGN(const unsigned char ui_uiex_page_label[]);
extern TK_CONST_DATA_ALIGN(const unsigned char ui_uiex_page_layout[]);
extern TK_CONST_DATA_ALIGN(const unsigned char ui_uiex_page_mledit[]);
extern TK_CONST_DATA_ALIGN(const unsigned char ui_uiex_page_progress[]);
extern TK_CONST_DATA_ALIGN(const unsigned char ui_uiex_page_selector[]);
extern TK_CONST_DATA_ALIGN(const unsigned char ui_uiex_page_slider[]);
extern TK_CONST_DATA_ALIGN(const unsigned char ui_uiex_page_tab_ctrl[]);
extern TK_CONST_DATA_ALIGN(const unsigned char ui_uiex_page_window[]);
extern TK_CONST_DATA_ALIGN(const unsigned char ui_uiex_popup[]);
extern TK_CONST_DATA_ALIGN(const unsigned char ui_uiex_preload[]);
extern TK_CONST_DATA_ALIGN(const unsigned char ui_uiex_sysbar_landscape[]);
extern TK_CONST_DATA_ALIGN(const unsigned char ui_uiex_sysbar_portrait[]);
extern TK_CONST_DATA_ALIGN(const unsigned char ui_uiex_vtranslate[]);
#ifdef WITH_STB_IMAGE
#include "../res/assets/dark/inc/images/uiex_arrow_down_n.res"
#include "../res/assets/dark/inc/images/uiex_arrow_down_p.res"
#include "../res/assets/dark/inc/images/uiex_arrow_up_n.res"
#include "../res/assets/dark/inc/images/uiex_arrow_up_p.res"
#include "../res/assets/dark/inc/images/uiex_button_Empty.res"
#include "../res/assets/dark/inc/images/uiex_button_Export.res"
#include "../res/assets/dark/inc/images/uiex_button_Import.res"
#include "../res/assets/dark/inc/images/uiex_button_search.res"
#include "../res/assets/dark/inc/images/uiex_button_time.res"
#include "../res/assets/dark/inc/images/uiex_check_checked_d.res"
#include "../res/assets/dark/inc/images/uiex_check_checked_n.res"
#include "../res/assets/dark/inc/images/uiex_check_checked_p.res"
#include "../res/assets/dark/inc/images/uiex_check_d.res"
#include "../res/assets/dark/inc/images/uiex_check_n.res"
#include "../res/assets/dark/inc/images/uiex_check_p.res"
#include "../res/assets/dark/inc/images/uiex_close_n.res"
#include "../res/assets/dark/inc/images/uiex_close_p.res"
#include "../res/assets/dark/inc/images/uiex_combobox_btn_d.res"
#include "../res/assets/dark/inc/images/uiex_combobox_btn_n.res"
#include "../res/assets/dark/inc/images/uiex_combobox_btn_p.res"
#include "../res/assets/dark/inc/images/uiex_editor_bgcolor.res"
#include "../res/assets/dark/inc/images/uiex_editor_Importpictures.res"
#include "../res/assets/dark/inc/images/uiex_editor_TextAlignBoth.res"
#include "../res/assets/dark/inc/images/uiex_editor_TextAlignleft.res"
#include "../res/assets/dark/inc/images/uiex_editor_TextAlignright.res"
#include "../res/assets/dark/inc/images/uiex_editor_TextBold.res"
#include "../res/assets/dark/inc/images/uiex_editor_TextCenteralignment.res"
#include "../res/assets/dark/inc/images/uiex_editor_Textcolor.res"
#include "../res/assets/dark/inc/images/uiex_editor_TextItalic.res"
#include "../res/assets/dark/inc/images/uiex_editor_TextLinespacing.res"
#include "../res/assets/dark/inc/images/uiex_editor_TextUnderscore.res"
#include "../res/assets/dark/inc/images/uiex_keyboard_backspace_n.res"
#include "../res/assets/dark/inc/images/uiex_keyboard_backspace_p.res"
#include "../res/assets/dark/inc/images/uiex_keyboard_CN.res"
#include "../res/assets/dark/inc/images/uiex_keyboard_EN.res"
#include "../res/assets/dark/inc/images/uiex_logo.res"
#include "../res/assets/dark/inc/images/uiex_Portraitmenu_n.res"
#include "../res/assets/dark/inc/images/uiex_Portraitmenu_p.res"
#include "../res/assets/dark/inc/images/uiex_radio_checked_d.res"
#include "../res/assets/dark/inc/images/uiex_radio_checked_n.res"
#include "../res/assets/dark/inc/images/uiex_radio_checked_p.res"
#include "../res/assets/dark/inc/images/uiex_radio_d.res"
#include "../res/assets/dark/inc/images/uiex_radio_n.res"
#include "../res/assets/dark/inc/images/uiex_radio_p.res"
#include "../res/assets/dark/inc/images/uiex_shift.res"
#include "../res/assets/dark/inc/images/uiex_shifton.res"
#include "../res/assets/dark/inc/images/uiex_texteditorhide.res"
#include "../res/assets/dark/inc/images/uiex_texteditor_show.res"
extern TK_CONST_DATA_ALIGN(const unsigned char image_uiex_Boot_loading[]);
extern TK_CONST_DATA_ALIGN(const unsigned char image_uiex_check[]);
extern TK_CONST_DATA_ALIGN(const unsigned char image_uiex_Coverwindow[]);
extern TK_CONST_DATA_ALIGN(const unsigned char image_uiex_loading_repeat_bg[]);
extern TK_CONST_DATA_ALIGN(const unsigned char image_uiex_Sliding_dot[]);
extern TK_CONST_DATA_ALIGN(const unsigned char image_uiex_Sliding_Square[]);
extern TK_CONST_DATA_ALIGN(const unsigned char image_uiex_switch[]);
extern TK_CONST_DATA_ALIGN(const unsigned char image_uiex_Windowclosed_n[]);
extern TK_CONST_DATA_ALIGN(const unsigned char image_uiex_Windowclosed_p[]);
#else
#endif /*WITH_STB_IMAGE*/
#ifdef WITH_VGCANVAS
#endif /*WITH_VGCANVAS*/
#ifdef WITH_TRUETYPE_FONT
extern TK_CONST_DATA_ALIGN(const unsigned char font_default[]);
#else /*WITH_TRUETYPE_FONT*/
#endif /*WITH_TRUETYPE_FONT*/
#endif /*WITH_FS_RES*/
ret_t assets_init_dark(void) {
assets_manager_t* am = assets_manager();
assets_manager_set_theme(am, "dark");
#ifdef WITH_FS_RES
assets_manager_preload(am, ASSET_TYPE_FONT, "default");
assets_manager_preload(am, ASSET_TYPE_STYLE, "default");
#else
assets_manager_add(am, strings_en_US);
assets_manager_add(am, style_uiex_dark);
assets_manager_add(am, style_uiex_dialog_confirm_dark);
assets_manager_add(am, style_uiex_dialog_info_dark);
assets_manager_add(am, style_uiex_dialog_warn_dark);
assets_manager_add(am, style_uiex_keyboard_dark);
assets_manager_add(am, style_dialog_toast);
assets_manager_add(am, ui_uiex_dlg_center_scale);
assets_manager_add(am, ui_uiex_dlg_fade);
assets_manager_add(am, ui_uiex_dlg_popdown);
assets_manager_add(am, ui_uiex_dlg_popup);
assets_manager_add(am, ui_uiex_htranslate);
assets_manager_add(am, ui_uiex_kb_ascii);
assets_manager_add(am, ui_uiex_kb_default);
assets_manager_add(am, ui_uiex_kb_foo);
assets_manager_add(am, ui_uiex_kb_uint);
assets_manager_add(am, ui_uiex_menu_bar);
assets_manager_add(am, ui_uiex_menu_landscape);
assets_manager_add(am, ui_uiex_overlay);
assets_manager_add(am, ui_uiex_page_animate);
assets_manager_add(am, ui_uiex_page_button);
assets_manager_add(am, ui_uiex_page_chart);
assets_manager_add(am, ui_uiex_page_checkbox);
assets_manager_add(am, ui_uiex_page_color);
assets_manager_add(am, ui_uiex_page_date_time);
assets_manager_add(am, ui_uiex_page_edit);
assets_manager_add(am, ui_uiex_page_label);
assets_manager_add(am, ui_uiex_page_layout);
assets_manager_add(am, ui_uiex_page_mledit);
assets_manager_add(am, ui_uiex_page_progress);
assets_manager_add(am, ui_uiex_page_selector);
assets_manager_add(am, ui_uiex_page_slider);
assets_manager_add(am, ui_uiex_page_tab_ctrl);
assets_manager_add(am, ui_uiex_page_window);
assets_manager_add(am, ui_uiex_popup);
assets_manager_add(am, ui_uiex_preload);
assets_manager_add(am, ui_uiex_sysbar_landscape);
assets_manager_add(am, ui_uiex_sysbar_portrait);
assets_manager_add(am, ui_uiex_vtranslate);
assets_manager_add(am, image_uiex_arrow_down_n_dark);
assets_manager_add(am, image_uiex_arrow_down_p_dark);
assets_manager_add(am, image_uiex_arrow_up_n_dark);
assets_manager_add(am, image_uiex_arrow_up_p_dark);
assets_manager_add(am, image_uiex_button_Empty_dark);
assets_manager_add(am, image_uiex_button_Export_dark);
assets_manager_add(am, image_uiex_button_Import_dark);
assets_manager_add(am, image_uiex_button_search_dark);
assets_manager_add(am, image_uiex_button_time_dark);
assets_manager_add(am, image_uiex_check_checked_d_dark);
assets_manager_add(am, image_uiex_check_checked_n_dark);
assets_manager_add(am, image_uiex_check_checked_p_dark);
assets_manager_add(am, image_uiex_check_d_dark);
assets_manager_add(am, image_uiex_check_n_dark);
assets_manager_add(am, image_uiex_check_p_dark);
assets_manager_add(am, image_uiex_close_n_dark);
assets_manager_add(am, image_uiex_close_p_dark);
assets_manager_add(am, image_uiex_combobox_btn_d_dark);
assets_manager_add(am, image_uiex_combobox_btn_n_dark);
assets_manager_add(am, image_uiex_combobox_btn_p_dark);
assets_manager_add(am, image_uiex_editor_bgcolor_dark);
assets_manager_add(am, image_uiex_editor_Importpictures_dark);
assets_manager_add(am, image_uiex_editor_TextAlignBoth_dark);
assets_manager_add(am, image_uiex_editor_TextAlignleft_dark);
assets_manager_add(am, image_uiex_editor_TextAlignright_dark);
assets_manager_add(am, image_uiex_editor_TextBold_dark);
assets_manager_add(am, image_uiex_editor_TextCenteralignment_dark);
assets_manager_add(am, image_uiex_editor_Textcolor_dark);
assets_manager_add(am, image_uiex_editor_TextItalic_dark);
assets_manager_add(am, image_uiex_editor_TextLinespacing_dark);
assets_manager_add(am, image_uiex_editor_TextUnderscore_dark);
assets_manager_add(am, image_uiex_keyboard_backspace_n_dark);
assets_manager_add(am, image_uiex_keyboard_backspace_p_dark);
assets_manager_add(am, image_uiex_keyboard_CN_dark);
assets_manager_add(am, image_uiex_keyboard_EN_dark);
assets_manager_add(am, image_uiex_logo_dark);
assets_manager_add(am, image_uiex_Portraitmenu_n_dark);
assets_manager_add(am, image_uiex_Portraitmenu_p_dark);
assets_manager_add(am, image_uiex_radio_checked_d_dark);
assets_manager_add(am, image_uiex_radio_checked_n_dark);
assets_manager_add(am, image_uiex_radio_checked_p_dark);
assets_manager_add(am, image_uiex_radio_d_dark);
assets_manager_add(am, image_uiex_radio_n_dark);
assets_manager_add(am, image_uiex_radio_p_dark);
assets_manager_add(am, image_uiex_shift_dark);
assets_manager_add(am, image_uiex_shifton_dark);
assets_manager_add(am, image_uiex_texteditorhide_dark);
assets_manager_add(am, image_uiex_texteditor_show_dark);
assets_manager_add(am, image_uiex_Boot_loading);
assets_manager_add(am, image_uiex_check);
assets_manager_add(am, image_uiex_Coverwindow);
assets_manager_add(am, image_uiex_loading_repeat_bg);
assets_manager_add(am, image_uiex_Sliding_dot);
assets_manager_add(am, image_uiex_Sliding_Square);
assets_manager_add(am, image_uiex_switch);
assets_manager_add(am, image_uiex_Windowclosed_n);
assets_manager_add(am, image_uiex_Windowclosed_p);
#ifdef WITH_VGCANVAS
#endif /*WITH_VGCANVAS*/
#ifdef WITH_TRUETYPE_FONT
assets_manager_add(am, font_default);
#else /*WITH_TRUETYPE_FONT*/
#endif /*WITH_TRUETYPE_FONT*/
#endif
tk_init_assets();
return RET_OK;
}
/*** dark end ***/
bool_t assets_has_theme(const char* name) {
return_value_if_fail(name != NULL, FALSE);
if (tk_str_eq(name, "default")) {
return TRUE;
} else if (tk_str_eq(name, "dark")) {
return TRUE;
} else {
return FALSE;
}
@ -477,8 +245,6 @@ static ret_t assets_init_internal(const char* theme) {
if (tk_str_eq(theme, "default")) {
return assets_init_default();
} else if (tk_str_eq(theme, "dark")) {
return assets_init_dark();
} else {
log_debug("%s not support.\n", theme);
return RET_NOT_IMPL;

View File

@ -9,11 +9,8 @@
#include "../res/assets/default/inc/styles/edit.data"
#include "../res/assets/default/inc/styles/keyboard.data"
#include "../res/assets/default/inc/styles/color.data"
#include "../res/assets/default/inc/styles/tab_bottom.data"
#include "../res/assets/default/inc/styles/calibration.data"
#include "../res/assets/default/inc/styles/tab_list.data"
#include "../res/assets/default/inc/styles/default.data"
#include "../res/assets/default/inc/styles/tab_top_compact.data"
#include "../res/assets/default/inc/styles/dialog_info.data"
#include "../res/assets/default/inc/styles/gauge.data"
#include "../res/assets/default/inc/styles/dialog_confirm.data"
@ -21,21 +18,15 @@
#include "../res/assets/default/inc/styles/tab_top.data"
#include "../res/assets/default/inc/styles/button.data"
#include "../res/assets/default/inc/styles/system_bar.data"
#include "../res/assets/default/inc/styles/tab_bottom_compact.data"
#include "../res/assets/default/inc/styles/dialog_warn.data"
#include "../res/assets/default/inc/ui/kb_ascii.data"
#include "../res/assets/default/inc/ui/vgcanvas.data"
#include "../res/assets/default/inc/ui/slide_menu.data"
#include "../res/assets/default/inc/ui/radial_gradient.data"
#include "../res/assets/default/inc/ui/auto_play_landscape.data"
#include "../res/assets/default/inc/ui/color_picker_simple.data"
#include "../res/assets/default/inc/ui/progress_circle.data"
#include "../res/assets/default/inc/ui/combo_box.data"
#include "../res/assets/default/inc/ui/kb_phone.data"
#include "../res/assets/default/inc/ui/main.data"
#include "../res/assets/default/inc/ui/digit_clock.data"
#include "../res/assets/default/inc/ui/scroll_bar.data"
#include "../res/assets/default/inc/ui/lua.data"
#include "../res/assets/default/inc/ui/linear_gradient.data"
#include "../res/assets/default/inc/ui/preload.data"
#include "../res/assets/default/inc/ui/images.data"
@ -44,32 +35,17 @@
#include "../res/assets/default/inc/ui/locale.data"
#include "../res/assets/default/inc/ui/kb_int.data"
#include "../res/assets/default/inc/ui/tab_control.data"
#include "../res/assets/default/inc/ui/slide_view_v2.data"
#include "../res/assets/default/inc/ui/animation.data"
#include "../res/assets/default/inc/ui/keyboard.data"
#include "../res/assets/default/inc/ui/kb_hex.data"
#include "../res/assets/default/inc/ui/popdown.data"
#include "../res/assets/default/inc/ui/color.data"
#include "../res/assets/default/inc/ui/color_picker.data"
#include "../res/assets/default/inc/ui/switch.data"
#include "../res/assets/default/inc/ui/dragger.data"
#include "../res/assets/default/inc/ui/dialog2.data"
#include "../res/assets/default/inc/ui/color_picker_hsv.data"
#include "../res/assets/default/inc/ui/tab_bottom.data"
#include "../res/assets/default/inc/ui/list_view_m.data"
#include "../res/assets/default/inc/ui/slide_view_h_loop.data"
#include "../res/assets/default/inc/ui/calibration_win.data"
#include "../res/assets/default/inc/ui/memtest.data"
#include "../res/assets/default/inc/ui/slide_view_h2.data"
#include "../res/assets/default/inc/ui/slide_view_v_loop.data"
#include "../res/assets/default/inc/ui/language.data"
#include "../res/assets/default/inc/ui/kb_float.data"
#include "../res/assets/default/inc/ui/htranslate.data"
#include "../res/assets/default/inc/ui/list_view_vh.data"
#include "../res/assets/default/inc/ui/rich_text.data"
#include "../res/assets/default/inc/ui/scroll_view.data"
#include "../res/assets/default/inc/ui/svg_image.data"
#include "../res/assets/default/inc/ui/tab_list.data"
#include "../res/assets/default/inc/ui/animator.data"
#include "../res/assets/default/inc/ui/slide_down.data"
#include "../res/assets/default/inc/ui/scroll_view_h.data"
@ -77,40 +53,24 @@
#include "../res/assets/default/inc/ui/scroll_bar_h.data"
#include "../res/assets/default/inc/ui/spinbox.data"
#include "../res/assets/default/inc/ui/label.data"
#include "../res/assets/default/inc/ui/gif_image.data"
#include "../res/assets/default/inc/ui/text_selector.data"
#include "../res/assets/default/inc/ui/tab_top_compact.data"
#include "../res/assets/default/inc/ui/slide_view_h.data"
#include "../res/assets/default/inc/ui/dialogs.data"
#include "../res/assets/default/inc/ui/list_view.data"
#include "../res/assets/default/inc/ui/stroke_gradient.data"
#include "../res/assets/default/inc/ui/slide_view_h1.data"
#include "../res/assets/default/inc/ui/basic.data"
#include "../res/assets/default/inc/ui/gauge.data"
#include "../res/assets/default/inc/ui/color_picker_full.data"
#include "../res/assets/default/inc/ui/dialog1.data"
#include "../res/assets/default/inc/ui/fade.data"
#include "../res/assets/default/inc/ui/image_list.data"
#include "../res/assets/default/inc/ui/slide_view_v1.data"
#include "../res/assets/default/inc/ui/slide_left.data"
#include "../res/assets/default/inc/ui/image_value.data"
#include "../res/assets/default/inc/ui/slide_view.data"
#include "../res/assets/default/inc/ui/time_clock.data"
#include "../res/assets/default/inc/ui/tab_top.data"
#include "../res/assets/default/inc/ui/tab_top_compact.data"
#include "../res/assets/default/inc/ui/slide_view_v.data"
#include "../res/assets/default/inc/ui/button.data"
#include "../res/assets/default/inc/ui/system_bar.data"
#include "../res/assets/default/inc/ui/list_view_d.data"
#include "../res/assets/default/inc/ui/vtranslate.data"
#include "../res/assets/default/inc/ui/kb_ufloat.data"
#include "../res/assets/default/inc/ui/kb_default.data"
#include "../res/assets/default/inc/ui/slide_up.data"
#include "../res/assets/default/inc/ui/rich_text2.data"
#include "../res/assets/default/inc/ui/list_view_h.data"
#include "../res/assets/default/inc/ui/color_picker_rgb.data"
#include "../res/assets/default/inc/ui/tab_bottom_compact.data"
#include "../res/assets/default/inc/ui/popup.data"
#include "../res/assets/default/inc/ui/kb_uint.data"
#include "../res/assets/default/inc/ui/scroll_view_v.data"
#include "../res/assets/default/inc/xml/test.data"
#ifdef WITH_STB_IMAGE
@ -119,56 +79,40 @@
#include "../res/assets/default/inc/images/close_p.res"
#include "../res/assets/default/inc/images/num_6.res"
#include "../res/assets/default/inc/images/shift.res"
#include "../res/assets/default/inc/images/contact.res"
#include "../res/assets/default/inc/images/battery_4.res"
#include "../res/assets/default/inc/images/num_4.res"
#include "../res/assets/default/inc/images/slider_fg.res"
#include "../res/assets/default/inc/images/contact_active.res"
#include "../res/assets/default/inc/images/close_d.res"
#include "../res/assets/default/inc/images/dialog_title.res"
#include "../res/assets/default/inc/images/battery_5.res"
#include "../res/assets/default/inc/images/num_5.res"
#include "../res/assets/default/inc/images/me_active.res"
#include "../res/assets/default/inc/images/arrow_up_n.res"
#include "../res/assets/default/inc/images/left_on.res"
#include "../res/assets/default/inc/images/num_1.res"
#include "../res/assets/default/inc/images/battery_1.res"
#include "../res/assets/default/inc/images/arrow_right_p.res"
#include "../res/assets/default/inc/images/slider_v_fg.res"
#include "../res/assets/default/inc/images/empty.res"
#include "../res/assets/default/inc/images/rgba.res"
#include "../res/assets/default/inc/images/num_0.res"
#include "../res/assets/default/inc/images/battery_0.res"
#include "../res/assets/default/inc/images/edit_clear_p.res"
#include "../res/assets/default/inc/images/arrow_up_o.res"
#include "../res/assets/default/inc/images/visible.res"
#include "../res/assets/default/inc/images/arrow_left_o.res"
#include "../res/assets/default/inc/images/clock_second.res"
#include "../res/assets/default/inc/images/battery_2.res"
#include "../res/assets/default/inc/images/num_2.res"
#include "../res/assets/default/inc/images/en.res"
#include "../res/assets/default/inc/images/slider_drag_o.res"
#include "../res/assets/default/inc/images/battery_3.res"
#include "../res/assets/default/inc/images/num_3.res"
#include "../res/assets/default/inc/images/arrow_left_n.res"
#include "../res/assets/default/inc/images/middle_on.res"
#include "../res/assets/default/inc/images/bricks.res"
#include "../res/assets/default/inc/images/play_o.res"
#include "../res/assets/default/inc/images/play_n.res"
#include "../res/assets/default/inc/images/msg_active.res"
#include "../res/assets/default/inc/images/radio_checked.res"
#include "../res/assets/default/inc/images/active_dot.res"
#include "../res/assets/default/inc/images/question.res"
#include "../res/assets/default/inc/images/discovery_active.res"
#include "../res/assets/default/inc/images/dot.res"
#include "../res/assets/default/inc/images/shifton.res"
#include "../res/assets/default/inc/images/check.res"
#include "../res/assets/default/inc/images/cursor.res"
#include "../res/assets/default/inc/images/me.res"
#include "../res/assets/default/inc/images/red_btn_p.res"
#include "../res/assets/default/inc/images/middle_off.res"
#include "../res/assets/default/inc/images/arrow_down_n.res"
#include "../res/assets/default/inc/images/green_btn_o.res"
#include "../res/assets/default/inc/images/green_btn_n.res"
#include "../res/assets/default/inc/images/muted.res"
#include "../res/assets/default/inc/images/arrow_down_o.res"
@ -182,26 +126,21 @@
#include "../res/assets/default/inc/images/right_on.res"
#include "../res/assets/default/inc/images/gauge_pointer.res"
#include "../res/assets/default/inc/images/left_off.res"
#include "../res/assets/default/inc/images/red_btn_o.res"
#include "../res/assets/default/inc/images/slider_drag.res"
#include "../res/assets/default/inc/images/unchecked.res"
#include "../res/assets/default/inc/images/red_btn_n.res"
#include "../res/assets/default/inc/images/arrow_down_p.res"
#include "../res/assets/default/inc/images/slider_v_bg.res"
#include "../res/assets/default/inc/images/green_btn_p.res"
#include "../res/assets/default/inc/images/switch.res"
#include "../res/assets/default/inc/images/radio_unchecked.res"
#include "../res/assets/default/inc/images/close_n.res"
#include "../res/assets/default/inc/images/close_o.res"
#include "../res/assets/default/inc/images/clock_minute.res"
#include "../res/assets/default/inc/images/cross.res"
#include "../res/assets/default/inc/images/clock.res"
#include "../res/assets/default/inc/images/find.res"
#include "../res/assets/default/inc/images/arrow_up_p.res"
#include "../res/assets/default/inc/images/edit_clear_o.res"
#include "../res/assets/default/inc/images/num_8.res"
#include "../res/assets/default/inc/images/arrow_right_n.res"
#include "../res/assets/default/inc/images/discovery.res"
#include "../res/assets/default/inc/images/arrow_right_o.res"
#include "../res/assets/default/inc/images/num_9.res"
#include "../res/assets/default/inc/images/edit_clear_n.res"
@ -210,7 +149,6 @@
#include "../res/assets/default/inc/images/slider_drag_p.res"
#include "../res/assets/default/inc/images/backspace.res"
#include "../res/assets/default/inc/images/arrow_left_p.res"
#include "../res/assets/default/inc/images/clock_hour.res"
#else
#include "../res/assets/default/inc/images/arrow_right_o.data"
#include "../res/assets/default/inc/images/num_4.data"
@ -332,19 +270,14 @@ ret_t assets_init(void) {
assets_manager_load(am, ASSET_TYPE_FONT, "default");
assets_manager_load(am, ASSET_TYPE_STYLE, "default");
#else
assets_manager_add(am, ui_kb_ascii);
assets_manager_add(am, ui_vgcanvas);
assets_manager_add(am, ui_slide_menu);
assets_manager_add(am, ui_radial_gradient);
assets_manager_add(am, ui_auto_play_landscape);
assets_manager_add(am, ui_color_picker_simple);
assets_manager_add(am, ui_progress_circle);
assets_manager_add(am, ui_combo_box);
assets_manager_add(am, ui_kb_phone);
assets_manager_add(am, ui_main);
assets_manager_add(am, ui_digit_clock);
assets_manager_add(am, ui_scroll_bar);
assets_manager_add(am, ui_lua);
assets_manager_add(am, ui_linear_gradient);
assets_manager_add(am, ui_preload);
assets_manager_add(am, ui_images);
@ -353,30 +286,17 @@ ret_t assets_init(void) {
assets_manager_add(am, ui_locale);
assets_manager_add(am, ui_kb_int);
assets_manager_add(am, ui_tab_control);
assets_manager_add(am, ui_slide_view_v2);
assets_manager_add(am, ui_animation);
assets_manager_add(am, ui_keyboard);
assets_manager_add(am, ui_kb_hex);
assets_manager_add(am, ui_popdown);
assets_manager_add(am, ui_color);
assets_manager_add(am, ui_color_picker);
assets_manager_add(am, ui_switch);
assets_manager_add(am, ui_dragger);
assets_manager_add(am, ui_dialog2);
assets_manager_add(am, ui_color_picker_hsv);
assets_manager_add(am, ui_tab_bottom);
assets_manager_add(am, ui_list_view_m);
assets_manager_add(am, ui_calibration_win);
assets_manager_add(am, ui_memtest);
assets_manager_add(am, ui_slide_view_h2);
assets_manager_add(am, ui_language);
assets_manager_add(am, ui_kb_float);
assets_manager_add(am, ui_htranslate);
assets_manager_add(am, ui_list_view_vh);
assets_manager_add(am, ui_rich_text);
assets_manager_add(am, ui_scroll_view);
assets_manager_add(am, ui_svg_image);
assets_manager_add(am, ui_tab_list);
assets_manager_add(am, ui_animator);
assets_manager_add(am, ui_slide_down);
assets_manager_add(am, ui_scroll_view_h);
@ -384,57 +304,39 @@ ret_t assets_init(void) {
assets_manager_add(am, ui_scroll_bar_h);
assets_manager_add(am, ui_spinbox);
assets_manager_add(am, ui_label);
assets_manager_add(am, ui_gif_image);
assets_manager_add(am, ui_text_selector);
assets_manager_add(am, ui_tab_top_compact);
assets_manager_add(am, ui_slide_view_h);
assets_manager_add(am, ui_dialogs);
assets_manager_add(am, ui_list_view);
assets_manager_add(am, ui_stroke_gradient);
assets_manager_add(am, ui_slide_view_h1);
assets_manager_add(am, ui_basic);
assets_manager_add(am, ui_gauge);
assets_manager_add(am, ui_color_picker_full);
assets_manager_add(am, ui_dialog1);
assets_manager_add(am, ui_fade);
assets_manager_add(am, ui_slide_view_v1);
assets_manager_add(am, ui_slide_left);
assets_manager_add(am, ui_image_value);
assets_manager_add(am, ui_slide_view);
assets_manager_add(am, ui_time_clock);
assets_manager_add(am, ui_tab_top);
assets_manager_add(am, ui_tab_top_compact);
assets_manager_add(am, ui_slide_view_v);
assets_manager_add(am, ui_button);
assets_manager_add(am, ui_system_bar);
assets_manager_add(am, ui_list_view_d);
assets_manager_add(am, ui_vtranslate);
assets_manager_add(am, ui_kb_ufloat);
assets_manager_add(am, ui_kb_default);
assets_manager_add(am, ui_slide_up);
assets_manager_add(am, ui_list_view_h);
assets_manager_add(am, ui_color_picker_rgb);
assets_manager_add(am, ui_tab_bottom_compact);
assets_manager_add(am, ui_popup);
assets_manager_add(am, ui_kb_uint);
assets_manager_add(am, ui_scroll_view_v);
assets_manager_add(am, strings_zh_CN);
assets_manager_add(am, strings_en_US);
assets_manager_add(am, image_arrow_right_o);
assets_manager_add(am, image_num_4);
assets_manager_add(am, image_close_o);
assets_manager_add(am, image_battery_1);
assets_manager_add(am, image_slider_bg);
assets_manager_add(am, image_muted);
assets_manager_add(am, image_num_8);
assets_manager_add(am, image_shift);
assets_manager_add(am, image_arrow_up_p);
assets_manager_add(am, image_discovery_active);
assets_manager_add(am, image_right_on);
assets_manager_add(am, image_discovery);
assets_manager_add(am, image_rgb);
assets_manager_add(am, image_num_9);
assets_manager_add(am, image_dot);
assets_manager_add(am, image_battery_0);
assets_manager_add(am, image_find);
assets_manager_add(am, image_slider_fg);
assets_manager_add(am, image_close_n);
@ -445,9 +347,7 @@ ret_t assets_init(void) {
assets_manager_add(am, image_num_dot);
assets_manager_add(am, image_arrow_right_n);
assets_manager_add(am, image_visible);
assets_manager_add(am, image_me_active);
assets_manager_add(am, image_cursor);
assets_manager_add(am, image_clock_minute);
assets_manager_add(am, image_switch);
assets_manager_add(am, image_checked);
assets_manager_add(am, image_middle_off);
@ -455,7 +355,6 @@ ret_t assets_init(void) {
assets_manager_add(am, image_arrow_right_p);
assets_manager_add(am, image_num_2);
assets_manager_add(am, image_arrow_up_o);
assets_manager_add(am, image_clock);
assets_manager_add(am, image_empty);
assets_manager_add(am, image_left_off);
assets_manager_add(am, image_radio_unchecked);
@ -463,7 +362,6 @@ ret_t assets_init(void) {
assets_manager_add(am, image_shifton);
assets_manager_add(am, image_arrow_up_n);
assets_manager_add(am, image_num_3);
assets_manager_add(am, image_msg_active);
assets_manager_add(am, image_active_dot);
assets_manager_add(am, image_gauge_pointer);
assets_manager_add(am, image_close_d);
@ -473,24 +371,15 @@ ret_t assets_init(void) {
assets_manager_add(am, image_backspace);
assets_manager_add(am, image_arrow_left_p);
assets_manager_add(am, image_edit_clear_n);
assets_manager_add(am, image_clock_second);
assets_manager_add(am, image_contact);
assets_manager_add(am, image_bricks);
assets_manager_add(am, image_dialog_title);
assets_manager_add(am, image_play_p);
assets_manager_add(am, image_battery_5);
assets_manager_add(am, image_green_btn_p);
assets_manager_add(am, image_red_btn_p);
assets_manager_add(am, image_me);
assets_manager_add(am, image_num_0);
assets_manager_add(am, image_arrow_down_p);
assets_manager_add(am, image_num_1);
assets_manager_add(am, image_contact_active);
assets_manager_add(am, image_slider_drag_o);
assets_manager_add(am, image_battery_4);
assets_manager_add(am, image_message);
assets_manager_add(am, image_edit_clear_o);
assets_manager_add(am, image_battery_3);
assets_manager_add(am, image_logo);
assets_manager_add(am, image_arrow_left_o);
assets_manager_add(am, image_num_6);
@ -498,11 +387,7 @@ ret_t assets_init(void) {
assets_manager_add(am, image_middle_on);
assets_manager_add(am, image_arrow_down_o);
assets_manager_add(am, image_radio_checked);
assets_manager_add(am, image_red_btn_o);
assets_manager_add(am, image_green_btn_o);
assets_manager_add(am, image_slider_v_bg);
assets_manager_add(am, image_clock_hour);
assets_manager_add(am, image_play_o);
assets_manager_add(am, image_play_n);
assets_manager_add(am, image_slider_drag);
assets_manager_add(am, image_unchecked);
@ -514,7 +399,6 @@ ret_t assets_init(void) {
assets_manager_add(am, image_num_7);
assets_manager_add(am, image_arrow_left_n);
assets_manager_add(am, image_edit_clear_p);
assets_manager_add(am, image_battery_2);
assets_manager_add(am, xml_test);
assets_manager_add(am, style_slide_menu);
assets_manager_add(am, style_digit_clock);
@ -522,11 +406,8 @@ ret_t assets_init(void) {
assets_manager_add(am, style_edit);
assets_manager_add(am, style_keyboard);
assets_manager_add(am, style_color);
assets_manager_add(am, style_tab_bottom);
assets_manager_add(am, style_calibration);
assets_manager_add(am, style_tab_list);
assets_manager_add(am, style_default);
assets_manager_add(am, style_tab_top_compact);
assets_manager_add(am, style_dialog_info);
assets_manager_add(am, style_gauge);
assets_manager_add(am, style_dialog_confirm);
@ -534,7 +415,6 @@ ret_t assets_init(void) {
assets_manager_add(am, style_tab_top);
assets_manager_add(am, style_button);
assets_manager_add(am, style_system_bar);
assets_manager_add(am, style_tab_bottom_compact);
assets_manager_add(am, style_dialog_warn);
assets_manager_add(am, font_default);
#ifdef WITH_VGCANVAS

View File

@ -2,6 +2,7 @@
2023/08/24
* 完善wasm helper
* 修复字符串为中文的时候判断是否为空格时候会断言问(感谢智明提供补丁)
* 完善demoui/demouiold的资源(感谢泽武提供补丁)
2023/08/23
* 修复控件动画的回调函数收到注册顺序影响(感谢智明提供补丁)