From e7554b1b595f0ac513dc00cd23dd7f018b112804 Mon Sep 17 00:00:00 2001 From: wangweiyuan Date: Sat, 30 Aug 2025 22:33:12 +0800 Subject: [PATCH] =?UTF-8?q?Appbar=20=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangweiyuan Change-Id: Ic44dc18017ee1e4f0108d321e02cd4b9a57b1310 --- .../resources/base/element/color_sys.json | 12 +++ .../resources/base/element/float_sys.json | 44 +++++++++ .../resources/base/element/id_defined.json | 70 ++++++++++++++ .../main/resources/base/element/pattern.json | 54 ++++++++++- .../main/resources/tv/element/color_sys.json | 36 ++++++++ .../main/resources/tv/element/float.json | 4 + .../main/resources/tv/element/float_sys.json | 92 +++++++++++++++++++ 7 files changed, 311 insertions(+), 1 deletion(-) diff --git a/systemres/main/resources/base/element/color_sys.json b/systemres/main/resources/base/element/color_sys.json index fda47b54..9c12a691 100644 --- a/systemres/main/resources/base/element/color_sys.json +++ b/systemres/main/resources/base/element/color_sys.json @@ -1095,6 +1095,18 @@ { "name": "segment_button_border_color", "value": "#00000000" + }, + { + "name": "titlebar_icon_border_color", + "value": "#0c182431" + }, + { + "name": "title_primary_color", + "value": "$color:font_primary" + }, + { + "name": "navigation_focus_blend_bg_color", + "value": "$color:titlebar_icon_background_color" } ] } diff --git a/systemres/main/resources/base/element/float_sys.json b/systemres/main/resources/base/element/float_sys.json index 7f49b8c1..2187d13a 100644 --- a/systemres/main/resources/base/element/float_sys.json +++ b/systemres/main/resources/base/element/float_sys.json @@ -1735,6 +1735,50 @@ { "name" : "segment_button_unselected_font_weight", "value": "400" + }, + { + "name": "title_sapce_vertical", + "value": "2.0vp" + }, + { + "name": "titlebar_icon_border_width", + "value": "0.0vp" + }, + { + "name": "single_line_titlebar_height", + "value": "56.0vp" + }, + { + "name": "double_line_titlebar_height", + "value": "82.0vp" + }, + { + "name": "full_single_line_titlebar_height", + "value": "112.0vp" + }, + { + "name": "full_double_line_titlebar_height", + "value": "138.0vp" + }, + { + "name": "menuitem_focus_padding", + "value": "0.0vp" + }, + { + "name": "full_mode_title_one_line_offset_y", + "value": "0.0vp" + }, + { + "name": "full_mode_title_two_line_offset_y", + "value": "0.0vp" + }, + { + "name": "title_offset_x", + "value": "0.0vp" + }, + { + "name": "icon_need_focus_bg_color", + "value": "0.0" } ] } diff --git a/systemres/main/resources/base/element/id_defined.json b/systemres/main/resources/base/element/id_defined.json index 7032cad1..c8ae70a4 100644 --- a/systemres/main/resources/base/element/id_defined.json +++ b/systemres/main/resources/base/element/id_defined.json @@ -33328,6 +33328,76 @@ "name": "progress_text_font_weight", "order": 6609, "flags": "private" + }, + { + "type": "float", + "name": "title_sapce_vertical", + "order": 6610 + }, + { + "type": "float", + "name": "titlebar_icon_border_width", + "order": 6611 + }, + { + "type": "color", + "name": "titlebar_icon_border_color", + "order": 6612 + }, + { + "type": "color", + "name": "title_primary_color", + "order": 6613 + }, + { + "type": "float", + "name": "single_line_titlebar_height", + "order": 6614 + }, + { + "type": "float", + "name": "double_line_titlebar_height", + "order": 6615 + }, + { + "type": "float", + "name": "full_single_line_titlebar_height", + "order": 6616 + }, + { + "type": "float", + "name": "full_double_line_titlebar_height", + "order": 6617 + }, + { + "type": "float", + "name": "menuitem_focus_padding", + "order": 6618 + }, + { + "type": "float", + "name": "full_mode_title_one_line_offset_y", + "order": 6619 + }, + { + "type": "float", + "name": "full_mode_title_two_line_offset_y", + "order": 6620 + }, + { + "type": "float", + "name": "title_offset_x", + "order": 6621 + }, + { + "type": "float", + "name": "icon_need_focus_bg_color", + "order": 6622 + }, + { + "type": "color", + "name": "navigation_focus_blend_bg_color", + "order": 6623 } ] } diff --git a/systemres/main/resources/base/element/pattern.json b/systemres/main/resources/base/element/pattern.json index 9aa9e875..e78020df 100644 --- a/systemres/main/resources/base/element/pattern.json +++ b/systemres/main/resources/base/element/pattern.json @@ -2894,7 +2894,7 @@ }, { "name": "title_primary_color", - "value": "$color:font_primary" + "value": "$color:title_primary_color" }, { "name": "title_subheader_color", @@ -3131,6 +3131,58 @@ { "name": "arkui_app_bar_privacy_authorize", "value": "$string:arkui_app_bar_privacy_authorize" + }, + { + "name": "title_sapce_vertical", + "value": "$float:title_sapce_vertical" + }, + { + "name": "titlebar_icon_border_width", + "value": "$float:titlebar_icon_border_width" + }, + { + "name": "titlebar_icon_border_color", + "value": "$color:titlebar_icon_border_color" + }, + { + "name": "single_line_titlebar_height", + "value": "$float:single_line_titlebar_height" + }, + { + "name": "double_line_titlebar_height", + "value": "$float:double_line_titlebar_height" + }, + { + "name": "full_single_line_titlebar_height", + "value": "$float:full_single_line_titlebar_height" + }, + { + "name": "full_double_line_titlebar_height", + "value": "$float:full_double_line_titlebar_height" + }, + { + "name": "menuitem_focus_padding", + "value": "$float:menuitem_focus_padding" + }, + { + "name": "full_mode_title_one_line_offset_y", + "value": "$float:full_mode_title_one_line_offset_y" + }, + { + "name": "full_mode_title_two_line_offset_y", + "value": "$float:full_mode_title_two_line_offset_y" + }, + { + "name": "title_offset_x", + "value": "$float:title_offset_x" + }, + { + "name": "icon_need_focus_bg_color", + "value": "$float:icon_need_focus_bg_color" + }, + { + "name": "navigation_focus_blend_bg_color", + "value": "$color:navigation_focus_blend_bg_color" } ] }, diff --git a/systemres/main/resources/tv/element/color_sys.json b/systemres/main/resources/tv/element/color_sys.json index fbdbfa77..1ba2f6cb 100644 --- a/systemres/main/resources/tv/element/color_sys.json +++ b/systemres/main/resources/tv/element/color_sys.json @@ -623,6 +623,42 @@ { "name": "search_cancel_button_focus_color", "value": "$color:comp_background_focus" + }, + { + "name": "title_primary_color", + "value": "#E6FFFFFF" + }, + { + "name": "titlebar_subheader_color", + "value": "#99FFFFFF" + }, + { + "name": "titlebar_icon_border_color", + "value": "#26FFFFFF" + }, + { + "name": "titlebar_icon_background_hover_color", + "value": "#19FFFFFF" + }, + { + "name": "titlebar_icon_background_pressed_color", + "value": "#26FFFFFF" + }, + { + "name": "titlebar_icon_background_focus_outline_color", + "value": "#FFFFFF" + }, + { + "name": "titlebar_icon_background_color", + "value": "#19FFFFFF" + }, + { + "name": "titlebar_icon_color", + "value": "#E5FFFFFF" + }, + { + "name": "navigation_focus_blend_bg_color", + "value": "#4DFFFFFF" } ] } \ No newline at end of file diff --git a/systemres/main/resources/tv/element/float.json b/systemres/main/resources/tv/element/float.json index 1fcf99f9..3130b3fb 100644 --- a/systemres/main/resources/tv/element/float.json +++ b/systemres/main/resources/tv/element/float.json @@ -335,6 +335,10 @@ { "name": "padding_level6", "value": "16.0vp" + }, + { + "name": "ohos_id_scale_focus_button", + "value": "1.05" } ] } \ No newline at end of file diff --git a/systemres/main/resources/tv/element/float_sys.json b/systemres/main/resources/tv/element/float_sys.json index ab8a946d..3039fb77 100644 --- a/systemres/main/resources/tv/element/float_sys.json +++ b/systemres/main/resources/tv/element/float_sys.json @@ -995,6 +995,98 @@ { "name": "ohos_id_rating_mini_height", "value": "16.0vp" + }, + { + "name": "titlebar_title_primary_size", + "value": "40.0fp" + }, + { + "name": "titlebar_subheader_size", + "value": "22.0fp" + }, + { + "name": "title_sapce_vertical", + "value": "4.0vp" + }, + { + "name": "titlebar_title_secondary_size", + "value": "32.0fp" + }, + { + "name": "titlebar_title_tertiary_size", + "value": "32.0fp" + }, + { + "name": "titlebar_icon_background_height", + "value": "54.0vp" + }, + { + "name": "titlebar_icon_background_width", + "value": "54.0vp" + }, + { + "name": "titlebar_icon_width", + "value": "32.0vp" + }, + { + "name": "titlebar_icon_height", + "value": "32.0vp" + }, + { + "name": "titlebar_icon_background_shape", + "value": "27.0vp" + }, + { + "name": "titlebar_icon_background_space_horizontal", + "value": "$float:padding_level8" + }, + { + "name": "titlebar_title_margin_right", + "value": "56.0vp" + }, + { + "name": "titlebar_icon_border_width", + "value": "1.0vp" + }, + { + "name": "single_line_titlebar_height", + "value": "86.0vp" + }, + { + "name": "double_line_titlebar_height", + "value": "86.0vp" + }, + { + "name": "full_single_line_titlebar_height", + "value": "86.0vp" + }, + { + "name": "full_double_line_titlebar_height", + "value": "122.0vp" + }, + { + "name": "menuitem_focus_padding", + "value": "2.0vp" + }, + { + "name": "ohos_id_navigation_bar_menu_icon_size", + "value": "32.0vp" + }, + { + "name": "full_mode_title_one_line_offset_y", + "value": "10.0vp" + }, + { + "name": "full_mode_title_two_line_offset_y", + "value": "16.0vp" + }, + { + "name": "title_offset_x", + "value": "6.0vp" + }, + { + "name": "icon_need_focus_bg_color", + "value": "1.0" } ] } \ No newline at end of file -- Gitee