From c463e39962d29caf0e9c7816daa582f7f3c13b2a Mon Sep 17 00:00:00 2001
From: "zhanghang160@huawei-partners.com" <zhanghang160@huawei-partners.com>
Date: Thu, 21 Aug 2025 15:14:13 +0800
Subject: [PATCH] radio checkbox tv theme update

Signed-off-by: zhanghang160@huawei-partners.com <zhanghang160@huawei-partners.com>
---
 .../resources/base/element/color_sys.json     |  40 +++
 .../resources/base/element/float_sys.json     |  16 +
 .../resources/base/element/id_defined.json    |  70 ++++
 .../main/resources/base/element/pattern.json  |  30 +-
 .../main/resources/tv/element/color.json      |   2 +-
 .../main/resources/tv/element/color_sys.json  |  70 +++-
 .../main/resources/tv/element/float_sys.json  |  98 +++++-
 .../main/resources/tv/element/pattern.json    | 314 ------------------
 8 files changed, 310 insertions(+), 330 deletions(-)

diff --git a/systemres/main/resources/base/element/color_sys.json b/systemres/main/resources/base/element/color_sys.json
index 8c60b28c..d890bf03 100644
--- a/systemres/main/resources/base/element/color_sys.json
+++ b/systemres/main/resources/base/element/color_sys.json
@@ -1051,6 +1051,46 @@
         {
             "name": "popup_secondary_button_font_color_sys",
             "value": "$color:popup_secondary_button_font_color"
+        },
+        {
+            "name": "radio_color_hover",
+            "value": "$color:ohos_id_color_hover"
+        },
+        {
+            "name": "radio_color_foreground_contrary",
+            "value": "$color:ohos_id_color_foreground_contrary"
+        },
+        {
+            "name": "radio_bg_color_checked",
+            "value": "$color:ohos_id_color_emphasize"
+        },
+        {
+            "name": "radio_bg_color_unchecked",
+            "value": "$color:ohos_id_color_switch_outline_off"
+        },
+        {
+            "name": "radio_click_effect_color",
+            "value": "$color:ohos_id_color_click_effect"
+        },
+        {
+            "name": "checkbox_fg_color_checked",
+            "value": "$color:ohos_id_color_foreground_contrary"
+        },
+        {
+            "name": "checkbox_bg_color_checked",
+            "value": "$color:ohos_id_color_text_primary_activated"
+        },
+        {
+            "name": "checkbox_bg_border_color_unchecked",
+            "value": "$color:ohos_id_color_switch_outline_off"
+        },
+        {
+            "name": "checkbox_hover_border_color",
+            "value": "$color:ohos_id_color_hover"
+        },
+        {
+            "name": "checkbox_click_effect_color",
+            "value": "$color:ohos_id_color_click_effect"
         }
     ]
   }
diff --git a/systemres/main/resources/base/element/float_sys.json b/systemres/main/resources/base/element/float_sys.json
index 4f51c3b5..51ee331c 100644
--- a/systemres/main/resources/base/element/float_sys.json
+++ b/systemres/main/resources/base/element/float_sys.json
@@ -1667,6 +1667,22 @@
         {
             "name": "menu_animation_offset",
             "value": "30.0px"
+        },
+        {
+            "name": "radio_default_size_api_twelve",
+            "value": "24.0vp"
+        },
+        {
+            "name": "checkbox_focus_white_border_radius",
+            "value": "0.0vp"
+        },
+        {
+            "name": "checkbox_default_round_padding_size",
+            "value": "2.0vp"
+        },
+        {
+            "name": "checkbox_hotzone_padding_horizontal",
+            "value": "12.0vp"
         }
     ]
 }
diff --git a/systemres/main/resources/base/element/id_defined.json b/systemres/main/resources/base/element/id_defined.json
index 07a449a8..4e02e01f 100644
--- a/systemres/main/resources/base/element/id_defined.json
+++ b/systemres/main/resources/base/element/id_defined.json
@@ -33155,6 +33155,76 @@
             "type": "string",
             "name": "notification_enable_loud_volume_tittle",
             "order": 6576
+        },
+        {
+            "type": "color",
+            "name": "radio_color_hover",
+            "order": 6577
+        },
+        {
+            "type": "color",
+            "name": "radio_color_foreground_contrary",
+            "order": 6578
+        },
+        {
+            "type": "color",
+            "name": "radio_bg_color_checked",
+            "order": 6579
+        },
+        {
+            "type": "color",
+            "name": "radio_bg_color_unchecked",
+            "order": 6580
+        },
+        {
+            "type": "color",
+            "name": "radio_click_effect_color",
+            "order": 6581
+        },
+        {
+            "type": "float",
+            "name": "radio_default_size_api_twelve",
+            "order": 6582
+        },
+        {
+            "type": "float",
+            "name": "checkbox_default_round_padding_size",
+            "order": 6583
+        },
+        {
+            "type": "float",
+            "name": "checkbox_focus_white_border_radius",
+            "order": 6584
+        },
+        {
+            "type": "color",
+            "name": "checkbox_fg_color_checked",
+            "order": 6585
+        },
+        {
+            "type": "color",
+            "name": "checkbox_bg_color_checked",
+            "order": 6586
+        },
+        {
+            "type": "color",
+            "name": "checkbox_bg_border_color_unchecked",
+            "order": 6587
+        },
+        {
+            "type": "color",
+            "name": "checkbox_hover_border_color",
+            "order": 6588
+        },
+        {
+            "type": "color",
+            "name": "checkbox_click_effect_color",
+            "order": 6589
+        },
+        {
+            "type": "float",
+            "name": "checkbox_hotzone_padding_horizontal",
+            "order": 6590
         }
     ]
 }
diff --git a/systemres/main/resources/base/element/pattern.json b/systemres/main/resources/base/element/pattern.json
index f0dde3dc..45415e91 100644
--- a/systemres/main/resources/base/element/pattern.json
+++ b/systemres/main/resources/base/element/pattern.json
@@ -1592,11 +1592,11 @@
             "value": [
                 {
                     "name": "fg_color_checked",
-                    "value": "$color:ohos_id_color_foreground_contrary"
+                    "value": "$color:checkbox_fg_color_checked"
                 },
                 {
                     "name": "bg_color_checked",
-                    "value": "$color:ohos_id_color_text_primary_activated"
+                    "value": "$color:checkbox_bg_color_checked"
                 },
                 {
                     "name": "bg_color_unchecked",
@@ -1604,7 +1604,7 @@
                 },
                 {
                     "name": "bg_border_color_unchecked",
-                    "value": "$color:ohos_id_color_switch_outline_off"
+                    "value": "$color:checkbox_bg_border_color_unchecked"
                 },
                 {
                     "name": "focus_border_color",
@@ -1616,11 +1616,11 @@
                 },
                 {
                     "name": "hover_border_color",
-                    "value": "$color:ohos_id_color_hover"
+                    "value": "$color:checkbox_hover_border_color"
                 },
                 {
                     "name": "click_effect_color",
-                    "value": "$color:ohos_id_color_click_effect"
+                    "value": "$color:checkbox_click_effect_color"
                 },
                 {
                     "name": "hover_border_radius",
@@ -1660,7 +1660,7 @@
                 },
                 {
                     "name": "hotzone_padding_horizontal",
-                    "value": "12.0vp"
+                    "value": "$float:checkbox_hotzone_padding_horizontal"
                 },
                 {
                     "name": "hotzone_padding_verical",
@@ -1748,7 +1748,11 @@
                 },
                 {
                     "name": "focus_white_border_radius",
-                    "value": "0.0vp"
+                    "value": "$float:checkbox_focus_white_border_radius"
+                },
+                {
+                    "name": "checkbox_default_round_padding_size",
+                    "value": "$float:checkbox_default_round_padding_size"
                 }
             ]
         },
@@ -1761,7 +1765,7 @@
                 },
                 {
                     "name": "hover_border_color",
-                    "value": "$color:ohos_id_color_hover"
+                    "value": "$color:radio_color_hover"
                 },
                 {
                     "name": "focus_border_color",
@@ -1769,7 +1773,7 @@
                 },
                 {
                     "name": "fg_color_checked",
-                    "value": "$color:ohos_id_color_foreground_contrary"
+                    "value": "$color:radio_color_foreground_contrary"
                 },
                 {
                     "name": "fg_color_unchecked",
@@ -1777,15 +1781,15 @@
                 },
                 {
                     "name": "bg_color_checked",
-                    "value": "$color:ohos_id_color_emphasize"
+                    "value": "$color:radio_bg_color_checked"
                 },
                 {
                     "name": "bg_color_unchecked",
-                    "value": "$color:ohos_id_color_switch_outline_off"
+                    "value": "$color:radio_bg_color_unchecked"
                 },
                 {
                     "name": "click_effect_color",
-                    "value": "$color:ohos_id_color_click_effect"
+                    "value": "$color:radio_click_effect_color"
                 },
                 {
                     "name": "focus_paint_padding",
@@ -1833,7 +1837,7 @@
                 },
                 {
                     "name": "radio_default_size_api_twelve",
-                    "value": "24.0vp"
+                    "value": "$float:radio_default_size_api_twelve"
                 },
                 {
                     "name": "radio_size",
diff --git a/systemres/main/resources/tv/element/color.json b/systemres/main/resources/tv/element/color.json
index b492b872..bf09ccb4 100644
--- a/systemres/main/resources/tv/element/color.json
+++ b/systemres/main/resources/tv/element/color.json
@@ -338,7 +338,7 @@
         },
         {
             "name": "ohos_id_color_switch_bg_off",
-            "value": "#33F1F3F5"
+            "value": "$color:comp_background_tertiary"
         },
         {
             "name": "ohos_id_color_floating_button_bg_normal",
diff --git a/systemres/main/resources/tv/element/color_sys.json b/systemres/main/resources/tv/element/color_sys.json
index 2685fede..4eb0037a 100644
--- a/systemres/main/resources/tv/element/color_sys.json
+++ b/systemres/main/resources/tv/element/color_sys.json
@@ -510,7 +510,7 @@
         },
         {
             "name": "background_emphasize",
-            "value": "#266EFB"
+            "value": "#317AF7"
         },
         {
             "name": "subtab_board_text_on_color",
@@ -531,6 +531,74 @@
         {
             "name": "scroll_bar_foreground_pressed_blend_color",
             "value": "$color:interactive_pressed"
+        },
+        {
+            "name": "icon_tertiary",
+            "value": "#66FFFFFF"
+        },
+        {
+            "name": "radio_container_focus_color",
+            "value": "$color:comp_background_focus"
+        },
+        {
+            "name": "radio_ring_focus_color_unchecked",
+            "value": "#99ffffff"
+        },
+        {
+            "name": "radio_container_focus_color_unchecked",
+            "value": "$color:comp_background_tertiary"
+        },
+        {
+            "name": "radio_color_hover",
+            "value": "$color:interactive_hover"
+        },
+        {
+            "name": "radio_color_foreground_contrary",
+            "value": "$color:comp_background_primary_contrary"
+        },
+        {
+            "name": "radio_bg_color_checked",
+            "value": "$color:background_emphasize"
+        },
+        {
+            "name": "radio_bg_color_unchecked",
+            "value": "$color:icon_tertiary"
+        },
+        {
+            "name": "radio_click_effect_color",
+            "value": "$color:interactive_pressed"
+        },
+        {
+            "name": "checkbox_fg_color_checked",
+            "value": "$color:comp_background_primary_contrary"
+        },
+        {
+            "name": "checkbox_bg_color_checked",
+            "value": "$color:background_emphasize"
+        },
+        {
+            "name": "checkbox_bg_border_color_unchecked",
+            "value": "$color:icon_tertiary"
+        },
+        {
+            "name": "checkbox_hover_border_color",
+            "value": "$color:interactive_hover"
+        },
+        {
+            "name": "checkbox_click_effect_color",
+            "value": "$color:interactive_pressed"
+        },
+        {
+            "name": "checkbox_container_focus_color",
+            "value": "$color:comp_background_focus"
+        },
+        {
+            "name": "checkbox_container_focus_color_unselected",
+            "value": "$color:comp_background_tertiary"
+        },
+        {
+            "name": "checkbox_focus_color",
+            "value": "#fff1f3f5"
         }
     ]
 }
\ 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 55bfc7aa..049a040e 100644
--- a/systemres/main/resources/tv/element/float_sys.json
+++ b/systemres/main/resources/tv/element/float_sys.json
@@ -570,7 +570,7 @@
         },
         {
             "name": "checkbox_round_container_focus_size",
-            "value": "2.0vp"
+            "value": "3.0vp"
         },
         {
             "name": "tab_subtab_text_default_size",
@@ -831,6 +831,102 @@
         {
             "name": "alpha_primary",
             "value": "0.9"
+        },
+        {
+            "name": "radio_focus_paint_padding",
+            "value": "6.0vp"
+        },
+        {
+            "name": "radio_container_size",
+            "value": "32.0vp"
+        },
+        {
+            "name": "radio_horizontal_padding",
+            "value": "3.0vp"
+        },
+        {
+            "name": "radio_default_size_api_twelve",
+            "value": "32.0vp"
+        },
+        {
+            "name": "ohos_id_radio_size",
+            "value": "28.0vp"
+        },
+        {
+            "name": "radio_hotzone_padding",
+            "value": "4.0vp"
+        },
+        {
+            "name": "ohos_id_radio_default_size",
+            "value": "28.0vp"
+        },
+        {
+            "name": "ohos_id_radio_border_width",
+            "value": "2.0vp"
+        },
+        {
+            "name": "radio_container_focus_size",
+            "value": "3.0vp"
+        },
+        {
+            "name": "radio_hover_bg_size",
+            "value": "3.0vp"
+        },
+        {
+            "name": "checkbox_focus_paint_padding",
+            "value": "6.0vp"
+        },
+        {
+            "name": "ohos_id_checkbox_focus_radius",
+            "value": "8.0vp"
+        },
+        {
+            "name": "checkbox_hotzone_padding_horizontal",
+            "value": "2.0vp"
+        },
+        {
+            "name": "ohos_id_checkbox_size",
+            "value": "32.0vp"
+        },
+        {
+            "name": "checkbox_hotzone_padding",
+            "value": "3.0vp"
+        },
+        {
+            "name": "ohos_id_checkbox_default_size",
+            "value": "28.0vp"
+        },
+        {
+            "name": "checkbox_default_size_twelve",
+            "value": "32.0vp"
+        },
+        {
+            "name": "checkbox_default_padding_size",
+            "value": "3.0vp"
+        },
+        {
+            "name": "checkbox_hover_padding_size",
+            "value": "3.0vp"
+        },
+        {
+            "name": "ohos_id_checkbox_border_width",
+            "value": "2.0vp"
+        },
+        {
+            "name": "ohos_id_checkbox_stroke_width",
+            "value": "2.6vp"
+        },
+        {
+            "name": "checkbox_container_focus_size",
+            "value": "3.0vp"
+        },
+        {
+            "name": "checkbox_focus_white_border_radius",
+            "value": "2.0vp"
+        },
+        {
+            "name": "checkbox_default_round_padding_size",
+            "value": "3.0vp"
         }
     ]
 }
\ No newline at end of file
diff --git a/systemres/main/resources/tv/element/pattern.json b/systemres/main/resources/tv/element/pattern.json
index b99ca4da..037c8915 100644
--- a/systemres/main/resources/tv/element/pattern.json
+++ b/systemres/main/resources/tv/element/pattern.json
@@ -551,320 +551,6 @@
                 }
             ]
         },
-        {
-            "name": "ohos_checkbox_pattern",
-            "value": [
-                {
-                    "name": "fg_color_checked",
-                    "value": "#F1F3F5"
-                },
-                {
-                    "name": "bg_color_checked",
-                    "value": "#266EFB"
-                },
-                {
-                    "name": "bg_color_unchecked",
-                    "value": "$color:ohos_id_color_switch_bg_off"
-                },
-                {
-                    "name": "bg_border_color_unchecked",
-                    "value": "$color:ohos_id_color_switch_outline_off"
-                },
-                {
-                    "name": "focus_border_color",
-                    "value": "$color:ohos_id_color_switch_outline_off"
-                },
-                {
-                    "name": "bg_border_radius",
-                    "value": "4.0vp"
-                },
-                {
-                    "name": "hover_border_color",
-                    "value": "#4dffffff"
-                },
-                {
-                    "name": "click_effect_color",
-                    "value": "#26FFFFFF"
-                },
-                {
-                    "name": "hover_border_radius",
-                    "value": "8.0vp"
-                },
-                {
-                    "name": "focus_paint_padding",
-                    "value": "5.0vp"
-                },
-                {
-                    "name": "focus_border_radius",
-                    "value": "8.0vp"
-                },
-                {
-                    "name": "hover_animation_duration",
-                    "value": "$float:ohos_id_hover_animation_duration_default"
-                },
-                {
-                    "name": "hover_to_press_animation_duration",
-                    "value": "$float:ohos_id_hover_to_press_animation_duration_default"
-                },
-                {
-                    "name": "press_animation_duration",
-                    "value": "$float:ohos_id_press_animation_duration_default"
-                },
-                {
-                    "name": "color_animation_duration",
-                    "value": "100.0"
-                },
-                {
-                    "name": "default_width",
-                    "value": "24.0vp"
-                },
-                {
-                    "name": "default_height",
-                    "value": "24.0vp"
-                },
-                {
-                    "name": "hotzone_padding_horizontal",
-                    "value": "2.0vp"
-                },
-                {
-                    "name": "hotzone_padding_verical",
-                    "value": "12.0vp"
-                },
-                {
-                    "name": "default_padding",
-                    "value": "2.0vp"
-                },
-                {
-                    "name": "checkbox_size",
-                    "value": "28.0vp"
-                },
-                {
-                    "name": "checkbox_hotzone_padding",
-                    "value": "4.0vp"
-                },
-                {
-                    "name": "checkbox_default_size",
-                    "value": "28.0vp"
-                },
-                {
-                    "name": "checkbox_need_focus",
-                    "value": "$float:ohos_id_checkbox_need_focus"
-                },
-                {
-                    "name": "checkbox_default_size_twelve",
-                    "value": "28.0vp"
-                },
-                {
-                    "name": "checkbox_default_padding_size",
-                    "value": "4.0vp"
-                },
-                {
-                    "name": "checkbox_hover_padding_size",
-                    "value": "4.0vp"
-                },
-                {
-                    "name": "checkbox_inactive_background_solid",
-                    "value": "$float:ohos_id_checkbox_inactive_background_solid"
-                },
-                {
-                    "name": "checkbox_border_width",
-                    "value": "1.5vp"
-                },
-                {
-                    "name": "checkbox_stroke_width",
-                    "value": "2.0vp"
-                },
-                {
-                    "name": "checkbox_shadow_color",
-                    "value": "$color:ohos_id_checkbox_shadow_color"
-                },
-                {
-                    "name": "checkbox_shadow_width",
-                    "value": "1.0vp"
-                },
-                {
-                    "name": "color_focused_bg",
-                    "value": "#4dffffff"
-                },
-                {
-                    "name": "size_focused_bg",
-                    "value": "4.0vp"
-                },
-                {
-                    "name": "focused_border_color",
-                    "value": "$color:checkbox_focus_border_color"
-                },
-                {
-                    "name": "focused_bg_color_unselected",
-                    "value": "#4dffffff"
-                },
-                {
-                    "name": "round_size_focused_bg",
-                    "value": "2.0vp"
-                },
-                {
-                    "name": "checkbox_focus_color_sys",
-                    "value": "#fff1f3f5"
-                },
-                {
-                    "name": "radio_circle_dial",
-                    "value": "$float:radio_circle_dial"
-                },
-                {
-                    "name": "focus_white_border_radius",
-                    "value": "2.0vp"
-                }
-            ]
-        },
-        {
-            "name": "ohos_radio_pattern",
-            "value": [
-                {
-                    "name": "bg_focus_outline_color",
-                    "value": "$color:radio_focus_color"
-                },
-                {
-                    "name": "radio_hover_bg_size",
-                    "value": "$float:radio_hover_bg_size"
-                },
-                {
-                    "name": "hover_border_color",
-                    "value": "#4dffffff"
-                },
-                {
-                    "name": "focus_border_color",
-                    "value": "$color:ohos_id_color_switch_outline_off"
-                },
-                {
-                    "name": "fg_color_checked",
-                    "value": "#F1F3F5"
-                },
-                {
-                    "name": "fg_color_unchecked",
-                    "value": "$color:ohos_id_color_switch_bg_off"
-                },
-                {
-                    "name": "bg_color_checked",
-                    "value": "#266EFB"
-                },
-                {
-                    "name": "bg_color_unchecked",
-                    "value": "$color:ohos_id_color_switch_outline_off"
-                },
-                {
-                    "name": "click_effect_color",
-                    "value": "#26FFFFFF"
-                },
-                {
-                    "name": "focus_paint_padding",
-                    "value": "5.0vp"
-                },
-                {
-                    "name": "hover_animation_duration",
-                    "value": "$float:ohos_id_hover_animation_duration_default"
-                },
-                {
-                    "name": "hover_to_press_animation_duration",
-                    "value": "$float:ohos_id_hover_to_press_animation_duration_default"
-                },
-                {
-                    "name": "press_animation_duration",
-                    "value": "$float:ohos_id_press_animation_duration_default"
-                },
-                {
-                    "name": "default_width",
-                    "value": "24.0vp"
-                },
-                {
-                    "name": "default_height",
-                    "value": "24.0vp"
-                },
-                {
-                    "name": "hotzone_padding_horizontal",
-                    "value": "12.0vp"
-                },
-                {
-                    "name": "hotzone_padding_verical",
-                    "value": "12.0vp"
-                },
-                {
-                    "name": "default_padding",
-                    "value": "2.0vp"
-                },
-                {
-                    "name": "radio_size_api_twelve",
-                    "value": "24.0vp"
-                },
-                {
-                    "name": "radio_default_padding_size",
-                    "value": "$float:radio_horizontal_padding"
-                },
-                {
-                    "name": "radio_default_size_api_twelve",
-                    "value": "24.0vp"
-                },
-                {
-                    "name": "radio_size",
-                    "value": "28.0vp"
-                },
-                {
-                    "name": "radio_hotzone_padding",
-                    "value": "4.0vp"
-                },
-                {
-                    "name": "radio_default_size",
-                    "value": "28.0vp"
-                },
-                {
-                    "name": "radio_inner_size_ratio",
-                    "value": "$float:ohos_id_radio_inner_size_ratio"
-                },
-                {
-                    "name": "radio_need_focus",
-                    "value": "$float:ohos_id_radio_need_focus"
-                },
-                {
-                    "name": "radio_inactive_background_solid",
-                    "value": "$float:ohos_id_radio_inactive_background_solid"
-                },
-                {
-                    "name": "radio_border_width",
-                    "value": "1.5vp"
-                },
-                {
-                    "name": "radio_shadow_color",
-                    "value": "$color:ohos_id_radio_shadow_color"
-                },
-                {
-                    "name": "radio_shadow_width",
-                    "value": "1.0vp"
-                },
-                {
-                    "name": "radio_circle_dial",
-                    "value": "$float:radio_circle_dial"
-                },
-                {
-                    "name": "size_focused_bg",
-                    "value": "2.0vp"
-                },
-                {
-                    "name": "color_focused_bg",
-                    "value": "#4dffffff"
-                },
-                {
-                    "name": "focused_ring_unchecked",
-                    "value": "#99ffffff"
-                },
-                {
-                    "name": "focused_bg_unchecked",
-                    "value": "#4dffffff"
-                },
-                {
-                    "name": "radio_hover_bg_size",
-                    "value": "$float:radio_container_hover_size"
-                }
-            ]
-        },
         {
             "name": "ohos_dialog_pattern",
             "value": [
-- 
Gitee