From dbba32a4555baa77929ba12d6ce14ee9a1029d12 Mon Sep 17 00:00:00 2001 From: ewx1298574 Date: Wed, 29 Nov 2023 14:23:45 +0000 Subject: [PATCH 1/2] [HOS-1646]Themes in button Change-Id: Ie180cc87d21ddec1ff1dcf78bfbbd326ef81aebd --- .../main/resources/base/element/pattern.json | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/systemres/main/resources/base/element/pattern.json b/systemres/main/resources/base/element/pattern.json index 9c1cb0d..8788ed2 100755 --- a/systemres/main/resources/base/element/pattern.json +++ b/systemres/main/resources/base/element/pattern.json @@ -5,11 +5,11 @@ "value": [ { "name": "bg_color", - "value": "$color:ohos_id_color_emphasize" + "value": "$color:ohos_md_sys_color_surface_container_low" }, { "name": "bg_color_clicked_blend", - "value": "$color:ohos_id_color_click_effect" + "value": "$color:ohos_md_sys_color_primary" }, { "name": "bg_color_hovered_blend", @@ -21,7 +21,7 @@ }, { "name": "text_color", - "value": "$color:ohos_id_color_text_primary_contrary" + "value": "$color:ohos_md_sys_color_primary" }, { "name": "text_color_disabled_alpha", @@ -29,15 +29,15 @@ }, { "name": "normal_text_color", - "value": "$color:ohos_id_color_text_primary_activated" + "value": "$color:ohos_md_sys_color_primary" }, { "name": "download_button_text_color", - "value": "$color:ohos_id_color_text_primary" + "value": "$color:ohos_md_sys_color_primary" }, { "name": "download_button_process_color", - "value": "$color:ohos_id_color_emphasize" + "value": "$color:ohos_md_sys_color_surface_container_highest" }, { "name": "download_button_process_color_alpha", @@ -45,7 +45,7 @@ }, { "name": "download_button_bg_color", - "value": "$color:ohos_id_color_background" + "value": "$color:ohos_md_sys_color_surface_container_low" }, { "name": "download_button_bg_color_alpha", @@ -53,7 +53,7 @@ }, { "name": "download_button_border_color", - "value": "$color:ohos_id_color_emphasize" + "value": "$color:ohos_md_sys_color_surface_container_highest" }, { "name": "download_button_border_color_alpha", @@ -61,15 +61,15 @@ }, { "name": "waiting_button_text_color", - "value": "$color:ohos_id_color_text_primary_contrary" + "value": "$color:ohos_md_sys_color_primary" }, { "name": "process_button_text_color", - "value": "$color:ohos_id_color_text_primary_contrary" + "value": "$color:ohos_md_sys_color_primary" }, { "name": "border_color", - "value": "#00ffffff" + "value": "$color:ohos_md_sys_color_shadow" }, { "name": "border_width", @@ -81,11 +81,11 @@ }, { "name": "button_bg_focus_color", - "value": "$color:ohos_id_button_bg_focus_color" + "value": "$color:ohos_md_sys_color_primary" }, { "name": "button_text_focus_color", - "value": "$color:ohos_id_button_text_focus_color" + "value": "$color:ohos_md_sys_color_primary" }, { "name": "button_font_size", @@ -149,7 +149,7 @@ }, { "name": "button_progress_focus_color", - "value": "$color:ohos_id_button_progress_focus_color" + "value": "$color:ohos_md_sys_color_primary" }, { "name": "button_download_font_size", -- Gitee From 2d0a186cb3a798046d5f7fc878b35f7608268c94 Mon Sep 17 00:00:00 2001 From: ewx1298574 Date: Fri, 1 Dec 2023 10:02:09 +0000 Subject: [PATCH 2/2] [HOS-1646] update color scheme after review with parameters similar as in Material desgin in Android Change-Id: Ib7957e975e293fee40fe68c0321a126d5daf86b9 --- .../main/resources/base/element/pattern.json | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/systemres/main/resources/base/element/pattern.json b/systemres/main/resources/base/element/pattern.json index 8788ed2..f0b7750 100755 --- a/systemres/main/resources/base/element/pattern.json +++ b/systemres/main/resources/base/element/pattern.json @@ -5,15 +5,15 @@ "value": [ { "name": "bg_color", - "value": "$color:ohos_md_sys_color_surface_container_low" + "value": "$color:ohos_md_sys_color_primary" }, { "name": "bg_color_clicked_blend", - "value": "$color:ohos_md_sys_color_primary" + "value": "$color:ohos_md_sys_color_primary_fixed_dim" }, { "name": "bg_color_hovered_blend", - "value": "$color:ohos_id_color_hover" + "value": "$color:ohos_md_sys_color_on_primary_container" }, { "name": "bg_color_disabled_alpha", @@ -21,7 +21,7 @@ }, { "name": "text_color", - "value": "$color:ohos_md_sys_color_primary" + "value": "$color:ohos_md_sys_color_on_primary" }, { "name": "text_color_disabled_alpha", @@ -29,15 +29,15 @@ }, { "name": "normal_text_color", - "value": "$color:ohos_md_sys_color_primary" + "value": "$color:ohos_md_sys_color_on_primary" }, { "name": "download_button_text_color", - "value": "$color:ohos_md_sys_color_primary" + "value": "$color:ohos_md_sys_color_on_primary" }, { "name": "download_button_process_color", - "value": "$color:ohos_md_sys_color_surface_container_highest" + "value": "$color:ohos_md_sys_color_primary" }, { "name": "download_button_process_color_alpha", @@ -45,7 +45,7 @@ }, { "name": "download_button_bg_color", - "value": "$color:ohos_md_sys_color_surface_container_low" + "value": "$color:ohos_md_sys_color_on_primary" }, { "name": "download_button_bg_color_alpha", @@ -53,7 +53,7 @@ }, { "name": "download_button_border_color", - "value": "$color:ohos_md_sys_color_surface_container_highest" + "value": "$color:ohos_md_sys_color_primary" }, { "name": "download_button_border_color_alpha", @@ -61,15 +61,15 @@ }, { "name": "waiting_button_text_color", - "value": "$color:ohos_md_sys_color_primary" + "value": "$color:ohos_md_sys_color_on_primary" }, { "name": "process_button_text_color", - "value": "$color:ohos_md_sys_color_primary" + "value": "$color:ohos_md_sys_color_on_primary" }, { "name": "border_color", - "value": "$color:ohos_md_sys_color_shadow" + "value": "$color:ohos_md_sys_color_primary" }, { "name": "border_width", @@ -81,11 +81,11 @@ }, { "name": "button_bg_focus_color", - "value": "$color:ohos_md_sys_color_primary" + "value": "$color:ohos_md_sys_color_primary_fixed_dim" }, { "name": "button_text_focus_color", - "value": "$color:ohos_md_sys_color_primary" + "value": "$color:ohos_md_sys_color_on_primary" }, { "name": "button_font_size", @@ -149,7 +149,7 @@ }, { "name": "button_progress_focus_color", - "value": "$color:ohos_md_sys_color_primary" + "value": "$color:ohos_md_sys_color_primary_fixed_dim" }, { "name": "button_download_font_size", -- Gitee