Bläddra i källkod

refactor(更新)
- 统一 dimens 资源命名
- 更新组件圆角、边框、间距等 dimens 引用
- 移除未使用的 dimens 资源

周文健 2 månader sedan
förälder
incheckning
b5c29ac2a2

+ 2 - 2
ui-base/src/main/res/drawable/common_btn.xml

@@ -2,7 +2,7 @@
 <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" />
-    <corners android:radius="8dp" />
+    <corners android:radius="@dimen/iscs_radius_md" />
 </shape>

+ 1 - 1
ui-base/src/main/res/drawable/common_btn_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/colorPrimary" />
 </shape>

+ 1 - 1
ui-base/src/main/res/drawable/common_btn_blue_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/colorInfo" />
 </shape>

+ 1 - 1
ui-base/src/main/res/drawable/common_btn_cancel.xml

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

+ 1 - 1
ui-base/src/main/res/drawable/common_btn_confirm.xml

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

+ 1 - 1
ui-base/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
ui-base/src/main/res/drawable/common_btn_white_board.xml

@@ -2,7 +2,7 @@
 <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/colorWhite" />
-    <corners android:radius="8dp" />
+    <corners android:radius="@dimen/iscs_radius_md" />
 </shape>

+ 2 - 2
ui-base/src/main/res/drawable/common_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/colorWhite90" />
-    <corners android:radius="2dp" />
+    <corners android:radius="@dimen/iscs_radius_xs" />
 </shape>

+ 2 - 2
ui-base/src/main/res/drawable/common_divider_large_space_grid.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <size
-        android:width="40dp"
-        android:height="40dp" />
+        android:width="@dimen/iscs_space_5"
+        android:height="@dimen/iscs_space_5" />
 </shape>

+ 2 - 2
ui-base/src/main/res/drawable/common_divider_large_space_grid_land.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <size
-        android:width="@dimen/common_spacing_2x"
-        android:height="@dimen/common_spacing_2x" />
+        android:width="@dimen/iscs_space_4"
+        android:height="@dimen/iscs_space_4" />
 </shape>

+ 2 - 2
ui-base/src/main/res/drawable/common_divider_normal_space_horizontal.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <size
-        android:width="@dimen/common_spacing"
-        android:height="@dimen/divider_line_space" />
+        android:width="@dimen/iscs_space_3"
+        android:height="@dimen/iscs_stroke_sm" />
 </shape>

+ 2 - 2
ui-base/src/main/res/drawable/common_divider_normal_space_vertical.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <size
-        android:width="@dimen/divider_line_space"
-        android:height="@dimen/common_spacing" />
+        android:width="@dimen/iscs_stroke_sm"
+        android:height="@dimen/iscs_space_4" />
 </shape>

+ 2 - 2
ui-base/src/main/res/drawable/common_divider_small_space_horizontal.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <size
-        android:width="@dimen/common_spacing_small"
-        android:height="@dimen/divider_line_space" />
+        android:width="@dimen/iscs_space_1"
+        android:height="@dimen/iscs_stroke_sm" />
 </shape>

+ 2 - 2
ui-base/src/main/res/drawable/common_layout_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/colorWhite20" />
-    <corners android:radius="2dp" />
+    <corners android:radius="@dimen/iscs_radius_xs" />
 </shape>

+ 2 - 2
ui-base/src/main/res/drawable/white_stroke_bg.xml

@@ -1,8 +1,8 @@
 <?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" />
     <stroke
-        android:width="@dimen/divider_line_width"
+        android:width="@dimen/iscs_stroke_sm"
         android:color="?attr/colorWhite" />
 </shape>

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

@@ -5,8 +5,6 @@
     <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_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_small">8.5dp</dimen>
@@ -20,14 +18,10 @@
     <!-- 通用tab -->
 
     <!--  输入选择控件  -->
-    <dimen name="selectable_input_radius">3.4dp</dimen>
-    <dimen name="selectable_input_stroke">1.7dp</dimen>
     <dimen name="selectable_input_edit_padding">5.1dp</dimen>
 
     <dimen name="dialog_card_login_width">544dp</dimen>
 
-    <dimen name="divider_line_width">1.7dp</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>

+ 1 - 15
ui-base/src/main/res/values/dimens.xml

@@ -5,8 +5,6 @@
     <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_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_small">5dp</dimen>
@@ -19,14 +17,10 @@
     <dimen name="common_btn_width">150dp</dimen>
     <dimen name="common_btn_height">50dp</dimen>
 
-    <dimen name="selectable_input_radius">2dp</dimen>
-    <dimen name="selectable_input_stroke">1dp</dimen>
     <dimen name="selectable_input_edit_padding">3dp</dimen>
 
     <dimen name="dialog_card_login_width">320dp</dimen>
 
-    <dimen name="divider_line_width">1dp</dimen>
-
     <dimen name="divider_line_space">1dp</dimen>
     <dimen name="tip_dialog_btn_width">70dp</dimen>
     <dimen name="tip_dialog_btn_height">30dp</dimen>
@@ -42,25 +36,17 @@
     <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>
+    <dimen name="iscs_space_5">40dp</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>