diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ae3f9b..a993975 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,10 @@ ### Enhancements: +* feat(assets): update large images * feat(phone): support 24h format for clock of status bar * feat(phone): disable manager gesture navigation back by default +* feat(phone): add stylesheet 720x1280 ### Bugfixes: diff --git a/docs/_static/tools/stylesheet_calculator.xlsx b/docs/_static/tools/stylesheet_calculator.xlsx index 90759f9..c6f1989 100644 Binary files a/docs/_static/tools/stylesheet_calculator.xlsx and b/docs/_static/tools/stylesheet_calculator.xlsx differ diff --git a/docs/system_ui_phone.md b/docs/system_ui_phone.md index ef9cde8..99d503f 100644 --- a/docs/system_ui_phone.md +++ b/docs/system_ui_phone.md @@ -38,6 +38,7 @@ To achieve the best display performance at fixed resolutions, esp-brookesia also - [320 x 240](../src/systems/phone/stylesheets/320_240/) - [320 x 480](../src/systems/phone/stylesheets/320_480/) - [480 x 480](../src/systems/phone/stylesheets/480_480/) +- [720 x 1280](../src/systems/phone/stylesheets/720_1280/) - [800 x 480](../src/systems/phone/stylesheets/800_480/) - [800 x 1280](../src/systems/phone/stylesheets/800_1280/) - [1024 x 600](../src/systems/phone/stylesheets/1024_600/) diff --git a/docs/system_ui_phone_CN.md b/docs/system_ui_phone_CN.md index 12f095f..89ef607 100644 --- a/docs/system_ui_phone_CN.md +++ b/docs/system_ui_phone_CN.md @@ -38,6 +38,7 @@ - [320 x 240](../src/systems/phone/stylesheets/320_240/) - [320 x 480](../src/systems/phone/stylesheets/320_480/) - [480 x 480](../src/systems/phone/stylesheets/480_480/) +- [720 x 1280](../src/systems/phone/stylesheets/720_1280/) - [800 x 480](../src/systems/phone/stylesheets/800_480/) - [800 x 1280](../src/systems/phone/stylesheets/800_1280/) - [1024 x 600](../src/systems/phone/stylesheets/1024_600/) diff --git a/src/systems/phone/stylesheets/1024_600/dark/recents_screen_data.h b/src/systems/phone/stylesheets/1024_600/dark/recents_screen_data.h index ae5b638..5721810 100644 --- a/src/systems/phone/stylesheets/1024_600/dark/recents_screen_data.h +++ b/src/systems/phone/stylesheets/1024_600/dark/recents_screen_data.h @@ -52,7 +52,7 @@ extern "C" { .trash_icon = { \ .default_size = ESP_BROOKESIA_STYLE_SIZE_SQUARE(48), \ .press_size = ESP_BROOKESIA_STYLE_SIZE_SQUARE(43), \ - .image = ESP_BROOKESIA_STYLE_IMAGE(&esp_brookesia_image_large_recents_screen_trash_48_48), \ + .image = ESP_BROOKESIA_STYLE_IMAGE(&esp_brookesia_image_large_recents_screen_trash_64_64), \ }, \ .flags = { \ .enable_memory = 1, \ diff --git a/src/systems/phone/stylesheets/1024_600/dark/status_bar_data.h b/src/systems/phone/stylesheets/1024_600/dark/status_bar_data.h index 2a19fb0..2b27cf8 100644 --- a/src/systems/phone/stylesheets/1024_600/dark/status_bar_data.h +++ b/src/systems/phone/stylesheets/1024_600/dark/status_bar_data.h @@ -45,11 +45,11 @@ extern "C" { .icon = { \ .image_num = 5, \ .images = { \ - ESP_BROOKESIA_STYLE_IMAGE_RECOLOR_WHITE(&esp_brookesia_image_large_status_bar_battery_level1_28_28), \ - ESP_BROOKESIA_STYLE_IMAGE_RECOLOR_WHITE(&esp_brookesia_image_large_status_bar_battery_level2_28_28), \ - ESP_BROOKESIA_STYLE_IMAGE_RECOLOR_WHITE(&esp_brookesia_image_large_status_bar_battery_level3_28_28), \ - ESP_BROOKESIA_STYLE_IMAGE_RECOLOR_WHITE(&esp_brookesia_image_large_status_bar_battery_level4_28_28), \ - ESP_BROOKESIA_STYLE_IMAGE_RECOLOR_WHITE(&esp_brookesia_image_large_status_bar_battery_charge_28_28), \ + ESP_BROOKESIA_STYLE_IMAGE_RECOLOR_WHITE(&esp_brookesia_image_large_status_bar_battery_level1_36_36), \ + ESP_BROOKESIA_STYLE_IMAGE_RECOLOR_WHITE(&esp_brookesia_image_large_status_bar_battery_level2_36_36), \ + ESP_BROOKESIA_STYLE_IMAGE_RECOLOR_WHITE(&esp_brookesia_image_large_status_bar_battery_level3_36_36), \ + ESP_BROOKESIA_STYLE_IMAGE_RECOLOR_WHITE(&esp_brookesia_image_large_status_bar_battery_level4_36_36), \ + ESP_BROOKESIA_STYLE_IMAGE_RECOLOR_WHITE(&esp_brookesia_image_large_status_bar_battery_charge_36_36), \ }, \ }, \ }, \ @@ -60,10 +60,10 @@ extern "C" { .icon = { \ .image_num = 4, \ .images = { \ - ESP_BROOKESIA_STYLE_IMAGE_RECOLOR_WHITE(&esp_brookesia_image_large_status_bar_wifi_close_28_28), \ - ESP_BROOKESIA_STYLE_IMAGE_RECOLOR_WHITE(&esp_brookesia_image_large_status_bar_wifi_level1_28_28), \ - ESP_BROOKESIA_STYLE_IMAGE_RECOLOR_WHITE(&esp_brookesia_image_large_status_bar_wifi_level2_28_28), \ - ESP_BROOKESIA_STYLE_IMAGE_RECOLOR_WHITE(&esp_brookesia_image_large_status_bar_wifi_level3_28_28), \ + ESP_BROOKESIA_STYLE_IMAGE_RECOLOR_WHITE(&esp_brookesia_image_large_status_bar_wifi_close_36_36), \ + ESP_BROOKESIA_STYLE_IMAGE_RECOLOR_WHITE(&esp_brookesia_image_large_status_bar_wifi_level1_36_36), \ + ESP_BROOKESIA_STYLE_IMAGE_RECOLOR_WHITE(&esp_brookesia_image_large_status_bar_wifi_level2_36_36), \ + ESP_BROOKESIA_STYLE_IMAGE_RECOLOR_WHITE(&esp_brookesia_image_large_status_bar_wifi_level3_36_36), \ }, \ }, \ }, \ diff --git a/src/systems/phone/stylesheets/720_1280/dark/app_launcher_data.h b/src/systems/phone/stylesheets/720_1280/dark/app_launcher_data.h new file mode 100644 index 0000000..89c4460 --- /dev/null +++ b/src/systems/phone/stylesheets/720_1280/dark/app_launcher_data.h @@ -0,0 +1,57 @@ +/* + * SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ +#pragma once + +#include "widgets/app_launcher/esp_brookesia_app_launcher_type.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#define ESP_BROOKESIA_PHONE_720_1280_DARK_APP_LAUNCHER_ICON_DATA() \ + { \ + .main = { \ + .size = ESP_BROOKESIA_STYLE_SIZE_SQUARE(200), \ + .layout_row_pad = 10, \ + }, \ + .image = { \ + .default_size = ESP_BROOKESIA_STYLE_SIZE_SQUARE_PERCENT(56), \ + .press_size = ESP_BROOKESIA_STYLE_SIZE_SQUARE_PERCENT(50), \ + }, \ + .label = { \ + .text_font = ESP_BROOKESIA_STYLE_FONT_SIZE(28), \ + .text_color = ESP_BROOKESIA_STYLE_COLOR(0xFFFFFF), \ + } \ + } + +#define ESP_BROOKESIA_PHONE_720_1280_DARK_APP_LAUNCHER_DATA() \ + { \ + .main = { \ + .y_start = 0, \ + .size = ESP_BROOKESIA_STYLE_SIZE_RECT_PERCENT(100, 100), \ + }, \ + .table = { \ + .default_num = 3, \ + .size = ESP_BROOKESIA_STYLE_SIZE_RECT_W_PERCENT(100, 1150), \ + }, \ + .indicator = { \ + .main_size = ESP_BROOKESIA_STYLE_SIZE_RECT_W_PERCENT(100, 40), \ + .main_layout_column_pad = 10, \ + .main_layout_bottom_offset = 40, \ + .spot_inactive_size = ESP_BROOKESIA_STYLE_SIZE_SQUARE(16), \ + .spot_active_size = ESP_BROOKESIA_STYLE_SIZE_RECT(40, 16), \ + .spot_inactive_background_color = ESP_BROOKESIA_STYLE_COLOR(0xC6C6C6), \ + .spot_active_background_color = ESP_BROOKESIA_STYLE_COLOR(0xFFFFFF), \ + }, \ + .icon = ESP_BROOKESIA_PHONE_720_1280_DARK_APP_LAUNCHER_ICON_DATA(), \ + .flags = { \ + .enable_table_scroll_anim = 0, \ + }, \ + } + +#ifdef __cplusplus +} +#endif diff --git a/src/systems/phone/stylesheets/720_1280/dark/core_data.h b/src/systems/phone/stylesheets/720_1280/dark/core_data.h new file mode 100644 index 0000000..a043e68 --- /dev/null +++ b/src/systems/phone/stylesheets/720_1280/dark/core_data.h @@ -0,0 +1,83 @@ +/* + * SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ +#pragma once + +#include "core/esp_brookesia_core_type.h" +#include "assets/esp_brookesia_assets.h" + +#ifdef __cplusplus +extern "C" { +#endif + +/* Home */ +#define ESP_BROOKESIA_PHONE_720_1280_DARK_CORE_HOME_DATA() \ + { \ + .background = { \ + .color = ESP_BROOKESIA_STYLE_COLOR(0x1A1A1A), \ + .wallpaper_image_resource = ESP_BROOKESIA_STYLE_IMAGE(&esp_brookesia_image_large_wallpaper_dark_720_720), \ + }, \ + .text = { \ + .default_fonts_num = 21, \ + .default_fonts = { \ + ESP_BROOKESIA_STYLE_FONT_CUSTOM_SIZE(8, &esp_brookesia_font_maison_neue_book_8), \ + ESP_BROOKESIA_STYLE_FONT_CUSTOM_SIZE(10, &esp_brookesia_font_maison_neue_book_10), \ + ESP_BROOKESIA_STYLE_FONT_CUSTOM_SIZE(12, &esp_brookesia_font_maison_neue_book_12), \ + ESP_BROOKESIA_STYLE_FONT_CUSTOM_SIZE(14, &esp_brookesia_font_maison_neue_book_14), \ + ESP_BROOKESIA_STYLE_FONT_CUSTOM_SIZE(16, &esp_brookesia_font_maison_neue_book_16), \ + ESP_BROOKESIA_STYLE_FONT_CUSTOM_SIZE(18, &esp_brookesia_font_maison_neue_book_18), \ + ESP_BROOKESIA_STYLE_FONT_CUSTOM_SIZE(20, &esp_brookesia_font_maison_neue_book_20), \ + ESP_BROOKESIA_STYLE_FONT_CUSTOM_SIZE(22, &esp_brookesia_font_maison_neue_book_22), \ + ESP_BROOKESIA_STYLE_FONT_CUSTOM_SIZE(24, &esp_brookesia_font_maison_neue_book_24), \ + ESP_BROOKESIA_STYLE_FONT_CUSTOM_SIZE(26, &esp_brookesia_font_maison_neue_book_26), \ + ESP_BROOKESIA_STYLE_FONT_CUSTOM_SIZE(28, &esp_brookesia_font_maison_neue_book_28), \ + ESP_BROOKESIA_STYLE_FONT_CUSTOM_SIZE(30, &esp_brookesia_font_maison_neue_book_30), \ + ESP_BROOKESIA_STYLE_FONT_CUSTOM_SIZE(32, &esp_brookesia_font_maison_neue_book_32), \ + ESP_BROOKESIA_STYLE_FONT_CUSTOM_SIZE(34, &esp_brookesia_font_maison_neue_book_34), \ + ESP_BROOKESIA_STYLE_FONT_CUSTOM_SIZE(36, &esp_brookesia_font_maison_neue_book_36), \ + ESP_BROOKESIA_STYLE_FONT_CUSTOM_SIZE(38, &esp_brookesia_font_maison_neue_book_38), \ + ESP_BROOKESIA_STYLE_FONT_CUSTOM_SIZE(40, &esp_brookesia_font_maison_neue_book_40), \ + ESP_BROOKESIA_STYLE_FONT_CUSTOM_SIZE(42, &esp_brookesia_font_maison_neue_book_42), \ + ESP_BROOKESIA_STYLE_FONT_CUSTOM_SIZE(44, &esp_brookesia_font_maison_neue_book_44), \ + ESP_BROOKESIA_STYLE_FONT_CUSTOM_SIZE(46, &esp_brookesia_font_maison_neue_book_46), \ + ESP_BROOKESIA_STYLE_FONT_CUSTOM_SIZE(48, &esp_brookesia_font_maison_neue_book_48), \ + }, \ + }, \ + .container = { \ + .styles = { \ + { .outline_width = 1, .outline_color = ESP_BROOKESIA_STYLE_COLOR(0xeb3b5a), }, \ + { .outline_width = 2, .outline_color = ESP_BROOKESIA_STYLE_COLOR(0xfa8231), }, \ + { .outline_width = 3, .outline_color = ESP_BROOKESIA_STYLE_COLOR(0xf7b731), }, \ + { .outline_width = 2, .outline_color = ESP_BROOKESIA_STYLE_COLOR(0x20bf6b), }, \ + { .outline_width = 1, .outline_color = ESP_BROOKESIA_STYLE_COLOR(0x0fb9b1), }, \ + { .outline_width = 3, .outline_color = ESP_BROOKESIA_STYLE_COLOR(0x2d98da), }, \ + }, \ + }, \ + } + +/* manager */ +#define ESP_BROOKESIA_PHONE_720_1280_DARK_CORE_MANAGER_DATA() \ + { \ + .app = { \ + .max_running_num = 3, \ + }, \ + .flags = { \ + .enable_app_save_snapshot = 1, \ + }, \ + } + +/* Core */ +#define ESP_BROOKESIA_PHONE_720_1280_DARK_CORE_INFO_DATA_NAME "720x1280 Drak" +#define ESP_BROOKESIA_PHONE_720_1280_DARK_CORE_DATA() \ + { \ + .name = ESP_BROOKESIA_PHONE_720_1280_DARK_CORE_INFO_DATA_NAME, \ + .screen_size = ESP_BROOKESIA_STYLE_SIZE_RECT(720, 1280), \ + .home = ESP_BROOKESIA_PHONE_720_1280_DARK_CORE_HOME_DATA(), \ + .manager = ESP_BROOKESIA_PHONE_720_1280_DARK_CORE_MANAGER_DATA(), \ + } + +#ifdef __cplusplus +} +#endif diff --git a/src/systems/phone/stylesheets/720_1280/dark/gesture_data.h b/src/systems/phone/stylesheets/720_1280/dark/gesture_data.h new file mode 100644 index 0000000..3ab274d --- /dev/null +++ b/src/systems/phone/stylesheets/720_1280/dark/gesture_data.h @@ -0,0 +1,83 @@ +/* + * SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ +#pragma once + +#include "widgets/gesture/esp_brookesia_gesture_type.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#define ESP_BROOKESIA_PHONE_720_1280_DRAK_GESTURE_LEFT_RIGHT_INDICATOR_BAR_DATA() \ + { \ + .main = { \ + .size_min = ESP_BROOKESIA_STYLE_SIZE_RECT(10, 0), \ + .size_max = ESP_BROOKESIA_STYLE_SIZE_RECT_H_PERCENT(10, 50), \ + .radius = 5, \ + .layout_pad_all = 2, \ + .color = ESP_BROOKESIA_STYLE_COLOR(0x000000), \ + }, \ + .indicator = { \ + .radius = 5, \ + .color = ESP_BROOKESIA_STYLE_COLOR(0xFFFFFF), \ + }, \ + .animation = { \ + .scale_back_path_type = ESP_BROOKESIA_LV_ANIM_PATH_TYPE_BOUNCE, \ + .scale_back_time_ms = 500, \ + }, \ + } + +#define ESP_BROOKESIA_PHONE_720_1280_DRAK_GESTURE_BOTTOM_INDICATOR_BAR_DATA() \ + { \ + .main = { \ + .size_min = ESP_BROOKESIA_STYLE_SIZE_RECT(0, 10), \ + .size_max = ESP_BROOKESIA_STYLE_SIZE_RECT_W_PERCENT(50, 10), \ + .radius = 5, \ + .layout_pad_all = 2, \ + .color = ESP_BROOKESIA_STYLE_COLOR(0x1A1A1A), \ + }, \ + .indicator = { \ + .radius = 5, \ + .color = ESP_BROOKESIA_STYLE_COLOR(0xFFFFFF), \ + }, \ + .animation = { \ + .scale_back_path_type = ESP_BROOKESIA_LV_ANIM_PATH_TYPE_BOUNCE, \ + .scale_back_time_ms = 500, \ + }, \ + } + +#define ESP_BROOKESIA_PHONE_720_1280_DARK_GESTURE_DATA() \ + { \ + .detect_period_ms = 20, \ + .threshold = { \ + .direction_vertical = 50, \ + .direction_horizon = 50, \ + .direction_angle = 60, \ + .horizontal_edge = 20, \ + .vertical_edge = 30, \ + .duration_short_ms = 600, \ + .speed_slow_px_per_ms = 0.1, \ + }, \ + .indicator_bars = { \ + [ESP_BROOKESIA_GESTURE_INDICATOR_BAR_TYPE_LEFT] = \ + ESP_BROOKESIA_PHONE_720_1280_DRAK_GESTURE_LEFT_RIGHT_INDICATOR_BAR_DATA(), \ + [ESP_BROOKESIA_GESTURE_INDICATOR_BAR_TYPE_RIGHT] = \ + ESP_BROOKESIA_PHONE_720_1280_DRAK_GESTURE_LEFT_RIGHT_INDICATOR_BAR_DATA(), \ + [ESP_BROOKESIA_GESTURE_INDICATOR_BAR_TYPE_BOTTOM] = \ + ESP_BROOKESIA_PHONE_720_1280_DRAK_GESTURE_BOTTOM_INDICATOR_BAR_DATA(), \ + }, \ + .flags = { \ + .enable_indicator_bars = { \ + [ESP_BROOKESIA_GESTURE_INDICATOR_BAR_TYPE_LEFT] = 0, \ + [ESP_BROOKESIA_GESTURE_INDICATOR_BAR_TYPE_RIGHT] = 0, \ + [ESP_BROOKESIA_GESTURE_INDICATOR_BAR_TYPE_BOTTOM] = 1, \ + }, \ + }, \ + } + +#ifdef __cplusplus +} +#endif diff --git a/src/systems/phone/stylesheets/720_1280/dark/navigation_bar_data.h b/src/systems/phone/stylesheets/720_1280/dark/navigation_bar_data.h new file mode 100644 index 0000000..ae0cbf0 --- /dev/null +++ b/src/systems/phone/stylesheets/720_1280/dark/navigation_bar_data.h @@ -0,0 +1,52 @@ +/* + * SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ +#pragma once + +#include "widgets/navigation_bar/esp_brookesia_navigation_bar_type.h" +#include "assets/esp_brookesia_assets.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#define ESP_BROOKESIA_PHONE_720_1280_DARK_NAVIGATION_BAR_DATA() \ + { \ + .main = { \ + .size = ESP_BROOKESIA_STYLE_SIZE_RECT_W_PERCENT(100, 80), \ + .background_color = ESP_BROOKESIA_STYLE_COLOR(0x38393A), \ + }, \ + .button = { \ + .icon_size = ESP_BROOKESIA_STYLE_SIZE_SQUARE(36), \ + .icon_images = { \ + ESP_BROOKESIA_STYLE_IMAGE_RECOLOR_WHITE(&esp_brookesia_image_large_navigation_bar_back_36_36), \ + ESP_BROOKESIA_STYLE_IMAGE_RECOLOR_WHITE(&esp_brookesia_image_large_navigation_bar_home_36_36), \ + ESP_BROOKESIA_STYLE_IMAGE_RECOLOR_WHITE(&esp_brookesia_image_large_navigation_bar_recents_screen_36_36), \ + }, \ + .navigate_types = { \ + ESP_BROOKESIA_CORE_NAVIGATE_TYPE_BACK, \ + ESP_BROOKESIA_CORE_NAVIGATE_TYPE_HOME, \ + ESP_BROOKESIA_CORE_NAVIGATE_TYPE_RECENTS_SCREEN, \ + }, \ + .active_background_color = ESP_BROOKESIA_STYLE_COLOR_WITH_OPACIRY(0xFFFFFF, LV_OPA_50), \ + }, \ + .visual_flex = { \ + .show_animation_time_ms = 200, \ + .show_animation_delay_ms = 0, \ + .show_animation_path_type = ESP_BROOKESIA_LV_ANIM_PATH_TYPE_EASE_OUT, \ + .show_duration_ms = 2000, \ + .hide_animation_time_ms = 200, \ + .hide_animation_delay_ms = 0, \ + .hide_animation_path_type = ESP_BROOKESIA_LV_ANIM_PATH_TYPE_EASE_IN, \ + }, \ + .flags = { \ + .enable_main_size_min = 0, \ + .enable_main_size_max = 0, \ + }, \ + } + +#ifdef __cplusplus +} +#endif diff --git a/src/systems/phone/stylesheets/720_1280/dark/recents_screen_data.h b/src/systems/phone/stylesheets/720_1280/dark/recents_screen_data.h new file mode 100644 index 0000000..5be4562 --- /dev/null +++ b/src/systems/phone/stylesheets/720_1280/dark/recents_screen_data.h @@ -0,0 +1,66 @@ +/* + * SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ +#pragma once + +#include "widgets/recents_screen/esp_brookesia_recents_screen_type.h" +#include "assets/esp_brookesia_assets.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#define ESP_BROOKESIA_PHONE_720_1280_DARK_RECENTS_SCREEN_SNAPSHOT_DATA() \ + { \ + .main_size = ESP_BROOKESIA_STYLE_SIZE_RECT(450, 880), \ + .title = { \ + .main_size = ESP_BROOKESIA_STYLE_SIZE_RECT(450, 80), \ + .main_layout_column_pad = 10, \ + .icon_size = ESP_BROOKESIA_STYLE_SIZE_SQUARE(48), \ + .text_font = ESP_BROOKESIA_STYLE_FONT_SIZE(28), \ + .text_color = ESP_BROOKESIA_STYLE_COLOR(0xFFFFFF), \ + }, \ + .image = { \ + .main_size = ESP_BROOKESIA_STYLE_SIZE_RECT(450, 800), \ + .radius = 22, \ + }, \ + } + +#define ESP_BROOKESIA_PHONE_720_1280_DARK_RECENTS_SCREEN_DATA() \ + { \ + .main = { \ + .size = ESP_BROOKESIA_STYLE_SIZE_RECT_PERCENT(100, 100), \ + .layout_row_pad = 20, \ + .layout_top_pad = 0, \ + .layout_bottom_pad = 40, \ + .background_color = ESP_BROOKESIA_STYLE_COLOR(0x1A1A1A), \ + }, \ + .memory = { \ + .main_size = ESP_BROOKESIA_STYLE_SIZE_RECT_W_PERCENT(100, 28), \ + .main_layout_x_right_offset = 10, \ + .label_text_font = ESP_BROOKESIA_STYLE_FONT_HEIGHT_PERCENT(100), \ + .label_text_color = ESP_BROOKESIA_STYLE_COLOR(0xFFFFFF), \ + .label_unit_text = "KB", \ + }, \ + .snapshot_table = { \ + .main_size = ESP_BROOKESIA_STYLE_SIZE_RECT_PERCENT(100, 100), \ + .main_layout_column_pad = 40, \ + .snapshot = ESP_BROOKESIA_PHONE_720_1280_DARK_RECENTS_SCREEN_SNAPSHOT_DATA(), \ + }, \ + .trash_icon = { \ + .default_size = ESP_BROOKESIA_STYLE_SIZE_SQUARE(64), \ + .press_size = ESP_BROOKESIA_STYLE_SIZE_SQUARE(58), \ + .image = ESP_BROOKESIA_STYLE_IMAGE(&esp_brookesia_image_large_recents_screen_trash_64_64), \ + }, \ + .flags = { \ + .enable_memory = 1, \ + .enable_table_height_flex = 1, \ + .enable_table_snapshot_use_icon_image = 0, \ + }, \ + } + +#ifdef __cplusplus +} +#endif diff --git a/src/systems/phone/stylesheets/720_1280/dark/status_bar_data.h b/src/systems/phone/stylesheets/720_1280/dark/status_bar_data.h new file mode 100644 index 0000000..f0ec94f --- /dev/null +++ b/src/systems/phone/stylesheets/720_1280/dark/status_bar_data.h @@ -0,0 +1,86 @@ +/* + * SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ +#pragma once + +#include "widgets/status_bar/esp_brookesia_status_bar_type.h" +#include "assets/esp_brookesia_assets.h" + +#ifdef __cplusplus +extern "C" { +#endif + +/* Area */ +#define ESP_BROOKESIA_PHONE_720_1280_DARK_STATUS_BAR_AREA_DATA(w_percent, align) \ + { \ + .size = ESP_BROOKESIA_STYLE_SIZE_RECT_PERCENT(w_percent, 100), \ + .layout_column_align = align, \ + .layout_column_start_offset = 40, \ + .layout_column_pad = 8, \ + } + +/* Status Bar */ +#define ESP_BROOKESIA_PHONE_720_1280_DARK_STATUS_BAR_DATA() \ + { \ + .main = { \ + .size = ESP_BROOKESIA_STYLE_SIZE_RECT_W_PERCENT(100, 60), \ + .background_color = ESP_BROOKESIA_STYLE_COLOR(0x38393A), \ + .text_font = ESP_BROOKESIA_STYLE_FONT_SIZE(28), \ + .text_color = ESP_BROOKESIA_STYLE_COLOR(0xFFFFFF), \ + }, \ + .area = { \ + .num = ESP_BROOKESIA_STATUS_BAR_DATA_AREA_NUM_MAX, \ + .data = { \ + ESP_BROOKESIA_PHONE_720_1280_DARK_STATUS_BAR_AREA_DATA(33, ESP_BROOKESIA_STATUS_BAR_AREA_ALIGN_START), \ + ESP_BROOKESIA_PHONE_720_1280_DARK_STATUS_BAR_AREA_DATA(34, ESP_BROOKESIA_STATUS_BAR_AREA_ALIGN_CENTER), \ + ESP_BROOKESIA_PHONE_720_1280_DARK_STATUS_BAR_AREA_DATA(33, ESP_BROOKESIA_STATUS_BAR_AREA_ALIGN_END), \ + }, \ + }, \ + .icon_common_size = ESP_BROOKESIA_STYLE_SIZE_SQUARE(36), \ + .battery = { \ + .area_index = ESP_BROOKESIA_STATUS_BAR_DATA_AREA_NUM_MAX - 1, \ + .icon_data = { \ + .icon = { \ + .image_num = 5, \ + .images = { \ + ESP_BROOKESIA_STYLE_IMAGE_RECOLOR_WHITE(&esp_brookesia_image_large_status_bar_battery_level1_36_36), \ + ESP_BROOKESIA_STYLE_IMAGE_RECOLOR_WHITE(&esp_brookesia_image_large_status_bar_battery_level2_36_36), \ + ESP_BROOKESIA_STYLE_IMAGE_RECOLOR_WHITE(&esp_brookesia_image_large_status_bar_battery_level3_36_36), \ + ESP_BROOKESIA_STYLE_IMAGE_RECOLOR_WHITE(&esp_brookesia_image_large_status_bar_battery_level4_36_36), \ + ESP_BROOKESIA_STYLE_IMAGE_RECOLOR_WHITE(&esp_brookesia_image_large_status_bar_battery_charge_36_36), \ + }, \ + }, \ + }, \ + }, \ + .wifi = { \ + .area_index = ESP_BROOKESIA_STATUS_BAR_DATA_AREA_NUM_MAX - 1, \ + .icon_data = { \ + .icon = { \ + .image_num = 4, \ + .images = { \ + ESP_BROOKESIA_STYLE_IMAGE_RECOLOR_WHITE(&esp_brookesia_image_large_status_bar_wifi_close_36_36), \ + ESP_BROOKESIA_STYLE_IMAGE_RECOLOR_WHITE(&esp_brookesia_image_large_status_bar_wifi_level1_36_36), \ + ESP_BROOKESIA_STYLE_IMAGE_RECOLOR_WHITE(&esp_brookesia_image_large_status_bar_wifi_level2_36_36), \ + ESP_BROOKESIA_STYLE_IMAGE_RECOLOR_WHITE(&esp_brookesia_image_large_status_bar_wifi_level3_36_36), \ + }, \ + }, \ + }, \ + }, \ + .clock = { \ + .area_index = 1, \ + }, \ + .flags = { \ + .enable_battery_icon = 1, \ + .enable_battery_icon_common_size = 1, \ + .enable_battery_label = 1, \ + .enable_wifi_icon = 1, \ + .enable_wifi_icon_common_size = 1, \ + .enable_clock = 1, \ + }, \ + } + +#ifdef __cplusplus +} +#endif diff --git a/src/systems/phone/stylesheets/720_1280/dark/stylesheet.h b/src/systems/phone/stylesheets/720_1280/dark/stylesheet.h new file mode 100644 index 0000000..9b5a02e --- /dev/null +++ b/src/systems/phone/stylesheets/720_1280/dark/stylesheet.h @@ -0,0 +1,78 @@ +/* + * SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ +#pragma once + +#include "esp_brookesia.h" +#include "core_data.h" +#include "app_launcher_data.h" +#include "recents_screen_data.h" +#include "gesture_data.h" +#include "navigation_bar_data.h" +#include "status_bar_data.h" + +#ifdef __cplusplus +extern "C" { +#endif + +/* Home */ +#define ESP_BROOKESIA_PHONE_720_1280_DARK_HOME_DATA() \ + { \ + .status_bar = { \ + .data = ESP_BROOKESIA_PHONE_720_1280_DARK_STATUS_BAR_DATA(), \ + .visual_mode = ESP_BROOKESIA_STATUS_BAR_VISUAL_MODE_SHOW_FIXED, \ + }, \ + .navigation_bar = { \ + .data = ESP_BROOKESIA_PHONE_720_1280_DARK_NAVIGATION_BAR_DATA(), \ + .visual_mode = ESP_BROOKESIA_NAVIGATION_BAR_VISUAL_MODE_HIDE, \ + }, \ + .app_launcher = { \ + .data = ESP_BROOKESIA_PHONE_720_1280_DARK_APP_LAUNCHER_DATA(), \ + .default_image = ESP_BROOKESIA_STYLE_IMAGE(&esp_brookesia_image_large_app_launcher_default_112_112), \ + }, \ + .recents_screen = { \ + .data = ESP_BROOKESIA_PHONE_720_1280_DARK_RECENTS_SCREEN_DATA(), \ + .status_bar_visual_mode = ESP_BROOKESIA_STATUS_BAR_VISUAL_MODE_HIDE, \ + .navigation_bar_visual_mode = ESP_BROOKESIA_NAVIGATION_BAR_VISUAL_MODE_HIDE, \ + }, \ + .flags = { \ + .enable_status_bar = 1, \ + .enable_navigation_bar = 1, \ + .enable_app_launcher_flex_size = 1, \ + .enable_recents_screen = 1, \ + .enable_recents_screen_flex_size = 1, \ + }, \ + } + +/* Manager */ +#define ESP_BROOKESIA_PHONE_720_1280_DARK_MANAGER_DATA() \ + { \ + .gesture = ESP_BROOKESIA_PHONE_720_1280_DARK_GESTURE_DATA(), \ + .gesture_mask_indicator_trigger_time_ms = 0, \ + .recents_screen = { \ + .drag_snapshot_y_step = 10, \ + .drag_snapshot_y_threshold = 50, \ + .drag_snapshot_angle_threshold = 60, \ + .delete_snapshot_y_threshold = 50, \ + }, \ + .flags = { \ + .enable_gesture = 1, \ + .enable_gesture_navigation_back = 0, \ + .enable_recents_screen_snapshot_drag = 1, \ + .enable_recents_screen_hide_when_no_snapshot = 1, \ + }, \ + } + +/* Phone */ +#define ESP_BROOKESIA_PHONE_720_1280_DARK_STYLESHEET() \ + { \ + .core = ESP_BROOKESIA_PHONE_720_1280_DARK_CORE_DATA(), \ + .home = ESP_BROOKESIA_PHONE_720_1280_DARK_HOME_DATA(), \ + .manager = ESP_BROOKESIA_PHONE_720_1280_DARK_MANAGER_DATA(), \ + } + +#ifdef __cplusplus +} +#endif diff --git a/test_apps/sdkconfig.ci.720_1280 b/test_apps/sdkconfig.ci.720_1280 new file mode 100644 index 0000000..2203791 --- /dev/null +++ b/test_apps/sdkconfig.ci.720_1280 @@ -0,0 +1,2 @@ +CONFIG_TEST_LVGL_RESOLUTION_WIDTH=720 +CONFIG_TEST_LVGL_RESOLUTION_HEIGHT=1280