瀏覽代碼

refactor(UI):
- 统一dimens资源命名与数值规范
- 移除部分冗余dimens资源
- drawable中引用的dimens资源同步更新

周文健 2 月之前
父節點
當前提交
b8ce19822d
共有 41 個文件被更改,包括 86 次插入249 次删除
  1. 2 2
      app/src/main/res/drawable-land/bg_job_execute_step.xml
  2. 2 2
      app/src/main/res/drawable/bg_btn_job_execute_go_locking.xml
  3. 2 2
      app/src/main/res/drawable/bg_btn_job_execute_go_unlocking.xml
  4. 1 1
      app/src/main/res/drawable/bg_card_item.xml
  5. 1 1
      app/src/main/res/drawable/bg_card_item_land.xml
  6. 1 1
      app/src/main/res/drawable/bg_card_white_r8.xml
  7. 2 2
      app/src/main/res/drawable/bg_common_input_disable.xml
  8. 2 2
      app/src/main/res/drawable/bg_common_input_normal.xml
  9. 2 2
      app/src/main/res/drawable/bg_group_name_input_normal.xml
  10. 1 1
      app/src/main/res/drawable/bg_home_card_num.xml
  11. 1 1
      app/src/main/res/drawable/bg_home_menu_item.xml
  12. 1 1
      app/src/main/res/drawable/bg_item_group_title_normal.xml
  13. 1 1
      app/src/main/res/drawable/bg_item_group_title_selected.xml
  14. 2 2
      app/src/main/res/drawable/bg_job_execute_step.xml
  15. 1 1
      app/src/main/res/drawable/bg_job_execute_step_index.xml
  16. 1 1
      app/src/main/res/drawable/bg_main_color_tip.xml
  17. 1 1
      app/src/main/res/drawable/bg_point_normal.xml
  18. 1 1
      app/src/main/res/drawable/bg_point_selected.xml
  19. 2 2
      app/src/main/res/drawable/bg_select_member_btn.xml
  20. 1 1
      app/src/main/res/drawable/bg_status_chip.xml
  21. 1 1
      app/src/main/res/drawable/bg_text_drop_down.xml
  22. 4 4
      app/src/main/res/drawable/bg_tip_red.xml
  23. 2 1
      app/src/main/res/drawable/bg_workstation_item_normal.xml
  24. 1 0
      app/src/main/res/drawable/bg_workstation_item_selected.xml
  25. 2 1
      app/src/main/res/drawable/card_white_bg.xml
  26. 1 1
      app/src/main/res/drawable/circle_image_bg.xml
  27. 1 1
      app/src/main/res/drawable/common_btn_green_bg.xml
  28. 1 1
      app/src/main/res/drawable/common_btn_red_bg.xml
  29. 2 2
      app/src/main/res/drawable/common_status_circle.xml
  30. 2 2
      app/src/main/res/drawable/divider_table.xml
  31. 2 2
      app/src/main/res/drawable/home_card_bg.xml
  32. 2 2
      app/src/main/res/drawable/init_step_circle.xml
  33. 2 2
      app/src/main/res/drawable/login_tip_circle.xml
  34. 1 1
      app/src/main/res/drawable/oval_shape.xml
  35. 2 2
      app/src/main/res/drawable/selectable_input_text_bg.xml
  36. 2 2
      app/src/main/res/drawable/table_border.xml
  37. 2 2
      app/src/main/res/drawable/table_row_border.xml
  38. 0 13
      app/src/main/res/values-land/dimens.xml
  39. 0 13
      app/src/main/res/values/dimens.xml
  40. 0 65
      ui-base/src/main/res/values-land/dimens.xml
  41. 28 103
      ui-base/src/main/res/values/dimens.xml

+ 2 - 2
app/src/main/res/drawable-land/bg_job_execute_step.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <corners android:radius="@dimen/common_spacing_2x" />
+    <corners android:radius="@dimen/iscs_radius_xl" />
     <solid android:color="?attr/colorLightGray" />
     <stroke
-        android:width="2dp"
+        android:width="@dimen/iscs_stroke_sm"
         android:color="?attr/colorBlack" />
 </shape>

+ 2 - 2
app/src/main/res/drawable/bg_btn_job_execute_go_locking.xml

@@ -2,8 +2,8 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <stroke
-        android:width="@dimen/divider_line_space"
+        android:width="@dimen/iscs_stroke_sm"
         android:color="?attr/colorBlack" />
     <solid android:color="?attr/colorStatusRed" />
-    <corners android:radius="4dp" />
+    <corners android:radius="@dimen/iscs_radius_sm" />
 </shape>

+ 2 - 2
app/src/main/res/drawable/bg_btn_job_execute_go_unlocking.xml

@@ -2,8 +2,8 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <stroke
-        android:width="@dimen/divider_line_space"
+        android:width="@dimen/iscs_stroke_sm"
         android:color="?attr/colorBlack" />
     <solid android:color="?attr/colorStatusGreen" />
-    <corners android:radius="4dp" />
+    <corners android:radius="@dimen/iscs_radius_md" />
 </shape>

+ 1 - 1
app/src/main/res/drawable/bg_card_item.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <solid android:color="?attr/colorWhite20" />
-    <corners android:radius="20dp" />
+    <corners android:radius="@dimen/iscs_radius_xl" />
 </shape>

+ 1 - 1
app/src/main/res/drawable/bg_card_item_land.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <solid android:color="?attr/colorWhite20" />
-    <corners android:radius="34dp" />
+    <corners android:radius="@dimen/iscs_radius_xl" />
 </shape>

+ 1 - 1
app/src/main/res/drawable/bg_card_white_r8.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <solid android:color="?attr/colorWhite" />
-    <corners android:radius="8dp" />
+    <corners android:radius="@dimen/iscs_radius_md" />
 </shape>

+ 2 - 2
app/src/main/res/drawable/bg_common_input_disable.xml

@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <solid android:color="?attr/colorSelectedGray" />
     <stroke
-        android:width="@dimen/divider_line_space"
+        android:width="@dimen/iscs_stroke_sm"
         android:color="?attr/colorBlack" />
-    <corners android:radius="4dp" />
+    <corners android:radius="@dimen/iscs_radius_sm" />
 </shape>

+ 2 - 2
app/src/main/res/drawable/bg_common_input_normal.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <stroke
-        android:width="@dimen/divider_line_space"
+        android:width="@dimen/iscs_stroke_sm"
         android:color="?attr/colorBlack" />
-    <corners android:radius="4dp" />
+    <corners android:radius="@dimen/iscs_radius_sm" />
     <solid android:color="?attr/colorWhite" />
 </shape>

+ 2 - 2
app/src/main/res/drawable/bg_group_name_input_normal.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <stroke
-        android:width="@dimen/divider_line_space"
+        android:width="@dimen/iscs_stroke_sm"
         android:color="?attr/colorBlack" />
-    <corners android:radius="4dp" />
+    <corners android:radius="@dimen/iscs_radius_sm" />
 </shape>

+ 1 - 1
app/src/main/res/drawable/bg_home_card_num.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <corners android:radius="@dimen/common_spacing" />
+    <corners android:radius="@dimen/iscs_radius_md" />
     <solid android:color="?attr/colorWhite30" />
 </shape>

+ 1 - 1
app/src/main/res/drawable/bg_home_menu_item.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <solid android:color="?attr/colorWhite30" />
-    <corners android:radius="@dimen/common_spacing_2x" />
+    <corners android:radius="@dimen/iscs_radius_xl" />
 </shape>

+ 1 - 1
app/src/main/res/drawable/bg_item_group_title_normal.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <stroke android:width="1dp" />
+    <stroke android:width="@dimen/iscs_stroke_sm" />
     <solid android:color="?attr/colorWhite" />
 </shape>

+ 1 - 1
app/src/main/res/drawable/bg_item_group_title_selected.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <stroke android:width="1dp" />
+    <stroke android:width="@dimen/iscs_stroke_sm" />
     <solid android:color="?attr/colorPrimary" />
 </shape>

+ 2 - 2
app/src/main/res/drawable/bg_job_execute_step.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <corners android:radius="@dimen/common_spacing_2x" />
+    <corners android:radius="@dimen/iscs_radius_xl" />
     <solid android:color="?attr/colorLightGray" />
     <stroke
-        android:width="2dp"
+        android:width="@dimen/iscs_stroke_sm"
         android:color="?attr/colorBlack" />
 </shape>

+ 1 - 1
app/src/main/res/drawable/bg_job_execute_step_index.xml

@@ -2,6 +2,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
     <stroke
-        android:width="@dimen/divider_line_space"
+        android:width="@dimen/iscs_stroke_sm"
         android:color="?attr/colorBlack" />
 </shape>

+ 1 - 1
app/src/main/res/drawable/bg_main_color_tip.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <solid android:color="?attr/colorPrimary" />
-    <corners android:radius="@dimen/common_radius" />
+    <corners android:radius="@dimen/iscs_radius_sm" />
 </shape>

+ 1 - 1
app/src/main/res/drawable/bg_point_normal.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <stroke android:width="@dimen/divider_line_space" android:color="?attr/colorBlack"/>
+    <stroke android:width="@dimen/iscs_stroke_sm" android:color="?attr/colorBlack"/>
     <solid android:color="?attr/colorWhite"/>
 </shape>

+ 1 - 1
app/src/main/res/drawable/bg_point_selected.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <stroke android:width="@dimen/divider_line_space" android:color="?attr/colorBlack"/>
+    <stroke android:width="@dimen/iscs_stroke_sm" android:color="?attr/colorBlack"/>
     <solid android:color="?attr/colorSelectedLightBlue"/>
 </shape>

+ 2 - 2
app/src/main/res/drawable/bg_select_member_btn.xml

@@ -3,7 +3,7 @@
     android:shape="rectangle">
     <solid android:color="?attr/colorInfo" />
     <stroke
-        android:width="@dimen/divider_line_space"
+        android:width="@dimen/iscs_stroke_sm"
         android:color="?attr/colorBlack" />
-    <corners android:radius="6dp" />
+    <corners android:radius="@dimen/iscs_radius_sm" />
 </shape>

+ 1 - 1
app/src/main/res/drawable/bg_status_chip.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <corners android:radius="@dimen/common_radius_small" />
+    <corners android:radius="@dimen/iscs_radius_sm" />
     <solid android:color="?attr/colorInfo" />
 </shape>

+ 1 - 1
app/src/main/res/drawable/bg_text_drop_down.xml

@@ -3,6 +3,6 @@
     android:shape="rectangle">
     <solid android:color="?attr/colorWhite" />
     <stroke
-        android:width="@dimen/divider_line_space"
+        android:width="@dimen/iscs_stroke_sm"
         android:color="?attr/colorBlack" />
 </shape>

+ 4 - 4
app/src/main/res/drawable/bg_tip_red.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <corners android:radius="4dp" />
-    <solid android:color="#fa5252" />
+    <corners android:radius="@dimen/iscs_radius_sm" />
+    <solid android:color="?attr/colorError" />
     <stroke
-        android:width="1dp"
-        android:color="#e43636" />
+        android:width="@dimen/iscs_stroke_sm"
+        android:color="?attr/colorStatusRed" />
 </shape>

+ 2 - 1
app/src/main/res/drawable/bg_workstation_item_normal.xml

@@ -3,6 +3,7 @@
     android:shape="rectangle">
     <solid android:color="?attr/colorWhite" />
     <stroke
-        android:width="@dimen/divider_line_space"
+        android:width="@dimen/iscs_stroke_sm"
         android:color="?attr/colorBlack" />
+    <corners android:radius="@dimen/iscs_radius_sm"/>
 </shape>

+ 1 - 0
app/src/main/res/drawable/bg_workstation_item_selected.xml

@@ -2,4 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <solid android:color="?attr/colorInfo" />
+    <corners android:radius="@dimen/iscs_radius_sm" />
 </shape>

+ 2 - 1
app/src/main/res/drawable/card_white_bg.xml

@@ -2,7 +2,8 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <stroke
-        android:width="@dimen/divider_line_space"
+        android:width="@dimen/iscs_stroke_sm"
         android:color="?attr/colorBlack" />
     <solid android:color="?attr/colorLightGray" />
+    <corners android:radius="@dimen/iscs_radius_sm"/>
 </shape>

+ 1 - 1
app/src/main/res/drawable/circle_image_bg.xml

@@ -2,6 +2,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
     <stroke
-        android:width="2dp"
+        android:width="@dimen/iscs_stroke_sm"
         android:color="?attr/colorBlack"/>
 </shape>

+ 1 - 1
app/src/main/res/drawable/common_btn_green_bg.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <corners android:radius="@dimen/common_radius_small" />
+    <corners android:radius="@dimen/iscs_radius_sm" />
     <solid android:color="?attr/colorStatusGreen" />
 </shape>

+ 1 - 1
app/src/main/res/drawable/common_btn_red_bg.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <corners android:radius="@dimen/common_radius_small" />
+    <corners android:radius="@dimen/iscs_radius_sm" />
     <solid android:color="?attr/colorStatusRed" />
 </shape>

+ 2 - 2
app/src/main/res/drawable/common_status_circle.xml

@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
     <size
-        android:width="@dimen/common_status_circle_small"
-        android:height="@dimen/common_status_circle_small" />
+        android:width="@dimen/iscs_radius_sm"
+        android:height="@dimen/iscs_radius_sm" />
     <solid android:color="?attr/colorStatusRed" />
 </shape>

+ 2 - 2
app/src/main/res/drawable/divider_table.xml

@@ -3,6 +3,6 @@
     android:shape="rectangle">
     <solid android:color="?attr/colorBlack" />
     <size
-        android:width="@dimen/divider_line_space"
-        android:height="@dimen/divider_line_space" />
+        android:width="@dimen/iscs_stroke_sm"
+        android:height="@dimen/iscs_stroke_sm" />
 </shape>

+ 2 - 2
app/src/main/res/drawable/home_card_bg.xml

@@ -2,8 +2,8 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <stroke
-        android:width="@dimen/divider_line_space"
+        android:width="@dimen/iscs_stroke_sm"
         android:color="?attr/colorBlack" />
     <solid android:color="?attr/colorWhite" />
-    <corners android:radius="2dp" />
+    <corners android:radius="@dimen/iscs_radius_xs" />
 </shape>

+ 2 - 2
app/src/main/res/drawable/init_step_circle.xml

@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
     <size
-        android:width="@dimen/common_spacing"
-        android:height="@dimen/common_spacing" />
+        android:width="@dimen/iscs_radius_md"
+        android:height="@dimen/iscs_radius_md" />
     <solid android:color="?attr/colorPrimary" />
 </shape>

+ 2 - 2
app/src/main/res/drawable/login_tip_circle.xml

@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
     <size
-        android:width="@dimen/common_spacing"
-        android:height="@dimen/common_spacing" />
+        android:width="@dimen/iscs_radius_md"
+        android:height="@dimen/iscs_radius_md" />
     <solid android:color="?attr/colorPrimaryLight" />
 </shape>

+ 1 - 1
app/src/main/res/drawable/oval_shape.xml

@@ -4,6 +4,6 @@
     <solid android:color="#FFF" />
     <!-- 背景色可随意 -->
     <stroke
-        android:width="2dp"
+        android:width="@dimen/iscs_stroke_sm"
         android:color="?attr/colorBlack" />
 </shape>

+ 2 - 2
app/src/main/res/drawable/selectable_input_text_bg.xml

@@ -3,9 +3,9 @@
     <item>
         <shape android:shape="rectangle">
             <solid android:color="?attr/colorWhite" />
-            <corners android:radius="@dimen/selectable_input_radius" />
+            <corners android:radius="@dimen/iscs_radius_xs" />
             <stroke
-                android:width="@dimen/selectable_input_stroke"
+                android:width="@dimen/iscs_stroke_sm"
                 android:color="?attr/colorPrimary" />
         </shape>
     </item>

+ 2 - 2
app/src/main/res/drawable/table_border.xml

@@ -3,6 +3,6 @@
     android:shape="rectangle">
     <solid android:color="@android:color/white" />
     <stroke
-        android:width="2dp"
-        android:color="#000000" />
+        android:width="@dimen/iscs_stroke_sm"
+        android:color="?attr/colorBlack" />
 </shape>

+ 2 - 2
app/src/main/res/drawable/table_row_border.xml

@@ -3,6 +3,6 @@
     android:shape="rectangle">
     <solid android:color="@android:color/white" />
     <stroke
-        android:width="1dp"
-        android:color="#000000" />
+        android:width="@dimen/iscs_stroke_sm"
+        android:color="?attr/colorBlack" />
 </shape>

+ 0 - 13
app/src/main/res/values-land/dimens.xml

@@ -18,8 +18,6 @@
     <dimen name="login_tec_support_text_size">30.6sp</dimen>
     <dimen name="login_tec_support_margin_bottom">10dp</dimen>
     <dimen name="header_time_padding">5dp</dimen>
-    <dimen name="home_user_icon_size">25dp</dimen>
-    <dimen name="home_user_icon_margin">3dp</dimen>
     <dimen name="home_nickname_margin">10dp</dimen>
     <dimen name="home_nickname_text_size">28sp</dimen>
     <dimen name="home_bottom_nav_size">52dp</dimen>
@@ -27,24 +25,18 @@
     <dimen name="home_bottom_nav_icon_size">23dp</dimen>
     <dimen name="dialog_common_root_width">680dp</dimen>
     <dimen name="dialog_common_root_height_large">1020dp</dimen>
-    <dimen name="dialog_common_root_height_big">500dp</dimen>
-    <dimen name="dialog_common_root_height_medium">400dp</dimen>
     <dimen name="dialog_common_root_height_small">340dp</dimen>
     <dimen name="dialog_common_root_height_normal">510dp</dimen>
     <dimen name="title_normal_padding_horizontal">10dp</dimen>
     <dimen name="title_normal_padding_vertical">5dp</dimen>
-    <dimen name="title_normal_text_size">20sp</dimen>
     <dimen name="divider_line_space">1dp</dimen>
-    <dimen name="dialog_normal_margin_top">20dp</dimen>
     <dimen name="dialog_content_normal_padding_horizontal">16dp</dimen>
     <dimen name="normal_text_size">30sp</dimen>
     <dimen name="normal_input_padding_horizontal">10dp</dimen>
     <dimen name="normal_input_padding_vertical">2dp</dimen>
     <dimen name="normal_radio_root_layout_padding">56dp</dimen>
     <dimen name="normal_margin_left">10dp</dimen>
-    <dimen name="normal_layout_margin_top">20dp</dimen>
     <dimen name="common_margin_spacing_big">40dp</dimen>
-    <dimen name="common_spacing_4x">40dp</dimen>
     <dimen name="common_spacing_7x">70dp</dimen>
     <dimen name="common_spacing_1_5x">15dp</dimen>
     <dimen name="init_margin_space">120dp</dimen>
@@ -62,7 +54,6 @@
     <dimen name="home_item_quick_entrance_iv_layout">100dp</dimen>
     <dimen name="home_item_quick_entrance_iv">80dp</dimen>
     <dimen name="home_item_quick_entrace_text_size">24sp</dimen>
-    <dimen name="vector_icon_size">24dp</dimen>
     <dimen name="item_login_tip_v_margin_top">32dp</dimen>
     <dimen name="item_login_tip_v_margin_right">23dp</dimen>
     <dimen name="normal_text_size_18">30sp</dimen>
@@ -72,7 +63,6 @@
     <dimen name="login_dialog_input_height">115dp</dimen>
     <dimen name="login_dialog_btn_height">102dp</dimen>
     <dimen name="step_rv_height">323dp</dimen>
-    <dimen name="point_rv_height">408dp</dimen>
     <dimen name="btn_layout_min_height">112dp</dimen>
     <dimen name="step_item_width">204dp</dimen>
     <dimen name="step_item_height">306dp</dimen>
@@ -81,9 +71,6 @@
     <dimen name="workflow_step_item_width">204dp</dimen>
     <dimen name="workflow_step_item_height">170dp</dimen>
     <dimen name="workflow_step_item_index_size">51dp</dimen>
-    <dimen name="home_bottom_nav_ball_size">8dp</dimen>
-    <dimen name="home_bottom_nav_corner_radius">10dp</dimen>
-    <dimen name="home_bottom_nav_notch_height">28dp</dimen>
     <dimen name="item_device_text_size">12sp</dimen>
     <dimen name="home_menu_item_layout_size">180dp</dimen>
     <dimen name="home_menu_item_iv_layout_size">120dp</dimen>

+ 0 - 13
app/src/main/res/values/dimens.xml

@@ -18,8 +18,6 @@
     <dimen name="login_tec_support_text_size">18sp</dimen>
     <dimen name="login_tec_support_margin_bottom">10dp</dimen>
     <dimen name="header_time_padding">5dp</dimen>
-    <dimen name="home_user_icon_size">25dp</dimen>
-    <dimen name="home_user_icon_margin">3dp</dimen>
     <dimen name="home_nickname_margin">10dp</dimen>
     <dimen name="home_nickname_text_size">20sp</dimen>
     <dimen name="home_bottom_nav_size">90dp</dimen>
@@ -27,24 +25,18 @@
     <dimen name="home_bottom_nav_icon_size">40dp</dimen>
     <dimen name="dialog_common_root_width">400dp</dimen>
     <dimen name="dialog_common_root_height_large">600dp</dimen>
-    <dimen name="dialog_common_root_height_big">500dp</dimen>
-    <dimen name="dialog_common_root_height_medium">400dp</dimen>
     <dimen name="dialog_common_root_height_small">200dp</dimen>
     <dimen name="dialog_common_root_height_normal">300dp</dimen>
     <dimen name="title_normal_padding_horizontal">10dp</dimen>
     <dimen name="title_normal_padding_vertical">5dp</dimen>
-    <dimen name="title_normal_text_size">20sp</dimen>
     <dimen name="divider_line_space">1dp</dimen>
-    <dimen name="dialog_normal_margin_top">20dp</dimen>
     <dimen name="dialog_content_normal_padding_horizontal">16dp</dimen>
     <dimen name="normal_text_size">18sp</dimen>
     <dimen name="normal_input_padding_horizontal">10dp</dimen>
     <dimen name="normal_input_padding_vertical">2dp</dimen>
     <dimen name="normal_radio_root_layout_padding">56dp</dimen>
     <dimen name="normal_margin_left">10dp</dimen>
-    <dimen name="normal_layout_margin_top">20dp</dimen>
     <dimen name="common_margin_spacing_big">40dp</dimen>
-    <dimen name="common_spacing_4x">40dp</dimen>
     <dimen name="common_spacing_7x">70dp</dimen>
     <dimen name="common_spacing_1_5x">15dp</dimen>
     <dimen name="init_margin_space">120dp</dimen>
@@ -62,7 +54,6 @@
     <dimen name="home_item_quick_entrance_iv_layout">100dp</dimen>
     <dimen name="home_item_quick_entrance_iv">80dp</dimen>
     <dimen name="home_item_quick_entrace_text_size">24sp</dimen>
-    <dimen name="vector_icon_size">24dp</dimen>
     <dimen name="item_login_tip_v_margin_top">19dp</dimen>
     <dimen name="item_login_tip_v_margin_right">14dp</dimen>
     <dimen name="normal_text_size_18">18sp</dimen>
@@ -72,7 +63,6 @@
     <dimen name="login_dialog_input_height">68dp</dimen>
     <dimen name="login_dialog_btn_height">60dp</dimen>
     <dimen name="step_rv_height">190dp</dimen>
-    <dimen name="point_rv_height">240dp</dimen>
     <dimen name="btn_layout_min_height">60dp</dimen>
     <dimen name="workflow_step_item_width">120dp</dimen>
     <dimen name="workflow_step_item_height">100dp</dimen>
@@ -81,9 +71,6 @@
     <dimen name="step_item_height">180dp</dimen>
     <dimen name="step_item_icon_size">70dp</dimen>
     <dimen name="step_item_index_size">30dp</dimen>
-    <dimen name="home_bottom_nav_ball_size">8dp</dimen>
-    <dimen name="home_bottom_nav_corner_radius">30dp</dimen>
-    <dimen name="home_bottom_nav_notch_height">28dp</dimen>
     <dimen name="item_device_text_size">12sp</dimen>
     <dimen name="home_menu_item_layout_size">180dp</dimen>
     <dimen name="home_menu_item_iv_layout_size">120dp</dimen>

+ 0 - 65
ui-base/src/main/res/values-land/dimens.xml

@@ -2,97 +2,32 @@
 <resources>
     <dimen name="common_text_size">30sp</dimen>
     <dimen name="common_btn_text_size">34sp</dimen>
-    <dimen name="common_text_size_land">15.3dp</dimen>
     <dimen name="common_text_size_big">47.6dp</dimen>
     <dimen name="common_text_size_small">27.2dp</dimen>
     <dimen name="common_text_padding">8.5dp</dimen>
-    <dimen name="common_text_padding_land">4.25dp</dimen>
-    <dimen name="common_font_txt_size_page_title">23.8dp</dimen>
     <dimen name="common_radius">17dp</dimen>
     <dimen name="common_radius_small">8.5dp</dimen>
     <dimen name="common_spacing">10dp</dimen>
     <dimen name="common_spacing_2x">34dp</dimen>
-    <dimen name="common_spacing_3x">30dp</dimen>
-    <dimen name="common_spacing_big">25.5dp</dimen>
     <dimen name="common_spacing_small">8.5dp</dimen>
-    <dimen name="common_spacing_smallest">3.4dp</dimen>
     <dimen name="common_margin_spacing_big">68dp</dimen>
     <dimen name="common_icon_size">25.5dp</dimen>
-    <dimen name="common_icon_size_small">20.4dp</dimen>
     <dimen name="common_status_circle_small">8.5dp</dimen>
-    <dimen name="common_status_circle_medium">17dp</dimen>
 
     <dimen name="common_btn_width">255dp</dimen>
     <dimen name="common_btn_height">85dp</dimen>
-    <dimen name="common_btn_width_land">127.5dp</dimen>
-    <dimen name="common_btn_height_land">42.5dp</dimen>
-
-    <dimen name="title_bar_height">85dp</dimen>
-    <dimen name="title_bar_padding">11.9dp</dimen>
-    <dimen name="title_bar_title_text_size">34dp</dimen>
-    <dimen name="title_bar_sub_title_text_size">17dp</dimen>
-    <dimen name="title_bar_back_size">28.9dp</dimen>
-
-    <dimen name="switch_width">78.2dp</dimen>
-    <dimen name="switch_height">44.2dp</dimen>
-    <dimen name="switch_radius">22.1dp</dimen>
-    <dimen name="switch_thumb_stroke">3.4dp</dimen>
-    <dimen name="switch_thumb_size">37.4dp</dimen>
-
-    <dimen name="home_navi_height">340dp</dimen>
-    <dimen name="home_navi_width">226.1dp</dimen>
 
     <!-- 通用tab -->
-    <dimen name="common_rv_tab_item_width">108.8dp</dimen>
-    <dimen name="common_rv_tab_item_height">32.3dp</dimen>
-    <dimen name="common_rv_tab_padding">10.2dp</dimen>
-    <dimen name="common_rv_tab_bg_radius">5.1dp</dimen>
 
     <!--  输入选择控件  -->
-    <dimen name="selectable_input_width">141.1dp</dimen>
     <dimen name="selectable_input_radius">3.4dp</dimen>
     <dimen name="selectable_input_stroke">1.7dp</dimen>
-    <dimen name="selectable_input_min_height">39.1dp</dimen>
-    <dimen name="selectable_input_spinner_arrow_size">17dp</dimen>
-    <dimen name="selectable_input_spinner_arrow_margin">5.1dp</dimen>
     <dimen name="selectable_input_edit_padding">5.1dp</dimen>
 
-    <dimen name="rv_item_margin">1.7dp</dimen>
-
-    <dimen name="close_eyes_width">39.1dp</dimen>
-    <dimen name="login_btn_radius">34dp</dimen>
-    <dimen name="login_btn_width">266.9dp</dimen>
-    <dimen name="login_btn_height">68dp</dimen>
-    <dimen name="common_common_btn_elevation">17dp</dimen>
-    <dimen name="login_btn_margin_top">34dp</dimen>
-    <dimen name="login_btn_text_size">22.1dp</dimen>
-
-    <dimen name="home_module_margin">5.1dp</dimen>
-
     <dimen name="dialog_card_login_width">544dp</dimen>
-    <dimen name="dialog_card_login_height">306dp</dimen>
 
-    <dimen name="menu_padding">25.5dp</dimen>
     <dimen name="divider_line_width">1.7dp</dimen>
-    <dimen name="divider_line_margin">8.5dp</dimen>
-    <dimen name="page_padding">34dp</dimen>
-    <dimen name="item_rv_technology_height">351.9dp</dimen>
-    <dimen name="item_rv_technology_width">200.6dp</dimen>
-    <dimen name="item_rv_technology_type_height">28.9dp</dimen>
-    <dimen name="item_rv_technology_type_width">78.2dp</dimen>
-    <dimen name="item_rv_technology_type_padding">5.1dp</dimen>
-    <dimen name="dialog_tip_width">435.2dp</dimen>
-    <dimen name="dialog_tip_height">244.8dp</dimen>
-    <dimen name="dialog_ticket_list_height">340dp</dimen>
 
-    <dimen name="item_rv_step_width">136dp</dimen>
-    <dimen name="item_rv_step_height">187dp</dimen>
-    <dimen name="item_rv_menu_size">98.6dp</dimen>
-    <dimen name="item_rv_menu_icon_size">34dp</dimen>
-    <dimen name="item_rv_login_width">170dp</dimen>
-    <dimen name="item_rv_login_height">221dp</dimen>
-    <dimen name="item_rv_login_margin">11.9dp</dimen>
-    <dimen name="item_rv_login_icon_size">68dp</dimen>
     <dimen name="divider_line_space">1.7dp</dimen>
     <dimen name="tip_dialog_btn_width">119dp</dimen>
     <dimen name="tip_dialog_btn_height">70dp</dimen>

+ 28 - 103
ui-base/src/main/res/values/dimens.xml

@@ -2,134 +2,31 @@
 <resources>
     <dimen name="common_text_size">18sp</dimen>
     <dimen name="common_btn_text_size">20sp</dimen>
-    <dimen name="common_text_size_land">9dp</dimen>
     <dimen name="common_text_size_big">28dp</dimen>
     <dimen name="common_text_size_small">16dp</dimen>
     <dimen name="common_text_padding">5dp</dimen>
-    <dimen name="common_text_padding_land">2.5dp</dimen>
-    <dimen name="common_font_txt_size_page_title">14dp</dimen>
     <dimen name="common_radius">10dp</dimen>
     <dimen name="common_radius_small">5dp</dimen>
     <dimen name="common_spacing">10dp</dimen>
     <dimen name="common_spacing_2x">20dp</dimen>
-    <dimen name="common_spacing_3x">30dp</dimen>
-    <dimen name="common_spacing_big">15dp</dimen>
     <dimen name="common_spacing_small">5dp</dimen>
-    <dimen name="common_spacing_smallest">2dp</dimen>
     <dimen name="common_margin_spacing_big">40dp</dimen>
     <dimen name="common_icon_size">15dp</dimen>
-    <dimen name="common_icon_size_small">12dp</dimen>
     <dimen name="common_status_circle_small">5dp</dimen>
-    <dimen name="common_status_circle_medium">10dp</dimen>
 
-
-    <!--
-        0dp:无阴影
-        适用场景:平面背景、基础容器,无分层需求的场景
-    -->
-    <dimen name="elevation_0">0dp</dimen>
-
-    <!--
-        2dp:最轻微的阴影
-        适用场景:底部导航栏、分隔线、浮层抓手(BottomSheet 拖拽手柄)
-    -->
-    <dimen name="elevation_1">2dp</dimen>
-
-    <!--
-        7dp:轻度分层
-        适用场景:卡片 (CardView)、列表项悬浮状态、FAB 背景
-    -->
-    <dimen name="elevation_2">7dp</dimen>
-
-    <!--
-        14dp:中度分层
-        适用场景:对话框 (Dialog)、底部抽屉 (BottomSheet)、悬浮菜单
-    -->
     <dimen name="elevation_3">14dp</dimen>
 
-    <!--
-        24dp:较重分层
-        适用场景:顶部 AppBar/Toolbar、页面 Header、分层容器
-    -->
-    <dimen name="elevation_4">24dp</dimen>
-
-    <!--
-        32dp:最高分层
-        适用场景:全屏模态、重要提示浮层(Modal)、引导遮罩
-    -->
-    <dimen name="elevation_5">32dp</dimen>
-
     <dimen name="common_btn_width">150dp</dimen>
     <dimen name="common_btn_height">50dp</dimen>
-    <dimen name="common_btn_width_land">75dp</dimen>
-    <dimen name="common_btn_height_land">25dp</dimen>
-
-    <dimen name="title_bar_height">50dp</dimen>
-    <dimen name="title_bar_padding">7dp</dimen>
-    <dimen name="title_bar_title_text_size">20dp</dimen>
-    <dimen name="title_bar_sub_title_text_size">10dp</dimen>
-    <dimen name="title_bar_back_size">17dp</dimen>
-
-    <dimen name="switch_width">46dp</dimen>
-    <dimen name="switch_height">26dp</dimen>
-    <dimen name="switch_radius">13dp</dimen>
-    <dimen name="switch_thumb_stroke">2dp</dimen>
-    <dimen name="switch_thumb_size">22dp</dimen>
 
-    <dimen name="home_navi_height">200dp</dimen>
-    <dimen name="home_navi_width">133dp</dimen>
-
-    <!-- 通用tab -->
-    <dimen name="common_rv_tab_item_width">64dp</dimen>
-    <dimen name="common_rv_tab_item_height">19dp</dimen>
-    <dimen name="common_rv_tab_padding">6dp</dimen>
-    <dimen name="common_rv_tab_bg_radius">3dp</dimen>
-
-    <!--  输入选择控件  -->
-    <dimen name="selectable_input_width">83dp</dimen>
     <dimen name="selectable_input_radius">2dp</dimen>
     <dimen name="selectable_input_stroke">1dp</dimen>
-    <dimen name="selectable_input_min_height">23dp</dimen>
-    <dimen name="selectable_input_spinner_arrow_size">10dp</dimen>
-    <dimen name="selectable_input_spinner_arrow_margin">3dp</dimen>
     <dimen name="selectable_input_edit_padding">3dp</dimen>
 
-    <dimen name="rv_item_margin">1dp</dimen>
-
-    <dimen name="close_eyes_width">23dp</dimen>
-    <dimen name="login_btn_radius">20dp</dimen>
-    <dimen name="login_btn_width">157dp</dimen>
-    <dimen name="login_btn_height">40dp</dimen>
-    <dimen name="common_common_btn_elevation">10dp</dimen>
-    <dimen name="login_btn_margin_top">20dp</dimen>
-    <dimen name="login_btn_text_size">13dp</dimen>
-
-    <dimen name="home_module_margin">3dp</dimen>
-
     <dimen name="dialog_card_login_width">320dp</dimen>
-    <dimen name="dialog_card_login_height">180dp</dimen>
 
-    <dimen name="menu_padding">15dp</dimen>
     <dimen name="divider_line_width">1dp</dimen>
-    <dimen name="divider_line_margin">5dp</dimen>
-    <dimen name="page_padding">20dp</dimen>
-    <dimen name="item_rv_technology_height">207dp</dimen>
-    <dimen name="item_rv_technology_width">118dp</dimen>
-    <dimen name="item_rv_technology_type_height">17dp</dimen>
-    <dimen name="item_rv_technology_type_width">46dp</dimen>
-    <dimen name="item_rv_technology_type_padding">3dp</dimen>
-    <dimen name="dialog_tip_width">256dp</dimen>
-    <dimen name="dialog_tip_height">144dp</dimen>
-    <dimen name="dialog_ticket_list_height">200dp</dimen>
 
-    <dimen name="item_rv_step_width">80dp</dimen>
-    <dimen name="item_rv_step_height">110dp</dimen>
-    <dimen name="item_rv_menu_size">58dp</dimen>
-    <dimen name="item_rv_menu_icon_size">20dp</dimen>
-    <dimen name="item_rv_login_width">100dp</dimen>
-    <dimen name="item_rv_login_height">130dp</dimen>
-    <dimen name="item_rv_login_margin">7dp</dimen>
-    <dimen name="item_rv_login_icon_size">40dp</dimen>
     <dimen name="divider_line_space">1dp</dimen>
     <dimen name="tip_dialog_btn_width">70dp</dimen>
     <dimen name="tip_dialog_btn_height">30dp</dimen>
@@ -138,4 +35,32 @@
     <dimen name="tip_dialog_height">280dp</dimen>
     <dimen name="loading_size">152dp</dimen>
     <dimen name="loading_text_size">28sp</dimen>
+
+
+    <!--    统一数值-->
+    <!-- 圆角(dp) -->
+    <dimen name="iscs_radius_xs">3dp</dimen>
+    <dimen name="iscs_radius_sm">5dp</dimen>
+    <dimen name="iscs_radius_md">10dp</dimen>
+    <dimen name="iscs_radius_lg">15dp</dimen>
+    <dimen name="iscs_radius_xl">20dp</dimen>
+
+    <!-- 间距(dp,按4dp栅格:space_2 = 8dp) -->
+    <dimen name="iscs_space_0">0dp</dimen>
+    <dimen name="iscs_space_1">5dp</dimen>
+    <dimen name="iscs_space_2">10dp</dimen>
+    <dimen name="iscs_space_3">15dp</dimen>
+    <dimen name="iscs_space_4">20dp</dimen>
+
+    <!-- 文本(sp) -->
+    <dimen name="iscs_text_xs">10sp</dimen>
+    <dimen name="iscs_text_sm">15sp</dimen>
+    <dimen name="iscs_text_md">20sp</dimen>
+    <dimen name="iscs_text_lg">25sp</dimen>
+    <dimen name="iscs_text_xl">30sp</dimen>
+
+    <!-- 线宽/海拔 -->
+    <dimen name="iscs_stroke_sm">1dp</dimen>
+    <dimen name="iscs_elevation_1">2dp</dimen>
+
 </resources>