Skip to content

Commit

Permalink
feat(phone): add stylesheet 720x1280
Browse files Browse the repository at this point in the history
  • Loading branch information
@Lzw655
Lzw655 committed Dec 23, 2024
1 parent 1caddd4 commit bf949c3
Show file tree
Hide file tree
Showing 14 changed files with 521 additions and 10 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
Binary file modified docs/_static/tools/stylesheet_calculator.xlsx
View file
Binary file not shown.
1 change: 1 addition & 0 deletions docs/system_ui_phone.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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/)
Expand Down
1 change: 1 addition & 0 deletions docs/system_ui_phone_CN.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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/)
Expand Down
2 changes: 1 addition & 1 deletion src/systems/phone/stylesheets/1024_600/dark/recents_screen_data.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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, \
Expand Down
18 changes: 9 additions & 9 deletions src/systems/phone/stylesheets/1024_600/dark/status_bar_data.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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), \
}, \
}, \
}, \
Expand All @@ -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), \
}, \
}, \
}, \
Expand Down
57 changes: 57 additions & 0 deletions src/systems/phone/stylesheets/720_1280/dark/app_launcher_data.h
View file
Original file line number Diff line number Diff line change
@@ -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
83 changes: 83 additions & 0 deletions src/systems/phone/stylesheets/720_1280/dark/core_data.h
View file
Original file line number Diff line number Diff line change
@@ -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
83 changes: 83 additions & 0 deletions src/systems/phone/stylesheets/720_1280/dark/gesture_data.h
View file
Original file line number Diff line number Diff line change
@@ -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
Loading

0 comments on commit bf949c3

Please sign in to comment.