refactor(更新)

- 样式统一

app/src/main/java/com/grkj/iscs/ISCSApplication.kt

@@ -26,6 +26,7 @@ import com.grkj.shared.utils.i18n.source.AssetsCsvSource
 import com.grkj.shared.utils.i18n.source.FileCsvSource
 import com.grkj.ui_base.business.ModbusBusinessManager
 import com.grkj.ui_base.config.ISCSConfig
+import com.grkj.ui_base.utils.CommonUtils
 import com.grkj.ui_base.utils.ble.BleUtil
 import com.grkj.ui_base.utils.modbus.ModBusController
 import com.kongzue.dialogx.DialogX
@@ -177,26 +178,14 @@ class ISCSApplication : Application() {
         //设置全局的Header构建器
         SmartRefreshLayout.setDefaultRefreshHeaderCreator { context, layout ->
             ClassicsHeader(context).apply {
-                if (resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE) {
-                    setTextSizeTime(TypedValue.COMPLEX_UNIT_SP, 18 * 1.7f)
-                    setTextSizeTitle(TypedValue.COMPLEX_UNIT_SP, 18 * 1.7f)
-                } else {
-                    setTextSizeTime(TypedValue.COMPLEX_UNIT_SP, 18 * 1.2f)
-                    setTextSizeTitle(TypedValue.COMPLEX_UNIT_SP, 18 * 1.2f)
-                }
-            } //.setTimeFormat(new DynamicTimeFormat("更新于 %s"));//指定为经典Header，默认是 贝塞尔雷达Header
+                this.setAccentColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.colorTextPrimary))
+            }
         }
 
         //设置全局的Footer构建器
-        SmartRefreshLayout.setDefaultRefreshFooterCreator { context, p1 -> //指定为经典Footer，默认是 BallPulseFooter
+        SmartRefreshLayout.setDefaultRefreshFooterCreator { context, p1 ->
             ClassicsFooter(context).apply {
-                if (resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE) {
-                    setTextSizeTitle(TypedValue.COMPLEX_UNIT_SP, 18 * 1.7f)
-                    setDrawableSize(20f * 1.7f)
-                } else {
-                    setTextSizeTitle(TypedValue.COMPLEX_UNIT_SP, 18 * 1.2f)
-                    setDrawableSize(20f * 1.2f)
-                }
+                this.setAccentColor(CommonUtils.getColor(com.grkj.ui_base.R.attr.colorTextPrimary))
             }
         }
     }

app/src/main/java/com/grkj/iscs/features/main/fragment/job_manage/JobManageHomeFragment.kt

@@ -125,7 +125,7 @@ class JobManageHomeFragment : BaseFragment<FragmentJobManageHomeBinding>() {
         itemBinding.homeMenuLayout.apply {
             this.badgeViewHelper.apply {
                 setBadgeGravity(BGABadgeViewHelper.BadgeGravity.RightTop)
-                setBadgeTextSizeSp(resources.getDimension(R.dimen.badge_text_size).toInt())
+                setBadgeTextSizeSp(resources.getDimension(com.grkj.ui_base.R.dimen.iscs_text_xsm).toInt())
             }
             if (item.badgeNum != 0) {
                 this.showTextBadge("${item.badgeNum}")

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

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

app/src/main/res/drawable/bg_job_execute_step.xml

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

app/src/main/res/drawable/bg_text_drop_down.xml

@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="?attr/colorWhite" />
-    <stroke
-        android:width="@dimen/iscs_stroke_sm"
-        android:color="?attr/colorBlack" />
-</shape>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <!-- 暗色表面：比页面背景略亮一档 -->
+    <solid android:color="?attr/colorSurface"/>
+    <!-- 细描边：8% 白 -->
+    <stroke android:width="@dimen/iscs_stroke_sm" android:color="?attr/colorStroke"/>
+    <corners android:radius="@dimen/iscs_radius_md"/>
+    <!-- 可选：内边距，避免内容贴边 -->
+    <padding android:left="8dp" android:top="6dp" android:right="8dp" android:bottom="6dp"/>
+</shape>

app/src/main/res/drawable/card_white_bg.xml

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

app/src/main/res/drawable/divider_table.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">
-    <solid android:color="?attr/colorSecBg" />
-    <size
-        android:width="@dimen/iscs_stroke_sm"
-        android:height="@dimen/iscs_stroke_sm" />
-</shape>
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+    android:insetLeft="12dp" android:insetRight="12dp">
+    <shape android:shape="rectangle">
+        <size android:height="1dp"/>
+        <solid android:color="?attr/colorDivider"/> <!-- 12% 白 -->
+    </shape>
+</inset>

app/src/main/res/drawable/home_card_bg.xml

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

app/src/main/res/layout-land/activity_login.xml

@@ -31,7 +31,7 @@
                 android:format12Hour="yyyy-MM-dd    HH:mm"
                 android:format24Hour="yyyy-MM-dd    HH:mm"
                 android:gravity="center_vertical"
-                android:textColor="?attr/colorTextPrimary"
+                android:textColor="?attr/colorBlack"
                 android:textSize="@dimen/iscs_text_md"
                 android:textStyle="bold|italic" />
         </FrameLayout>
@@ -69,7 +69,7 @@
                 android:layout_marginTop="@dimen/iscs_space_4"
                 android:gravity="center"
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/login_main_title_text_size"
+                android:textSize="@dimen/iscs_text_h1"
                 android:textStyle="bold"
                 app:i18nKey='@{"loto"}' />
 

app/src/main/res/layout-land/activity_main.xml

@@ -91,7 +91,7 @@
                 android:gravity="center_vertical"
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size"
+                android:textSize="@dimen/iscs_text_md"
                 android:visibility="gone" />
         </FrameLayout>
 

app/src/main/res/layout-land/dialog_check_face.xml

@@ -20,14 +20,14 @@
 
             <ImageView
                 android:id="@+id/iv_icon"
-                android:layout_width="@dimen/dialog_common_root_height_normal"
-                android:layout_height="@dimen/dialog_common_root_height_normal"
+                android:layout_width="@dimen/dialog_common_root_height_small"
+                android:layout_height="@dimen/dialog_common_root_height_small"
                 android:layout_marginBottom="@dimen/iscs_space_1" />
 
             <TextView
                 android:id="@+id/tv_tip"
                 style="@style/CommonTextView"
-                android:textSize="@dimen/common_text_size_big" />
+                android:textSize="@dimen/iscs_text_xl" />
         </LinearLayout>
 
         <FrameLayout

app/src/main/res/layout-land/dialog_colock_operation_tip.xml

@@ -27,7 +27,7 @@
             <TextView
                 android:id="@+id/tv_tip"
                 style="@style/CommonTextView"
-                android:textSize="@dimen/common_text_size_big" />
+                android:textSize="@dimen/iscs_text_xl" />
         </LinearLayout>
 
         <FrameLayout

app/src/main/res/layout-land/dialog_slots_exception_report.xml

@@ -17,7 +17,7 @@
             android:paddingHorizontal="@dimen/iscs_space_3"
             app:i18nKey='@{"slots_exception_report"}'
             android:textColor="?attr/colorTextPrimary"
-            android:textSize="@dimen/common_btn_text_size" />
+            android:textSize="@dimen/iscs_text_md" />
 
 
         <androidx.constraintlayout.widget.ConstraintLayout
@@ -82,7 +82,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"confirm"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <TextView
                 android:id="@+id/cancel_btn"
@@ -97,7 +97,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"cancel"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
     </RelativeLayout>
 </layout>

app/src/main/res/layout-land/fragment_backup_and_restore.xml

@@ -12,7 +12,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_margin="@dimen/iscs_space_4"
-        android:background="@drawable/home_card_bg"
         android:orientation="vertical">
 
         <LinearLayout
@@ -26,7 +25,8 @@
             <ImageView
                 android:layout_width="@dimen/title_icon_size"
                 android:layout_height="@dimen/title_icon_size"
-                android:src="@mipmap/icon_backup_and_restore" />
+                app:skinSrc='@{"back-up.svg"}'
+                android:tint="?attr/colorPrimary" />
 
             <TextView
                 android:layout_width="match_parent"
@@ -34,7 +34,7 @@
                 android:layout_marginLeft="@dimen/iscs_space_3"
                 android:layout_weight="1"
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/normal_text_size_25"
+                android:textSize="@dimen/iscs_text_lg"
                 android:textStyle="bold"
                 app:i18nKey='@{"backup_title"}' />
 
@@ -52,7 +52,7 @@
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size"
+                android:textSize="@dimen/iscs_text_md"
                 app:i18nKey='@{"back"}' />
         </LinearLayout>
 
@@ -85,7 +85,7 @@
                         android:layout_gravity="center_vertical"
                         android:layout_marginLeft="@dimen/iscs_space_3"
                         android:textColor="?attr/colorTextPrimary"
-                        android:textSize="@dimen/normal_text_size_25"
+                        android:textSize="@dimen/iscs_text_lg"
                         android:textStyle="bold"
                         app:i18nKey='@{"backup"}' />
 
@@ -107,7 +107,7 @@
                         android:minHeight="@dimen/common_btn_height"
                         android:paddingHorizontal="@dimen/iscs_space_4"
                         android:textColor="?attr/colorTextPrimary"
-                        android:textSize="@dimen/common_btn_text_size"
+                        android:textSize="@dimen/iscs_text_md"
                         app:i18nKey='@{"backup_now"}' />
                 </LinearLayout>
 
@@ -208,22 +208,26 @@
                         android:orientation="horizontal"
                         app:layout_constraintBottom_toBottomOf="@+id/status_tv"
                         app:layout_constraintStart_toEndOf="@+id/end_line"
+                        app:useMaterialThemeColors="true"
                         app:layout_constraintTop_toTopOf="@+id/status_tv">
 
-                        <RadioButton
+                        <com.google.android.material.radiobutton.MaterialRadioButton
                             android:id="@+id/enable_rb"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
+                            app:useMaterialThemeColors="true"
                             android:layout_marginStart="@dimen/iscs_space_3"
                             android:textSize="@dimen/iscs_text_md"
+                            android:textColor="?attr/colorTextPrimary"
                             app:i18nKey='@{"common_enable"}' />
 
-                        <RadioButton
+                        <com.google.android.material.radiobutton.MaterialRadioButton
                             android:id="@+id/disable_rb"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="@dimen/iscs_space_3"
                             android:textSize="@dimen/iscs_text_md"
+                            android:textColor="?attr/colorTextPrimary"
                             app:i18nKey='@{"common_disable"}' />
                     </RadioGroup>
 
@@ -316,7 +320,7 @@
                         android:minHeight="@dimen/common_btn_height"
                         android:paddingHorizontal="@dimen/iscs_space_4"
                         android:textColor="?attr/colorTextPrimary"
-                        android:textSize="@dimen/common_btn_text_size"
+                        android:textSize="@dimen/iscs_text_md"
                         app:i18nKey='@{"save"}'
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent" />
@@ -342,7 +346,7 @@
                         android:layout_gravity="center_vertical"
                         android:layout_marginLeft="@dimen/iscs_space_3"
                         android:textColor="?attr/colorTextPrimary"
-                        android:textSize="@dimen/normal_text_size_25"
+                        android:textSize="@dimen/iscs_text_lg"
                         android:textStyle="bold"
                         app:i18nKey='@{"restore"}' />
 
@@ -361,7 +365,7 @@
                         android:minHeight="@dimen/common_btn_height"
                         android:paddingHorizontal="@dimen/iscs_space_4"
                         android:textColor="?attr/colorTextPrimary"
-                        android:textSize="@dimen/common_btn_text_size"
+                        android:textSize="@dimen/iscs_text_md"
                         app:i18nKey='@{"common_batch_export"}' />
 
                     <TextView
@@ -376,7 +380,7 @@
                         android:minHeight="@dimen/common_btn_height"
                         android:paddingHorizontal="@dimen/iscs_space_4"
                         android:textColor="?attr/colorTextPrimary"
-                        android:textSize="@dimen/common_btn_text_size"
+                        android:textSize="@dimen/iscs_text_md"
                         app:i18nKey='@{"common_batch_delete"}' />
                 </LinearLayout>
 
@@ -392,7 +396,7 @@
                     android:layout_marginTop="@dimen/iscs_space_3"
                     android:background="@drawable/common_card_bg"
                     android:divider="@drawable/divider_table"
-                    android:paddingVertical="@dimen/iscs_space_3"
+                    android:paddingVertical="@dimen/iscs_space_1"
                     android:showDividers="middle">
 
                     <com.google.android.material.checkbox.MaterialCheckBox
@@ -408,6 +412,7 @@
                         android:layout_weight="2"
                         android:gravity="center"
                         android:textSize="@dimen/iscs_text_md"
+                        android:textColor="?attr/colorTextPrimary"
                         app:i18nKey='@{"backup"}' />
 
                     <TextView
@@ -416,6 +421,7 @@
                         android:layout_weight="1"
                         android:gravity="center"
                         android:textSize="@dimen/iscs_text_md"
+                        android:textColor="?attr/colorTextPrimary"
                         app:i18nKey='@{"operation"}' />
                 </LinearLayout>
 

app/src/main/res/layout-land/fragment_create_job.xml

@@ -20,7 +20,8 @@
             <ImageView
                 android:layout_width="@dimen/title_icon_size"
                 android:layout_height="@dimen/title_icon_size"
-                android:src="@mipmap/icon_job_manage_create_job" />
+                android:tint="?attr/colorPrimary"
+                app:skinSrc='@{"document.svg"}' />
 
             <TextView
                 android:layout_width="match_parent"
@@ -30,7 +31,7 @@
                 app:i18nKey='@{"create_job_title"}'
                 android:textColor="?attr/colorTextPrimary"
                 android:textStyle="bold"
-                android:textSize="@dimen/normal_text_size_25" />
+                android:textSize="@dimen/iscs_text_lg" />
 
             <TextView
                 android:id="@+id/back"
@@ -47,13 +48,13 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"back"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
 
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/divider_line_space"
-            android:background="?attr/colorBlack" />
+            android:background="?attr/colorDivider" />
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -84,12 +85,12 @@
                         android:layout_marginLeft="@dimen/iscs_space_3"
                         app:i18nKey='@{"base_info_title"}'
                         android:textColor="?attr/colorTextPrimary"
-                        android:textSize="@dimen/normal_text_size_18" />
+                        android:textSize="@dimen/iscs_text_md" />
 
                     <View
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/divider_line_space"
-                        android:background="?attr/colorBlack" />
+                        android:background="?attr/colorDivider" />
 
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -213,7 +214,7 @@
                             android:layout_weight="1"
                             app:i18nKey='@{"workflow_mode"}'
                             android:textColor="?attr/colorTextPrimary"
-                            android:textSize="@dimen/normal_text_size_18" />
+                            android:textSize="@dimen/iscs_text_md" />
 
                         <TextView
                             android:id="@+id/workflow_mode_setting_tv"
@@ -224,13 +225,13 @@
                             android:paddingHorizontal="@dimen/iscs_space_4"
                             app:i18nKey='@{"settings"}'
                             android:textColor="?attr/colorTextPrimary"
-                            android:textSize="@dimen/common_btn_text_size" />
+                            android:textSize="@dimen/iscs_text_md" />
                     </LinearLayout>
 
                     <View
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/divider_line_space"
-                        android:background="?attr/colorBlack" />
+                        android:background="?attr/colorDivider" />
 
                     <FrameLayout
                         android:layout_width="match_parent"
@@ -254,7 +255,7 @@
                             android:paddingVertical="@dimen/iscs_space_3"
                             app:i18nKey='@{"please_select_workflow_mode"}'
                             android:textColor="?attr/colorTextPrimary"
-                            android:textSize="@dimen/normal_text_size_18" />
+                            android:textSize="@dimen/iscs_text_md" />
                     </FrameLayout>
                 </LinearLayout>
             </LinearLayout>
@@ -288,7 +289,7 @@
                             android:layout_weight="1"
                             app:i18nKey='@{"point_info_title"}'
                             android:textColor="?attr/colorTextPrimary"
-                            android:textSize="@dimen/normal_text_size_18" />
+                            android:textSize="@dimen/iscs_text_md" />
 
                         <TextView
                             android:id="@+id/select_point_tv"
@@ -299,13 +300,13 @@
                             android:paddingHorizontal="@dimen/iscs_space_4"
                             app:i18nKey='@{"select"}'
                             android:textColor="?attr/colorTextPrimary"
-                            android:textSize="@dimen/common_btn_text_size" />
+                            android:textSize="@dimen/iscs_text_md" />
                     </LinearLayout>
 
                     <View
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/divider_line_space"
-                        android:background="?attr/colorBlack" />
+                        android:background="?attr/colorDivider" />
 
                     <FrameLayout
                         android:layout_width="match_parent"
@@ -338,7 +339,7 @@
                                 android:paddingVertical="@dimen/iscs_space_3"
                                 app:i18nKey='@{"please_must_select_at_least_one_point"}'
                                 android:textColor="?attr/colorTextPrimary"
-                                android:textSize="@dimen/normal_text_size_18" />
+                                android:textSize="@dimen/iscs_text_md" />
                         </LinearLayout>
                     </FrameLayout>
 
@@ -367,7 +368,7 @@
                             android:layout_weight="1"
                             app:i18nKey='@{"member_info_title"}'
                             android:textColor="?attr/colorTextPrimary"
-                            android:textSize="@dimen/normal_text_size_18" />
+                            android:textSize="@dimen/iscs_text_md" />
 
                         <TextView
                             android:id="@+id/select_member_tv"
@@ -378,13 +379,13 @@
                             android:paddingHorizontal="@dimen/iscs_space_4"
                             app:i18nKey='@{"select"}'
                             android:textColor="?attr/colorTextPrimary"
-                            android:textSize="@dimen/common_btn_text_size" />
+                            android:textSize="@dimen/iscs_text_md" />
                     </LinearLayout>
 
                     <View
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/divider_line_space"
-                        android:background="?attr/colorBlack" />
+                        android:background="?attr/colorDivider" />
 
                     <FrameLayout
                         android:layout_width="match_parent"
@@ -412,7 +413,7 @@
                                     android:paddingVertical="@dimen/iscs_space_3"
                                     app:i18nKey='@{"locker"}'
                                     android:textColor="?attr/colorTextPrimary"
-                                    android:textSize="@dimen/normal_text_size_18" />
+                                    android:textSize="@dimen/iscs_text_md" />
 
                                 <View
                                     android:layout_width="match_parent"
@@ -444,7 +445,7 @@
                                     app:i18nKey='@{"colocker"}'
                                     android:textColor="?attr/colorTextPrimary"
                                     android:layout_gravity="center"
-                                    android:textSize="@dimen/normal_text_size_18" />
+                                    android:textSize="@dimen/iscs_text_md" />
 
                                 <View
                                     android:layout_width="match_parent"
@@ -480,7 +481,7 @@
                                 android:paddingVertical="@dimen/iscs_space_3"
                                 app:i18nKey='@{"please_select_member"}'
                                 android:textColor="?attr/colorTextPrimary"
-                                android:textSize="@dimen/normal_text_size_18" />
+                                android:textSize="@dimen/iscs_text_md" />
                         </LinearLayout>
                     </FrameLayout>
                 </LinearLayout>
@@ -500,7 +501,7 @@
                 android:layout_marginLeft="@dimen/iscs_space_3"
                 app:i18nKey='@{"save_sop_check"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <View
                 android:layout_width="0dp"
@@ -520,7 +521,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"save_and_execute"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <TextView
                 android:id="@+id/save"
@@ -534,7 +535,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"save"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <TextView
                 android:id="@+id/cancel"
@@ -550,7 +551,7 @@
                 app:i18nKey='@{"cancel"}'
                 android:layout_marginRight="@dimen/iscs_space_3"
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
     </LinearLayout>
 </layout>

app/src/main/res/layout-land/fragment_create_sop.xml

@@ -20,7 +20,8 @@
             <ImageView
                 android:layout_width="@dimen/title_icon_size"
                 android:layout_height="@dimen/title_icon_size"
-                android:src="@mipmap/icon_job_manage_create_sop" />
+                android:tint="?attr/colorPrimary"
+                app:skinSrc='@{"new_sop.svg"}' />
 
             <TextView
                 android:layout_width="match_parent"
@@ -30,7 +31,7 @@
                 app:i18nKey='@{"create_sop_title"}'
                 android:textColor="?attr/colorTextPrimary"
                 android:textStyle="bold"
-                android:textSize="@dimen/normal_text_size_25" />
+                android:textSize="@dimen/iscs_text_lg" />
 
             <TextView
                 android:id="@+id/back"
@@ -47,13 +48,13 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"back"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
 
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/divider_line_space"
-            android:background="?attr/colorBlack" />
+            android:background="?attr/colorDivider" />
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -84,12 +85,12 @@
                         android:layout_marginLeft="@dimen/iscs_space_3"
                         app:i18nKey='@{"base_info_title"}'
                         android:textColor="?attr/colorTextPrimary"
-                        android:textSize="@dimen/normal_text_size_18" />
+                        android:textSize="@dimen/iscs_text_md" />
 
                     <View
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/divider_line_space"
-                        android:background="?attr/colorBlack" />
+                        android:background="?attr/colorDivider" />
 
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -212,7 +213,7 @@
                             android:layout_weight="1"
                             app:i18nKey='@{"workflow_mode"}'
                             android:textColor="?attr/colorTextPrimary"
-                            android:textSize="@dimen/normal_text_size_18" />
+                            android:textSize="@dimen/iscs_text_md" />
 
                         <TextView
                             android:id="@+id/workflow_mode_setting_tv"
@@ -223,13 +224,13 @@
                             android:paddingHorizontal="@dimen/iscs_space_4"
                             app:i18nKey='@{"settings"}'
                             android:textColor="?attr/colorTextPrimary"
-                            android:textSize="@dimen/common_btn_text_size" />
+                            android:textSize="@dimen/iscs_text_md" />
                     </LinearLayout>
 
                     <View
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/divider_line_space"
-                        android:background="?attr/colorBlack" />
+                        android:background="?attr/colorDivider" />
 
                     <FrameLayout
                         android:layout_width="match_parent"
@@ -253,7 +254,7 @@
                             android:paddingVertical="@dimen/iscs_space_3"
                             app:i18nKey='@{"please_select_workflow_mode"}'
                             android:textColor="?attr/colorTextPrimary"
-                            android:textSize="@dimen/normal_text_size_18" />
+                            android:textSize="@dimen/iscs_text_md" />
                     </FrameLayout>
                 </LinearLayout>
             </LinearLayout>
@@ -288,7 +289,7 @@
                             android:layout_weight="1"
                             app:i18nKey='@{"point_info_title"}'
                             android:textColor="?attr/colorTextPrimary"
-                            android:textSize="@dimen/normal_text_size_18" />
+                            android:textSize="@dimen/iscs_text_md" />
 
                         <TextView
                             android:id="@+id/select_point_tv"
@@ -299,13 +300,13 @@
                             android:paddingHorizontal="@dimen/iscs_space_4"
                             app:i18nKey='@{"select"}'
                             android:textColor="?attr/colorTextPrimary"
-                            android:textSize="@dimen/common_btn_text_size" />
+                            android:textSize="@dimen/iscs_text_md" />
                     </LinearLayout>
 
                     <View
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/divider_line_space"
-                        android:background="?attr/colorBlack" />
+                        android:background="?attr/colorDivider" />
 
                     <FrameLayout
                         android:layout_width="match_parent"
@@ -338,7 +339,7 @@
                                 android:paddingVertical="@dimen/iscs_space_3"
                                 app:i18nKey='@{"please_must_select_at_least_one_point"}'
                                 android:textColor="?attr/colorTextPrimary"
-                                android:textSize="@dimen/normal_text_size_18" />
+                                android:textSize="@dimen/iscs_text_md" />
                         </LinearLayout>
                     </FrameLayout>
 
@@ -367,7 +368,7 @@
                             android:layout_weight="1"
                             app:i18nKey='@{"member_info_title"}'
                             android:textColor="?attr/colorTextPrimary"
-                            android:textSize="@dimen/normal_text_size_18" />
+                            android:textSize="@dimen/iscs_text_md" />
 
                         <TextView
                             android:id="@+id/select_member_tv"
@@ -378,13 +379,13 @@
                             android:paddingHorizontal="@dimen/iscs_space_4"
                             app:i18nKey='@{"select"}'
                             android:textColor="?attr/colorTextPrimary"
-                            android:textSize="@dimen/common_btn_text_size" />
+                            android:textSize="@dimen/iscs_text_md" />
                     </LinearLayout>
 
                     <View
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/divider_line_space"
-                        android:background="?attr/colorBlack" />
+                        android:background="?attr/colorDivider" />
 
                     <FrameLayout
                         android:layout_width="match_parent"
@@ -412,12 +413,12 @@
                                     app:i18nKey='@{"locker"}'
                                     android:layout_gravity="center"
                                     android:textColor="?attr/colorTextPrimary"
-                                    android:textSize="@dimen/normal_text_size_18" />
+                                    android:textSize="@dimen/iscs_text_md" />
 
                                 <View
                                     android:layout_width="match_parent"
                                     android:layout_height="@dimen/divider_line_space"
-                                    android:background="?attr/colorBlack" />
+                                    android:background="?attr/colorDivider" />
 
 
                                 <androidx.recyclerview.widget.RecyclerView
@@ -444,12 +445,12 @@
                                     app:i18nKey='@{"colocker"}'
                                     android:layout_gravity="center"
                                     android:textColor="?attr/colorTextPrimary"
-                                    android:textSize="@dimen/normal_text_size_18" />
+                                    android:textSize="@dimen/iscs_text_md" />
 
                                 <View
                                     android:layout_width="match_parent"
                                     android:layout_height="@dimen/divider_line_space"
-                                    android:background="?attr/colorBlack" />
+                                    android:background="?attr/colorDivider" />
 
                                 <androidx.recyclerview.widget.RecyclerView
                                     android:id="@+id/colocker_rv"
@@ -480,7 +481,7 @@
                                 android:paddingVertical="@dimen/iscs_space_3"
                                 app:i18nKey='@{"please_select_member"}'
                                 android:textColor="?attr/colorTextPrimary"
-                                android:textSize="@dimen/normal_text_size_18" />
+                                android:textSize="@dimen/iscs_text_md" />
                         </LinearLayout>
                     </FrameLayout>
                 </LinearLayout>
@@ -508,7 +509,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"confirm"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <TextView
                 android:id="@+id/cancel"
@@ -523,7 +524,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"cancel"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
     </LinearLayout>
 </layout>

app/src/main/res/layout-land/fragment_create_sop_job.xml

@@ -20,7 +20,8 @@
             <ImageView
                 android:layout_width="@dimen/title_icon_size"
                 android:layout_height="@dimen/title_icon_size"
-                android:src="@mipmap/icon_job_manage_create_job" />
+                android:tint="?attr/colorPrimary"
+                app:skinSrc='@{"sop.svg"}' />
 
             <TextView
                 android:layout_width="match_parent"
@@ -29,7 +30,7 @@
                 android:layout_weight="1"
                 app:i18nKey='@{"create_sop_job_title"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/normal_text_size_25"
+                android:textSize="@dimen/iscs_text_lg"
                 android:textStyle="bold" />
 
             <TextView
@@ -40,20 +41,20 @@
                 android:layout_marginLeft="@dimen/iscs_space_3"
                 android:background="@drawable/common_btn_secondary"
                 android:drawableLeft="@mipmap/icon_back"
-                android:drawableTint="?attr/colorSecondary"
+                android:drawableTint="?attr/colorPrimary"
                 android:drawablePadding="@dimen/iscs_space_3"
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"back"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
 
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/divider_line_space"
-            android:background="?attr/colorBlack" />
+            android:background="?attr/colorDivider" />
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -84,12 +85,12 @@
                         android:layout_marginLeft="@dimen/iscs_space_3"
                         app:i18nKey='@{"base_info_title"}'
                         android:textColor="?attr/colorTextPrimary"
-                        android:textSize="@dimen/normal_text_size_18" />
+                        android:textSize="@dimen/iscs_text_md" />
 
                     <View
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/divider_line_space"
-                        android:background="?attr/colorBlack" />
+                        android:background="?attr/colorDivider" />
 
 
                     <androidx.constraintlayout.widget.ConstraintLayout
@@ -210,7 +211,7 @@
                             android:layout_weight="1"
                             app:i18nKey='@{"workflow_mode"}'
                             android:textColor="?attr/colorTextPrimary"
-                            android:textSize="@dimen/normal_text_size_18" />
+                            android:textSize="@dimen/iscs_text_md" />
 
                         <TextView
                             android:id="@+id/workflow_mode_setting_tv"
@@ -221,13 +222,13 @@
                             android:paddingHorizontal="@dimen/iscs_space_4"
                             app:i18nKey='@{"settings"}'
                             android:textColor="?attr/colorTextPrimary"
-                            android:textSize="@dimen/common_btn_text_size" />
+                            android:textSize="@dimen/iscs_text_md" />
                     </LinearLayout>
 
                     <View
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/divider_line_space"
-                        android:background="?attr/colorBlack" />
+                        android:background="?attr/colorDivider" />
 
                     <FrameLayout
                         android:layout_width="match_parent"
@@ -251,7 +252,7 @@
                             android:paddingVertical="@dimen/iscs_space_3"
                             app:i18nKey='@{"please_select_workflow_mode"}'
                             android:textColor="?attr/colorTextPrimary"
-                            android:textSize="@dimen/normal_text_size_18" />
+                            android:textSize="@dimen/iscs_text_md" />
                     </FrameLayout>
                 </LinearLayout>
             </LinearLayout>
@@ -285,14 +286,14 @@
                             android:layout_weight="1"
                             app:i18nKey='@{"point_info_title"}'
                             android:textColor="?attr/colorTextPrimary"
-                            android:textSize="@dimen/normal_text_size_18" />
+                            android:textSize="@dimen/iscs_text_md" />
 
                     </LinearLayout>
 
                     <View
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/divider_line_space"
-                        android:background="?attr/colorBlack" />
+                        android:background="?attr/colorDivider" />
 
                     <FrameLayout
                         android:layout_width="match_parent"
@@ -320,7 +321,7 @@
                                 android:paddingVertical="@dimen/iscs_space_3"
                                 app:i18nKey='@{"show_points_when_selected_sop"}'
                                 android:textColor="?attr/colorTextPrimary"
-                                android:textSize="@dimen/common_btn_text_size" />
+                                android:textSize="@dimen/iscs_text_md" />
                         </LinearLayout>
                     </FrameLayout>
 
@@ -349,7 +350,7 @@
                             android:layout_weight="1"
                             app:i18nKey='@{"member_info_title"}'
                             android:textColor="?attr/colorTextPrimary"
-                            android:textSize="@dimen/normal_text_size_18" />
+                            android:textSize="@dimen/iscs_text_md" />
 
                         <TextView
                             android:id="@+id/select_member_tv"
@@ -360,13 +361,13 @@
                             android:paddingHorizontal="@dimen/iscs_space_4"
                             app:i18nKey='@{"select"}'
                             android:textColor="?attr/colorTextPrimary"
-                            android:textSize="@dimen/common_btn_text_size" />
+                            android:textSize="@dimen/iscs_text_md" />
                     </LinearLayout>
 
                     <View
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/divider_line_space"
-                        android:background="?attr/colorBlack" />
+                        android:background="?attr/colorDivider" />
 
                     <FrameLayout
                         android:layout_width="match_parent"
@@ -394,12 +395,12 @@
                                     android:paddingVertical="@dimen/iscs_space_3"
                                     app:i18nKey='@{"locker"}'
                                     android:textColor="?attr/colorTextPrimary"
-                                    android:textSize="@dimen/normal_text_size_18" />
+                                    android:textSize="@dimen/iscs_text_md" />
 
                                 <View
                                     android:layout_width="match_parent"
                                     android:layout_height="@dimen/divider_line_space"
-                                    android:background="?attr/colorBlack" />
+                                    android:background="?attr/colorDivider" />
 
 
                                 <androidx.recyclerview.widget.RecyclerView
@@ -426,12 +427,12 @@
                                     app:i18nKey='@{"colocker"}'
                                     android:textColor="?attr/colorTextPrimary"
                                     android:layout_gravity="center"
-                                    android:textSize="@dimen/normal_text_size_18" />
+                                    android:textSize="@dimen/iscs_text_md" />
 
                                 <View
                                     android:layout_width="match_parent"
                                     android:layout_height="@dimen/divider_line_space"
-                                    android:background="?attr/colorBlack" />
+                                    android:background="?attr/colorDivider" />
 
                                 <androidx.recyclerview.widget.RecyclerView
                                     android:id="@+id/colocker_rv"
@@ -457,7 +458,7 @@
                                 android:paddingVertical="@dimen/iscs_space_3"
                                 app:i18nKey='@{"show_member_when_selected_sop"}'
                                 android:textColor="?attr/colorTextPrimary"
-                                android:textSize="@dimen/common_btn_text_size" />
+                                android:textSize="@dimen/iscs_text_md" />
                         </LinearLayout>
                     </FrameLayout>
                 </LinearLayout>
@@ -485,7 +486,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"save_and_execute"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <TextView
                 android:id="@+id/save"
@@ -499,7 +500,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"save"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <TextView
                 android:id="@+id/cancel"
@@ -515,7 +516,7 @@
                 app:i18nKey='@{"cancel"}'
                 android:layout_marginRight="@dimen/iscs_space_3"
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
     </LinearLayout>
 </layout>

app/src/main/res/layout-land/fragment_edit_job.xml

@@ -20,7 +20,8 @@
             <ImageView
                 android:layout_width="@dimen/title_icon_size"
                 android:layout_height="@dimen/title_icon_size"
-                android:src="@mipmap/icon_job_manage_create_job" />
+                android:tint="?attr/colorPrimary"
+                app:skinSrc='@{"document.svg"}' />
 
             <TextView
                 android:layout_width="match_parent"
@@ -29,7 +30,7 @@
                 android:layout_weight="1"
                 app:i18nKey='@{"edit_job_title"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/normal_text_size_25"
+                android:textSize="@dimen/iscs_text_lg"
                 android:textStyle="bold" />
 
             <TextView
@@ -47,13 +48,13 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"back"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
 
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/divider_line_space"
-            android:background="?attr/colorBlack" />
+            android:background="?attr/colorDivider" />
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -85,7 +86,7 @@
                         android:layout_marginLeft="@dimen/iscs_space_3"
                         app:i18nKey='@{"base_info_title"}'
                         android:textColor="?attr/colorTextPrimary"
-                        android:textSize="@dimen/normal_text_size_18" />
+                        android:textSize="@dimen/iscs_text_md" />
 
                     <View
                         android:layout_width="match_parent"
@@ -213,7 +214,7 @@
                             android:layout_weight="1"
                             app:i18nKey='@{"workflow_mode"}'
                             android:textColor="?attr/colorTextPrimary"
-                            android:textSize="@dimen/normal_text_size_18" />
+                            android:textSize="@dimen/iscs_text_md" />
 
                         <TextView
                             android:id="@+id/workflow_mode_setting_tv"
@@ -224,7 +225,7 @@
                             android:paddingHorizontal="@dimen/iscs_space_4"
                             app:i18nKey='@{"settings"}'
                             android:textColor="?attr/colorTextPrimary"
-                            android:textSize="@dimen/common_btn_text_size" />
+                            android:textSize="@dimen/iscs_text_md" />
                     </LinearLayout>
 
                     <View
@@ -276,7 +277,7 @@
                             android:layout_weight="1"
                             app:i18nKey='@{"point_info_title"}'
                             android:textColor="?attr/colorTextPrimary"
-                            android:textSize="@dimen/normal_text_size_18" />
+                            android:textSize="@dimen/iscs_text_md" />
 
                         <TextView
                             android:id="@+id/select_point_tv"
@@ -287,7 +288,7 @@
                             android:paddingHorizontal="@dimen/iscs_space_4"
                             app:i18nKey='@{"select"}'
                             android:textColor="?attr/colorTextPrimary"
-                            android:textSize="@dimen/common_btn_text_size" />
+                            android:textSize="@dimen/iscs_text_md" />
                     </LinearLayout>
 
                     <View
@@ -326,7 +327,7 @@
                             android:layout_weight="1"
                             app:i18nKey='@{"member_info_title"}'
                             android:textColor="?attr/colorTextPrimary"
-                            android:textSize="@dimen/normal_text_size_18" />
+                            android:textSize="@dimen/iscs_text_md" />
 
                         <TextView
                             android:id="@+id/select_member_tv"
@@ -337,7 +338,7 @@
                             android:paddingHorizontal="@dimen/iscs_space_4"
                             app:i18nKey='@{"select"}'
                             android:textColor="?attr/colorTextPrimary"
-                            android:textSize="@dimen/common_btn_text_size" />
+                            android:textSize="@dimen/iscs_text_md" />
                     </LinearLayout>
 
                     <View
@@ -368,7 +369,7 @@
                                 android:paddingVertical="@dimen/iscs_space_3"
                                 app:i18nKey='@{"locker"}'
                                 android:textColor="?attr/colorTextPrimary"
-                                android:textSize="@dimen/normal_text_size_18" />
+                                android:textSize="@dimen/iscs_text_md" />
 
                             <View
                                 android:layout_width="match_parent"
@@ -400,7 +401,7 @@
                                 app:i18nKey='@{"colocker"}'
                                 android:textColor="?attr/colorTextPrimary"
                                 android:layout_gravity="center"
-                                android:textSize="@dimen/normal_text_size_18" />
+                                android:textSize="@dimen/iscs_text_md" />
 
                             <View
                                 android:layout_width="match_parent"
@@ -443,7 +444,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"save_and_execute"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <TextView
                 android:id="@+id/save"
@@ -457,7 +458,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"save"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <TextView
                 android:id="@+id/cancel"
@@ -473,7 +474,7 @@
                 app:i18nKey='@{"cancel"}'
                 android:layout_marginRight="@dimen/iscs_space_3"
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
     </LinearLayout>
 </layout>

app/src/main/res/layout-land/fragment_edit_sop.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -19,7 +20,8 @@
             <ImageView
                 android:layout_width="@dimen/title_icon_size"
                 android:layout_height="@dimen/title_icon_size"
-                android:src="@mipmap/icon_job_manage_create_sop" />
+                android:tint="?attr/colorPrimary"
+                app:skinSrc='@{"new_sop.svg"}' />
 
             <TextView
                 android:layout_width="match_parent"
@@ -29,7 +31,7 @@
                 app:i18nKey='@{"edit_sop_title"}'
                 android:textColor="?attr/colorTextPrimary"
                 android:textStyle="bold"
-                android:textSize="@dimen/normal_text_size_25" />
+                android:textSize="@dimen/iscs_text_lg" />
 
             <TextView
                 android:id="@+id/back"
@@ -46,13 +48,13 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"back"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
 
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/divider_line_space"
-            android:background="?attr/colorBlack" />
+            android:background="?attr/colorDivider" />
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -83,12 +85,12 @@
                         android:layout_marginLeft="@dimen/iscs_space_3"
                         app:i18nKey='@{"base_info_title"}'
                         android:textColor="?attr/colorTextPrimary"
-                        android:textSize="@dimen/normal_text_size_18" />
+                        android:textSize="@dimen/iscs_text_md" />
 
                     <View
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/divider_line_space"
-                        android:background="?attr/colorBlack" />
+                        android:background="?attr/colorDivider" />
 
 
                     <LinearLayout
@@ -206,7 +208,7 @@
                             android:layout_weight="1"
                             app:i18nKey='@{"workflow_mode"}'
                             android:textColor="?attr/colorTextPrimary"
-                            android:textSize="@dimen/normal_text_size_18" />
+                            android:textSize="@dimen/iscs_text_md" />
 
                         <TextView
                             android:id="@+id/workflow_mode_setting_tv"
@@ -217,13 +219,13 @@
                             android:paddingHorizontal="@dimen/iscs_space_4"
                             app:i18nKey='@{"settings"}'
                             android:textColor="?attr/colorTextPrimary"
-                            android:textSize="@dimen/common_btn_text_size" />
+                            android:textSize="@dimen/iscs_text_md" />
                     </LinearLayout>
 
                     <View
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/divider_line_space"
-                        android:background="?attr/colorBlack" />
+                        android:background="?attr/colorDivider" />
 
                     <FrameLayout
                         android:layout_width="match_parent"
@@ -269,7 +271,7 @@
                             android:layout_weight="1"
                             app:i18nKey='@{"point_info_title"}'
                             android:textColor="?attr/colorTextPrimary"
-                            android:textSize="@dimen/normal_text_size_18" />
+                            android:textSize="@dimen/iscs_text_md" />
 
                         <TextView
                             android:id="@+id/select_point_tv"
@@ -280,13 +282,13 @@
                             android:paddingHorizontal="@dimen/iscs_space_4"
                             app:i18nKey='@{"select"}'
                             android:textColor="?attr/colorTextPrimary"
-                            android:textSize="@dimen/common_btn_text_size" />
+                            android:textSize="@dimen/iscs_text_md" />
                     </LinearLayout>
 
                     <View
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/divider_line_space"
-                        android:background="?attr/colorBlack" />
+                        android:background="?attr/colorDivider" />
 
 
                     <androidx.recyclerview.widget.RecyclerView
@@ -320,7 +322,7 @@
                             android:layout_weight="1"
                             app:i18nKey='@{"member_info_title"}'
                             android:textColor="?attr/colorTextPrimary"
-                            android:textSize="@dimen/normal_text_size_18" />
+                            android:textSize="@dimen/iscs_text_md" />
 
                         <TextView
                             android:id="@+id/select_member_tv"
@@ -331,13 +333,13 @@
                             android:paddingHorizontal="@dimen/iscs_space_4"
                             app:i18nKey='@{"select"}'
                             android:textColor="?attr/colorTextPrimary"
-                            android:textSize="@dimen/common_btn_text_size" />
+                            android:textSize="@dimen/iscs_text_md" />
                     </LinearLayout>
 
                     <View
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/divider_line_space"
-                        android:background="?attr/colorBlack" />
+                        android:background="?attr/colorDivider" />
 
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -361,12 +363,12 @@
                                 app:i18nKey='@{"locker"}'
                                 android:layout_gravity="center"
                                 android:textColor="?attr/colorTextPrimary"
-                                android:textSize="@dimen/normal_text_size_18" />
+                                android:textSize="@dimen/iscs_text_md" />
 
                             <View
                                 android:layout_width="match_parent"
                                 android:layout_height="@dimen/divider_line_space"
-                                android:background="?attr/colorBlack" />
+                                android:background="?attr/colorDivider" />
 
 
                             <androidx.recyclerview.widget.RecyclerView
@@ -393,12 +395,12 @@
                                 app:i18nKey='@{"colocker"}'
                                 android:textColor="?attr/colorTextPrimary"
                                 android:layout_gravity="center"
-                                android:textSize="@dimen/normal_text_size_18" />
+                                android:textSize="@dimen/iscs_text_md" />
 
                             <View
                                 android:layout_width="match_parent"
                                 android:layout_height="@dimen/divider_line_space"
-                                android:background="?attr/colorBlack" />
+                                android:background="?attr/colorDivider" />
 
                             <androidx.recyclerview.widget.RecyclerView
                                 android:id="@+id/colocker_rv"
@@ -432,7 +434,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"confirm"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <TextView
                 android:id="@+id/cancel"
@@ -447,7 +449,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"cancel"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
     </LinearLayout>
 </layout>

app/src/main/res/layout-land/fragment_edit_sop_job.xml

@@ -20,7 +20,8 @@
             <ImageView
                 android:layout_width="@dimen/title_icon_size"
                 android:layout_height="@dimen/title_icon_size"
-                android:src="@mipmap/icon_job_manage_create_job" />
+                android:tint="?attr/colorPrimary"
+                app:skinSrc='@{"sop.svg"}' />
 
             <TextView
                 android:layout_width="match_parent"
@@ -30,7 +31,7 @@
                 app:i18nKey='@{"edit_sop_job_title"}'
                 android:textColor="?attr/colorTextPrimary"
                 android:textStyle="bold"
-                android:textSize="@dimen/normal_text_size_25" />
+                android:textSize="@dimen/iscs_text_lg" />
 
             <TextView
                 android:id="@+id/back"
@@ -47,13 +48,13 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"back"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
 
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/divider_line_space"
-            android:background="?attr/colorBlack" />
+            android:background="?attr/colorDivider" />
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -84,12 +85,12 @@
                         android:layout_marginLeft="@dimen/iscs_space_3"
                         app:i18nKey='@{"base_info_title"}'
                         android:textColor="?attr/colorTextPrimary"
-                        android:textSize="@dimen/normal_text_size_18" />
+                        android:textSize="@dimen/iscs_text_md" />
 
                     <View
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/divider_line_space"
-                        android:background="?attr/colorBlack" />
+                        android:background="?attr/colorDivider" />
 
 
 
@@ -211,7 +212,7 @@
                             android:layout_weight="1"
                             app:i18nKey='@{"workflow_mode"}'
                             android:textColor="?attr/colorTextPrimary"
-                            android:textSize="@dimen/normal_text_size_18" />
+                            android:textSize="@dimen/iscs_text_md" />
 
                         <TextView
                             android:id="@+id/workflow_mode_setting_tv"
@@ -222,13 +223,13 @@
                             android:paddingHorizontal="@dimen/iscs_space_4"
                             app:i18nKey='@{"settings"}'
                             android:textColor="?attr/colorTextPrimary"
-                            android:textSize="@dimen/common_btn_text_size" />
+                            android:textSize="@dimen/iscs_text_md" />
                     </LinearLayout>
 
                     <View
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/divider_line_space"
-                        android:background="?attr/colorBlack" />
+                        android:background="?attr/colorDivider" />
 
                     <FrameLayout
                         android:layout_width="match_parent"
@@ -274,14 +275,14 @@
                             android:layout_marginLeft="@dimen/iscs_space_3"
                             app:i18nKey='@{"point_info_title"}'
                             android:textColor="?attr/colorTextPrimary"
-                            android:textSize="@dimen/normal_text_size_18" />
+                            android:textSize="@dimen/iscs_text_md" />
 
                     </LinearLayout>
 
                     <View
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/divider_line_space"
-                        android:background="?attr/colorBlack" />
+                        android:background="?attr/colorDivider" />
 
                     <androidx.recyclerview.widget.RecyclerView
                         android:id="@+id/point_rv"
@@ -314,7 +315,7 @@
                             android:layout_weight="1"
                             app:i18nKey='@{"member_info_title"}'
                             android:textColor="?attr/colorTextPrimary"
-                            android:textSize="@dimen/normal_text_size_18" />
+                            android:textSize="@dimen/iscs_text_md" />
 
                         <TextView
                             android:id="@+id/select_member_tv"
@@ -325,7 +326,7 @@
                             android:paddingHorizontal="@dimen/iscs_space_4"
                             app:i18nKey='@{"select"}'
                             android:textColor="?attr/colorTextPrimary"
-                            android:textSize="@dimen/common_btn_text_size" />
+                            android:textSize="@dimen/iscs_text_md" />
                     </LinearLayout>
 
                     <View
@@ -355,7 +356,7 @@
                                 app:i18nKey='@{"locker"}'
                                 android:layout_gravity="center"
                                 android:textColor="?attr/colorTextPrimary"
-                                android:textSize="@dimen/normal_text_size_18" />
+                                android:textSize="@dimen/iscs_text_md" />
 
                             <View
                                 android:layout_width="match_parent"
@@ -387,7 +388,7 @@
                                 app:i18nKey='@{"colocker"}'
                                 android:textColor="?attr/colorTextPrimary"
                                 android:layout_gravity="center"
-                                android:textSize="@dimen/normal_text_size_18" />
+                                android:textSize="@dimen/iscs_text_md" />
 
                             <View
                                 android:layout_width="match_parent"
@@ -425,7 +426,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"save_and_execute"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <TextView
                 android:id="@+id/save"
@@ -439,7 +440,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"save"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <TextView
                 android:id="@+id/cancel"
@@ -455,7 +456,7 @@
                 app:i18nKey='@{"cancel"}'
                 android:layout_marginRight="@dimen/iscs_space_3"
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
     </LinearLayout>
 </layout>

app/src/main/res/layout-land/fragment_home.xml

@@ -185,7 +185,7 @@
                                 android:gravity="center"
                                 android:padding="@dimen/iscs_space_3"
                                 android:textColor="?attr/colorTextPrimary"
-                                android:textSize="@dimen/iscs_text_h1"
+                                android:textSize="@dimen/iscs_text_h2"
                                 android:textStyle="bold"
                                 tools:text="80" />
                         </LinearLayout>
@@ -218,7 +218,7 @@
                                 android:gravity="center"
                                 android:padding="@dimen/iscs_space_3"
                                 android:textColor="?attr/colorTextPrimary"
-                                android:textSize="@dimen/iscs_text_h1"
+                                android:textSize="@dimen/iscs_text_h2"
                                 android:textStyle="bold" />
                         </LinearLayout>
 
@@ -250,7 +250,7 @@
                                 android:gravity="center"
                                 android:padding="@dimen/iscs_space_3"
                                 android:textColor="?attr/colorTextPrimary"
-                                android:textSize="@dimen/iscs_text_h1"
+                                android:textSize="@dimen/iscs_text_h2"
                                 android:textStyle="bold" />
                         </LinearLayout>
                     </LinearLayout>
@@ -270,7 +270,7 @@
                         android:paddingVertical="@dimen/iscs_space_1"
                         android:paddingLeft="@dimen/iscs_space_3"
                         android:textColor="?attr/colorTextPrimary"
-                        android:textSize="@dimen/normal_text_size_18"
+                        android:textSize="@dimen/iscs_text_md"
                         app:i18nKey='@{"home_overview_data_title"}' />
 
                     <LinearLayout
@@ -398,7 +398,7 @@
                                 android:gravity="center"
                                 android:padding="@dimen/iscs_space_3"
                                 android:textColor="?attr/colorTextPrimary"
-                                android:textSize="@dimen/iscs_text_h1"
+                                android:textSize="@dimen/iscs_text_h2"
                                 android:textStyle="bold" />
                         </LinearLayout>
 
@@ -430,7 +430,7 @@
                                 android:gravity="center"
                                 android:padding="@dimen/iscs_space_3"
                                 android:textColor="?attr/colorTextPrimary"
-                                android:textSize="@dimen/iscs_text_h1"
+                                android:textSize="@dimen/iscs_text_h2"
                                 android:textStyle="bold" />
                         </LinearLayout>
 
@@ -462,7 +462,7 @@
                                 android:gravity="center"
                                 android:padding="@dimen/iscs_space_3"
                                 android:textColor="?attr/colorTextPrimary"
-                                android:textSize="@dimen/iscs_text_h1"
+                                android:textSize="@dimen/iscs_text_h2"
                                 android:textStyle="bold" />
                         </LinearLayout>
                     </LinearLayout>

app/src/main/res/layout-land/fragment_job_execute.xml

@@ -21,7 +21,8 @@
             <ImageView
                 android:layout_width="@dimen/title_icon_size"
                 android:layout_height="@dimen/title_icon_size"
-                android:src="@mipmap/icon_job_execute" />
+                android:tint="?attr/colorPrimary"
+                app:skinSrc='@{"arrow-progress-alt.svg"}' />
 
             <TextView
                 android:id="@+id/job_name_tv"
@@ -31,7 +32,7 @@
                 android:layout_weight="1"
                 app:i18nKey='@{"job_manage_title"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/normal_text_size_25"
+                android:textSize="@dimen/iscs_text_lg"
                 android:textStyle="bold" />
 
             <TextView
@@ -49,13 +50,13 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"back"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
 
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/divider_line_space"
-            android:background="?attr/colorBlack" />
+            android:background="?attr/colorDivider" />
 
         <FrameLayout
             android:id="@+id/full_screen_root_layout"
@@ -386,7 +387,7 @@
                         android:paddingHorizontal="@dimen/iscs_space_3"
                         app:i18nKey='@{"go_locking"}'
                         android:textColor="?attr/colorTextPrimary"
-                        android:textSize="@dimen/common_btn_text_size"
+                        android:textSize="@dimen/iscs_text_md"
                         android:visibility="gone" />
 
                     <TextView
@@ -403,7 +404,7 @@
                         android:paddingHorizontal="@dimen/iscs_space_3"
                         app:i18nKey='@{"go_unlocking"}'
                         android:textColor="?attr/colorTextPrimary"
-                        android:textSize="@dimen/common_btn_text_size"
+                        android:textSize="@dimen/iscs_text_md"
                         android:visibility="gone" />
 
                     <TextView
@@ -420,7 +421,7 @@
                         android:paddingHorizontal="@dimen/iscs_space_3"
                         app:i18nKey='@{"cancel_job"}'
                         android:textColor="?attr/colorTextPrimary"
-                        android:textSize="@dimen/common_btn_text_size"
+                        android:textSize="@dimen/iscs_text_md"
                         android:visibility="gone" />
 
                     <TextView
@@ -437,7 +438,7 @@
                         android:paddingHorizontal="@dimen/iscs_space_3"
                         app:i18nKey='@{"finish_the_job"}'
                         android:textColor="?attr/colorTextPrimary"
-                        android:textSize="@dimen/common_btn_text_size"
+                        android:textSize="@dimen/iscs_text_md"
                         android:visibility="gone" />
                 </LinearLayout>
             </LinearLayout>

app/src/main/res/layout-land/fragment_point_manage.xml

@@ -19,6 +19,7 @@
             <ImageView
                 android:layout_width="@dimen/title_icon_size"
                 android:layout_height="@dimen/title_icon_size"
+                android:tint="?attr/colorPrimary"
                 app:skinSrc='@{"location-crosshairs.svg"}' />
 
             <TextView
@@ -27,7 +28,7 @@
                 android:layout_marginLeft="@dimen/iscs_space_3"
                 android:layout_weight="1"
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/normal_text_size_25"
+                android:textSize="@dimen/iscs_text_lg"
                 android:textStyle="bold"
                 app:i18nKey='@{"point_manage_title"}' />
 
@@ -45,7 +46,7 @@
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size"
+                android:textSize="@dimen/iscs_text_md"
                 app:i18nKey='@{"back"}' />
         </LinearLayout>
 
@@ -70,7 +71,7 @@
                 android:background="@drawable/common_btn_secondary"
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size"
+                android:textSize="@dimen/iscs_text_md"
                 app:i18nKey='@{"insert"}' />
 
             <TextView
@@ -81,7 +82,7 @@
                 android:background="@drawable/common_btn_secondary"
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size"
+                android:textSize="@dimen/iscs_text_md"
                 app:i18nKey='@{"delete"}' />
 
             <TextView
@@ -92,7 +93,7 @@
                 android:background="@drawable/common_btn_secondary"
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size"
+                android:textSize="@dimen/iscs_text_md"
                 app:i18nKey='@{"reset"}' />
 
             <View
@@ -108,7 +109,7 @@
                 android:background="@drawable/common_btn_secondary"
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size"
+                android:textSize="@dimen/iscs_text_md"
                 app:i18nKey='@{"filter"}' />
         </LinearLayout>
 

app/src/main/res/layout-land/fragment_select_memeber.xml

@@ -21,7 +21,7 @@
                 android:id="@+id/preview_step_iv"
                 android:layout_width="@dimen/title_icon_size"
                 android:layout_height="@dimen/title_icon_size"
-                android:src="@mipmap/icon_data_manage_menu_user_manage" />
+                android:tint="?attr/colorPrimary" />
 
             <TextView
                 android:id="@+id/preview_step_title"
@@ -30,7 +30,7 @@
                 android:layout_marginLeft="@dimen/iscs_space_3"
                 app:i18nKey='@{"create_sop_title"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/normal_text_size_25"
+                android:textSize="@dimen/iscs_text_lg"
                 android:textStyle="bold" />
 
             <ImageView
@@ -38,12 +38,14 @@
                 android:layout_height="match_parent"
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:scaleType="fitXY"
+                android:tint="?attr/colorPrimary"
                 android:src="@mipmap/icon_title_arrow_divider" />
 
             <ImageView
-                android:layout_width="@dimen/iscs_space_4"
-                android:layout_height="@dimen/iscs_space_4"
-                android:src="@mipmap/icon_data_manage_menu_role_manage" />
+                android:layout_width="@dimen/title_icon_size"
+                android:layout_height="@dimen/title_icon_size"
+                android:tint="?attr/colorPrimary"
+                app:skinSrc='@{"selection.svg"}' />
 
             <TextView
                 android:layout_width="wrap_content"
@@ -51,7 +53,7 @@
                 android:layout_marginLeft="@dimen/iscs_space_3"
                 app:i18nKey='@{"select_member_title"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/normal_text_size_18"
+                android:textSize="@dimen/iscs_text_md"
                 android:textStyle="bold" />
 
             <View
@@ -74,7 +76,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"back"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
 
         <View
@@ -122,7 +124,7 @@
                             android:paddingVertical="@dimen/iscs_space_3"
                             app:i18nKey='@{"locker"}'
                             android:textColor="?attr/colorTextPrimary"
-                            android:textSize="@dimen/normal_text_size_18" />
+                            android:textSize="@dimen/iscs_text_md" />
 
                     </LinearLayout>
 
@@ -158,7 +160,7 @@
                             android:paddingVertical="@dimen/iscs_space_3"
                             app:i18nKey='@{"colocker"}'
                             android:textColor="?attr/colorTextPrimary"
-                            android:textSize="@dimen/normal_text_size_18" />
+                            android:textSize="@dimen/iscs_text_md" />
 
                         <TextView
                             android:id="@+id/select_colocker_tv"
@@ -170,7 +172,7 @@
                             android:paddingVertical="@dimen/iscs_space_1"
                             app:i18nKey='@{"select"}'
                             android:textColor="?attr/colorTextPrimary"
-                            android:textSize="@dimen/common_btn_text_size" />
+                            android:textSize="@dimen/iscs_text_md" />
                     </LinearLayout>
 
 
@@ -195,7 +197,7 @@
                     android:layout_height="wrap_content"
                     app:i18nKey='@{"select_colocker_tip"}'
                     android:textColor="?attr/colorTextPrimary"
-                    android:textSize="@dimen/normal_text_size" />
+                    android:textSize="@dimen/iscs_text_md" />
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/all_user_rv"
@@ -229,7 +231,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"confirm"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <TextView
                 android:id="@+id/cancel"
@@ -244,7 +246,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"cancel"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
     </LinearLayout>
 </layout>

app/src/main/res/layout-land/fragment_select_point.xml

@@ -21,7 +21,7 @@
                 android:id="@+id/preview_step_iv"
                 android:layout_width="@dimen/title_icon_size"
                 android:layout_height="@dimen/title_icon_size"
-                android:src="@mipmap/icon_data_manage_menu_user_manage" />
+                android:tint="?attr/colorPrimary" />
 
             <TextView
                 android:id="@+id/preview_step_title"
@@ -30,7 +30,8 @@
                 android:layout_marginLeft="@dimen/iscs_space_3"
                 app:i18nKey='@{"create_sop_title"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/normal_text_size_25"
+                android:textSize="@dimen/iscs_text_lg"
+                android:tint="?attr/colorPrimary"
                 android:textStyle="bold" />
 
             <ImageView
@@ -41,9 +42,10 @@
                 android:src="@mipmap/icon_title_arrow_divider" />
 
             <ImageView
-                android:layout_width="@dimen/iscs_space_4"
-                android:layout_height="@dimen/iscs_space_4"
-                android:src="@mipmap/icon_data_manage_menu_point_manage" />
+                android:layout_width="@dimen/title_icon_size"
+                android:layout_height="@dimen/title_icon_size"
+                android:tint="?attr/colorPrimary"
+                app:skinSrc='@{"choose.svg"}'  />
 
             <TextView
                 android:layout_width="wrap_content"
@@ -51,7 +53,7 @@
                 android:layout_marginLeft="@dimen/iscs_space_3"
                 app:i18nKey='@{"select_point_title"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/normal_text_size_18"
+                android:textSize="@dimen/iscs_text_md"
                 android:textStyle="bold" />
 
             <View
@@ -74,7 +76,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"back"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
 
         <View
@@ -106,7 +108,7 @@
                     android:layout_marginLeft="@dimen/iscs_space_3"
                     app:i18nKey='@{"point_list_title"}'
                     android:textColor="?attr/colorTextPrimary"
-                    android:textSize="@dimen/normal_text_size_18" />
+                    android:textSize="@dimen/iscs_text_md" />
 
                 <View
                     android:layout_width="match_parent"
@@ -163,7 +165,7 @@
                         android:paddingHorizontal="@dimen/iscs_space_4"
                         app:i18nKey='@{"add_group"}'
                         android:textColor="?attr/colorTextPrimary"
-                        android:textSize="@dimen/common_btn_text_size" />
+                        android:textSize="@dimen/iscs_text_md" />
                 </LinearLayout>
 
                 <androidx.recyclerview.widget.RecyclerView
@@ -193,7 +195,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"confirm"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <TextView
                 android:id="@+id/cancel"
@@ -208,7 +210,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"cancel"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
     </LinearLayout>
 </layout>

app/src/main/res/layout-land/fragment_set_face.xml

@@ -21,8 +21,8 @@
             <ImageView
                 android:layout_width="@dimen/title_icon_size"
                 android:layout_height="@dimen/title_icon_size"
-                android:src="@mipmap/icon_login_menu_face"
-                android:tint="?attr/colorBlack" />
+                android:tint="?attr/colorPrimary"
+                app:skinSrc='@{"face-id-svgrepo-com.svg"}' />
 
             <TextView
                 android:layout_width="match_parent"
@@ -31,7 +31,7 @@
                 android:layout_weight="1"
                 app:i18nKey='@{"set_face_title"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/normal_text_size_25"
+                android:textSize="@dimen/iscs_text_lg"
                 android:textStyle="bold" />
 
             <TextView
@@ -49,7 +49,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"back"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
 
         <View
@@ -157,7 +157,7 @@
                                     android:gravity="center"
                                     app:i18nKey='@{"detect_face_tip"}'
                                     android:textColor="@color/dialogxColorBlue"
-                                    android:textSize="@dimen/common_text_size_big"
+                                    android:textSize="@dimen/iscs_text_xl"
                                     android:textStyle="bold"
                                     android:visibility="gone"
                                     tools:text="检测到人脸，即将拍摄" />
@@ -171,7 +171,7 @@
                                     android:gravity="center"
                                     app:i18nKey='@{"only_one_person_allowed"}'
                                     android:textColor="?attr/colorStatusRed"
-                                    android:textSize="@dimen/common_text_size_big"
+                                    android:textSize="@dimen/iscs_text_xl"
                                     android:visibility="gone"
                                     tools:text="请保证画面中只有自己" />
                             </FrameLayout>
@@ -212,7 +212,7 @@
                                 android:layout_marginLeft="@dimen/iscs_space_1"
                                 app:i18nKey='@{"capture_tip_title"}'
                                 android:textColor="?attr/colorTextPrimary"
-                                android:textSize="@dimen/common_text_size_small" />
+                                android:textSize="@dimen/iscs_text_sm" />
                         </LinearLayout>
 
                         <TextView
@@ -221,7 +221,7 @@
                             android:gravity="left"
                             app:i18nKey='@{"capture_tip_content"}'
                             android:textColor="?attr/colorTextPrimary"
-                            android:textSize="@dimen/common_text_size_small" />
+                            android:textSize="@dimen/iscs_text_sm" />
 
                     </LinearLayout>
                 </LinearLayout>
@@ -243,7 +243,7 @@
                         android:paddingVertical="@dimen/iscs_space_3"
                         app:i18nKey='@{"confirm"}'
                         android:textColor="?attr/colorTextPrimary"
-                        android:textSize="@dimen/common_btn_text_size"
+                        android:textSize="@dimen/iscs_text_md"
                         android:visibility="gone"
                         app:layout_constraintEnd_toStartOf="@+id/recapture"
                         app:layout_constraintHorizontal_bias="0.5"
@@ -263,7 +263,7 @@
                         android:paddingVertical="@dimen/iscs_space_3"
                         app:i18nKey='@{"recapture"}'
                         android:textColor="?attr/colorTextPrimary"
-                        android:textSize="@dimen/common_btn_text_size"
+                        android:textSize="@dimen/iscs_text_md"
                         android:visibility="gone"
                         app:layout_constraintEnd_toStartOf="@+id/cancel"
                         app:layout_constraintHorizontal_bias="0.5"
@@ -282,7 +282,7 @@
                         android:paddingVertical="@dimen/iscs_space_3"
                         app:i18nKey='@{"cancel"}'
                         android:textColor="?attr/colorTextPrimary"
-                        android:textSize="@dimen/common_btn_text_size"
+                        android:textSize="@dimen/iscs_text_md"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintHorizontal_bias="0.5"
                         app:layout_constraintStart_toEndOf="@+id/recapture"

app/src/main/res/layout-land/fragment_user_info.xml

@@ -21,7 +21,8 @@
             <ImageView
                 android:layout_width="@dimen/title_icon_size"
                 android:layout_height="@dimen/title_icon_size"
-                android:src="@mipmap/icon_data_manage_menu_user_manage" />
+                android:tint="?attr/colorPrimary"
+                app:skinSrc='@{"chalkboard-user.svg"}' />
 
             <TextView
                 android:layout_width="match_parent"
@@ -30,7 +31,7 @@
                 android:layout_weight="1"
                 app:i18nKey='@{"user_info_title"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/normal_text_size_25"
+                android:textSize="@dimen/iscs_text_lg"
                 android:textStyle="bold" />
 
             <TextView
@@ -48,7 +49,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"back"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
 
         <View
@@ -203,7 +204,7 @@
                         android:paddingHorizontal="@dimen/iscs_space_4"
                         app:i18nKey='@{"confirm"}'
                         android:textColor="?attr/colorTextPrimary"
-                        android:textSize="@dimen/common_btn_text_size" />
+                        android:textSize="@dimen/iscs_text_md" />
 
                     <TextView
                         android:id="@+id/cancel"
@@ -218,7 +219,7 @@
                         android:paddingHorizontal="@dimen/iscs_space_4"
                         app:i18nKey='@{"cancel"}'
                         android:textColor="?attr/colorTextPrimary"
-                        android:textSize="@dimen/common_btn_text_size" />
+                        android:textSize="@dimen/iscs_text_md" />
                 </LinearLayout>
             </LinearLayout>
 
@@ -275,7 +276,7 @@
                                     android:paddingVertical="@dimen/iscs_space_3"
                                     app:i18nKey='@{"detect_face_tip"}'
                                     android:textColor="@color/dialogxColorBlue"
-                                    android:textSize="@dimen/common_text_size_big"
+                                    android:textSize="@dimen/iscs_text_xl"
                                     android:textStyle="bold"
                                     android:visibility="gone"
                                     tools:text="检测到人脸，即将拍摄" />
@@ -289,7 +290,7 @@
                                     android:paddingVertical="10dp"
                                     app:i18nKey='@{"only_one_person_allowed"}'
                                     android:textColor="?attr/colorStatusRed"
-                                    android:textSize="@dimen/common_text_size_big"
+                                    android:textSize="@dimen/iscs_text_xl"
                                     android:visibility="gone"
                                     tools:text="请保证画面中只有自己" />
                             </FrameLayout>
@@ -330,7 +331,7 @@
                                 android:layout_marginLeft="@dimen/iscs_space_1"
                                 app:i18nKey='@{"capture_tip_title"}'
                                 android:textColor="?attr/colorTextPrimary"
-                                android:textSize="@dimen/common_text_size_small" />
+                                android:textSize="@dimen/iscs_text_sm" />
                         </LinearLayout>
 
                         <TextView
@@ -339,7 +340,7 @@
                             android:gravity="left"
                             app:i18nKey='@{"capture_tip_content"}'
                             android:textColor="?attr/colorTextPrimary"
-                            android:textSize="@dimen/common_text_size_small" />
+                            android:textSize="@dimen/iscs_text_sm" />
 
                     </LinearLayout>
                 </LinearLayout>
@@ -361,7 +362,7 @@
                         android:paddingVertical="@dimen/iscs_space_3"
                         app:i18nKey='@{"confirm"}'
                         android:textColor="?attr/colorTextPrimary"
-                        android:textSize="@dimen/common_btn_text_size"
+                        android:textSize="@dimen/iscs_text_md"
                         android:visibility="gone"
                         app:layout_constraintEnd_toStartOf="@+id/recapture"
                         app:layout_constraintHorizontal_bias="0.5"
@@ -381,7 +382,7 @@
                         android:paddingVertical="@dimen/iscs_space_3"
                         app:i18nKey='@{"recapture"}'
                         android:textColor="?attr/colorTextPrimary"
-                        android:textSize="@dimen/common_btn_text_size"
+                        android:textSize="@dimen/iscs_text_md"
                         android:visibility="gone"
                         app:layout_constraintEnd_toStartOf="@+id/set_avatar_cancel"
                         app:layout_constraintHorizontal_bias="0.5"
@@ -400,7 +401,7 @@
                         android:paddingVertical="@dimen/iscs_space_3"
                         app:i18nKey='@{"cancel"}'
                         android:textColor="?attr/colorTextPrimary"
-                        android:textSize="@dimen/common_btn_text_size"
+                        android:textSize="@dimen/iscs_text_md"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintHorizontal_bias="0.5"
                         app:layout_constraintStart_toEndOf="@+id/recapture"

app/src/main/res/layout-land/fragment_workflow_setting.xml

@@ -22,7 +22,7 @@
                 android:id="@+id/preview_step_iv"
                 android:layout_width="@dimen/title_icon_size"
                 android:layout_height="@dimen/title_icon_size"
-                android:src="@mipmap/icon_data_manage_menu_user_manage" />
+                android:tint="?attr/colorPrimary" />
 
             <TextView
                 android:id="@+id/preview_step_title"
@@ -31,7 +31,7 @@
                 android:layout_marginLeft="@dimen/iscs_space_3"
                 app:i18nKey='@{"create_sop_title"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/normal_text_size_25"
+                android:textSize="@dimen/iscs_text_lg"
                 android:textStyle="bold" />
 
             <ImageView
@@ -39,12 +39,14 @@
                 android:layout_height="match_parent"
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:scaleType="fitXY"
+                android:tint="?attr/colorPrimary"
                 android:src="@mipmap/icon_title_arrow_divider" />
 
             <ImageView
                 android:layout_width="@dimen/title_icon_size"
                 android:layout_height="@dimen/title_icon_size"
-                android:src="@mipmap/icon_workflow_setting" />
+                android:tint="?attr/colorPrimary"
+                app:skinSrc='@{"workflow-alt.svg"}' />
 
             <TextView
                 android:layout_width="wrap_content"
@@ -52,7 +54,7 @@
                 android:layout_marginLeft="@dimen/iscs_space_3"
                 app:i18nKey='@{"workflow_setting"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/normal_text_size_25"
+                android:textSize="@dimen/iscs_text_lg"
                 android:textStyle="bold" />
 
             <View
@@ -75,13 +77,13 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"back"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
 
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/divider_line_space"
-            android:background="?attr/colorBlack" />
+            android:background="?attr/colorDivider" />
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -125,7 +127,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginVertical="@dimen/iscs_space_4"
                             app:i18nKey='@{"workflow_step_title"}'
-                            android:textSize="@dimen/normal_text_size_18"
+                            android:textSize="@dimen/iscs_text_md"
                             android:textStyle="bold"
                             app:layout_constraintEnd_toEndOf="@+id/barrier_title_end_land"
                             app:layout_constraintTop_toTopOf="parent"
@@ -143,7 +145,7 @@
                             android:paddingHorizontal="@dimen/iscs_space_3"
                             android:paddingVertical="5dp"
                             android:singleLine="true"
-                            android:textSize="@dimen/normal_text_size_18"
+                            android:textSize="@dimen/iscs_text_md"
                             android:textStyle="bold"
                             app:layout_constraintBottom_toBottomOf="@+id/step_title_tv"
                             app:layout_constraintEnd_toEndOf="parent"
@@ -156,7 +158,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginVertical="@dimen/iscs_space_4"
                             app:i18nKey='@{"workflow_step_title_short"}'
-                            android:textSize="@dimen/normal_text_size_18"
+                            android:textSize="@dimen/iscs_text_md"
                             android:textStyle="bold"
                             app:layout_constraintEnd_toEndOf="@+id/barrier_title_end_land"
                             app:layout_constraintStart_toStartOf="parent"
@@ -175,7 +177,7 @@
                             android:paddingHorizontal="@dimen/iscs_space_3"
                             android:paddingVertical="5dp"
                             android:singleLine="true"
-                            android:textSize="@dimen/normal_text_size_18"
+                            android:textSize="@dimen/iscs_text_md"
                             android:textStyle="bold"
                             app:layout_constraintBottom_toBottomOf="@+id/step_title_short_tv"
                             app:layout_constraintEnd_toEndOf="parent"
@@ -188,7 +190,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginVertical="@dimen/iscs_space_4"
                             app:i18nKey='@{"workflow_step_confirm_type"}'
-                            android:textSize="@dimen/normal_text_size_18"
+                            android:textSize="@dimen/iscs_text_md"
                             android:textStyle="bold"
                             app:layout_constraintEnd_toEndOf="@+id/barrier_title_end_land"
                             app:layout_constraintStart_toStartOf="parent"
@@ -208,7 +210,7 @@
                             android:paddingHorizontal="@dimen/iscs_space_3"
                             android:paddingVertical="5dp"
                             android:singleLine="true"
-                            android:textSize="@dimen/normal_text_size_18"
+                            android:textSize="@dimen/iscs_text_md"
                             android:textStyle="bold"
                             app:layout_constraintBottom_toBottomOf="@+id/step_confirm_type_tv"
                             app:layout_constraintEnd_toEndOf="parent"
@@ -221,7 +223,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginVertical="@dimen/iscs_space_4"
                             app:i18nKey='@{"workflow_step_confirm_role"}'
-                            android:textSize="@dimen/normal_text_size_18"
+                            android:textSize="@dimen/iscs_text_md"
                             android:textStyle="bold"
                             android:visibility="gone"
                             app:layout_constraintEnd_toEndOf="@+id/barrier_title_end_land"
@@ -242,7 +244,7 @@
                             android:paddingHorizontal="@dimen/iscs_space_3"
                             android:paddingVertical="5dp"
                             android:singleLine="true"
-                            android:textSize="@dimen/normal_text_size_18"
+                            android:textSize="@dimen/iscs_text_md"
                             android:textStyle="bold"
                             android:visibility="gone"
                             app:layout_constraintBottom_toBottomOf="@+id/step_confirm_role_tv"
@@ -255,7 +257,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginVertical="@dimen/iscs_space_4"
                             app:i18nKey='@{"workflow_step_confirm_member"}'
-                            android:textSize="@dimen/normal_text_size_18"
+                            android:textSize="@dimen/iscs_text_md"
                             android:textStyle="bold"
                             android:visibility="gone"
                             app:layout_constraintEnd_toEndOf="@+id/barrier_title_end_land"
@@ -276,7 +278,7 @@
                             android:paddingHorizontal="@dimen/iscs_space_3"
                             android:paddingVertical="5dp"
                             android:singleLine="true"
-                            android:textSize="@dimen/normal_text_size_18"
+                            android:textSize="@dimen/iscs_text_md"
                             android:textStyle="bold"
                             android:visibility="gone"
                             app:layout_constraintBottom_toBottomOf="@+id/step_confirm_member_tv"
@@ -289,7 +291,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginVertical="@dimen/iscs_space_4"
                             app:i18nKey='@{"workflow_step_function"}'
-                            android:textSize="@dimen/normal_text_size_18"
+                            android:textSize="@dimen/iscs_text_md"
                             android:textStyle="bold"
                             app:layout_constraintEnd_toEndOf="@+id/barrier_title_end_land"
                             app:layout_constraintTop_toBottomOf="@+id/step_confirm_member_tv"
@@ -320,7 +322,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginVertical="@dimen/iscs_space_4"
                         app:i18nKey='@{"workflow_step_description"}'
-                        android:textSize="@dimen/normal_text_size_18"
+                        android:textSize="@dimen/iscs_text_md"
                         android:textStyle="bold"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent"
@@ -338,7 +340,7 @@
                         android:paddingHorizontal="@dimen/iscs_space_3"
                         android:paddingVertical="5dp"
                         android:scrollbars="vertical"
-                        android:textSize="@dimen/normal_text_size_18"
+                        android:textSize="@dimen/iscs_text_md"
                         android:textStyle="bold"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toEndOf="@+id/step_description_tv"
@@ -368,7 +370,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"confirm"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <TextView
                 android:id="@+id/cancel"
@@ -383,7 +385,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"cancel"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
     </LinearLayout>
 </layout>

app/src/main/res/layout-land/item_home_quick_entrance.xml

@@ -30,7 +30,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/iscs_space_1"
             android:textColor="?attr/colorTextPrimary"
-            android:textSize="@dimen/home_item_quick_entrace_text_size"
+            android:textSize="@dimen/iscs_text_xs"
             tools:text="创建作业" />
     </LinearLayout>
 </layout>

app/src/main/res/layout-land/item_job_execute_colock.xml

@@ -20,7 +20,7 @@
             android:layout_height="wrap_content"
             android:gravity="center"
             android:textColor="?attr/colorTextPrimary"
-            android:textSize="@dimen/normal_text_size"
+            android:textSize="@dimen/iscs_text_md"
             tools:text="王俊杰" />
     </LinearLayout>
 </layout>

app/src/main/res/layout-land/item_job_execute_step.xml

@@ -29,6 +29,7 @@
                 android:layout_marginTop="@dimen/iscs_space_3"
                 android:gravity="center"
                 app:i18nKey='@{"point_name_tv"}'
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md" />
 
             <TextView
@@ -38,6 +39,7 @@
                 android:layout_marginTop="@dimen/iscs_space_3"
                 android:background="@drawable/bg_job_execute_step_index"
                 android:gravity="center"
+                android:textColor="?attr/colorTextPrimary"
                 android:includeFontPadding="false"
                 android:padding="@dimen/iscs_space_1"
                 android:textSize="@dimen/iscs_text_md"
@@ -49,6 +51,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/iscs_space_3"
+            android:tint="?attr/colorPrimary"
             android:src="@drawable/icon_job_execute_arrow_right"/>
     </LinearLayout>
 

app/src/main/res/layout-land/item_locker_group.xml

@@ -39,7 +39,7 @@
                     android:paddingHorizontal="@dimen/iscs_space_3"
                     app:i18nKey='@{"selected_point_info_title"}'
                     android:textColor="@color/text_color_item_group_title_text"
-                    android:textSize="@dimen/normal_text_size_18" />
+                    android:textSize="@dimen/iscs_text_md" />
 
             </LinearLayout>
 

app/src/main/res/layout-land/item_point_group.xml

@@ -32,7 +32,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 app:i18nKey='@{"selected_point_info_title"}'
                 android:textColor="@color/text_color_item_group_title_text"
-                android:textSize="@dimen/normal_text_size_18" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <View
                 android:layout_width="0dp"
@@ -51,7 +51,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"edit"}'
                 android:textColor="@color/text_color_item_group_title_text"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <TextView
                 android:id="@+id/delete_group"
@@ -65,7 +65,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"delete_group"}'
                 android:textColor="@color/text_color_item_group_title_text"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
 
         <View

app/src/main/res/layout-land/item_point_group_show.xml

@@ -31,7 +31,7 @@
                 android:paddingLeft="@dimen/iscs_space_3"
                 app:i18nKey='@{"selected_point_info_title"}'
                 android:textColor="@color/text_color_item_group_title_text"
-                android:textSize="@dimen/normal_text_size_18" />
+                android:textSize="@dimen/iscs_text_md" />
 
         </LinearLayout>
 

app/src/main/res/layout-land/item_quick_entrance_config.xml

@@ -47,7 +47,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/iscs_space_1"
             android:textColor="?attr/colorTextPrimary"
-            android:textSize="@dimen/home_item_quick_entrace_text_size"
+            android:textSize="@dimen/iscs_text_xs"
             tools:text="创建作业" />
     </LinearLayout>
 </layout>

app/src/main/res/layout-land/item_quick_entrance_not_config.xml

@@ -46,7 +46,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/iscs_space_1"
             android:textColor="?attr/colorTextPrimary"
-            android:textSize="@dimen/home_item_quick_entrace_text_size"
+            android:textSize="@dimen/iscs_text_xs"
             tools:text="创建作业" />
     </LinearLayout>
 </layout>

app/src/main/res/layout/activity_login.xml

@@ -67,7 +67,7 @@
                 android:layout_marginTop="@dimen/iscs_space_4"
                 android:gravity="center"
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/login_main_title_text_size"
+                android:textSize="@dimen/iscs_text_h1"
                 android:textStyle="bold"
                 app:i18nKey='@{"loto"}' />
 

app/src/main/res/layout/activity_main.xml

@@ -91,7 +91,7 @@
                 android:gravity="center_vertical"
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size"
+                android:textSize="@dimen/iscs_text_md"
                 android:visibility="gone" />
         </FrameLayout>
 

app/src/main/res/layout/activity_splash.xml

@@ -27,7 +27,7 @@
                 android:layout_gravity="center_horizontal"
                 app:i18nKey='@{"loto"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/login_main_title_text_size"
+                android:textSize="@dimen/iscs_text_h1"
                 android:textStyle="bold" />
 
             <com.grkj.ui_base.widget.ShadowTextView
@@ -38,7 +38,7 @@
                 android:layout_marginTop="@dimen/login_sub_title_margin_top"
                 app:i18nKey='@{"loto_en"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/login_sub_title_text_size"
+                android:textSize="@dimen/iscs_text_h2"
                 android:textStyle="bold" />
         </LinearLayout>
 
@@ -52,6 +52,6 @@
             android:gravity="center_horizontal"
             app:i18nKey='@{"tec_support"}'
             android:textColor="?attr/colorTextPrimary"
-            android:textSize="@dimen/login_tec_support_text_size" />
+            android:textSize="@dimen/iscs_text_xsm" />
     </RelativeLayout>
 </layout>

app/src/main/res/layout/dialog_add_card.xml

@@ -24,7 +24,7 @@
                 android:layout_weight="1"
                 app:i18nKey='@{"card_manage_new_card_title"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <ImageView
                 android:id="@+id/close_iv"
@@ -37,7 +37,7 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/divider_line_space"
-            android:background="?attr/colorBlack" />
+            android:background="?attr/colorDivider" />
 
         <!-- 内容区 -->
         <androidx.constraintlayout.widget.ConstraintLayout
@@ -126,20 +126,22 @@
                 app:layout_constraintStart_toEndOf="@+id/status_tv"
                 app:layout_constraintTop_toTopOf="@+id/status_tv">
 
-                <RadioButton
+                <com.google.android.material.radiobutton.MaterialRadioButton
                     android:id="@+id/activate_rb"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/iscs_space_3"
                     app:i18nKey='@{"normal"}'
+                    app:useMaterialThemeColors="true"
                     android:textSize="@dimen/iscs_text_md" />
 
-                <RadioButton
+                <com.google.android.material.radiobutton.MaterialRadioButton
                     android:id="@+id/deactivate_rb"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/iscs_space_3"
                     app:i18nKey='@{"abnormal"}'
+                    app:useMaterialThemeColors="true"
                     android:textSize="@dimen/iscs_text_md" />
             </RadioGroup>
 
@@ -194,7 +196,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"confirm"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <TextView
                 android:id="@+id/cancel"
@@ -209,7 +211,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"cancel"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
     </LinearLayout>
 </layout>

app/src/main/res/layout/dialog_add_fingerprint.xml

@@ -39,6 +39,6 @@
             android:paddingVertical="@dimen/iscs_space_3"
             app:i18nKey='@{"cancel"}'
             android:textColor="?attr/colorTextPrimary"
-            android:textSize="@dimen/common_btn_text_size" />
+            android:textSize="@dimen/iscs_text_md" />
     </LinearLayout>
 </layout>

app/src/main/res/layout/dialog_add_key.xml

@@ -23,7 +23,7 @@
                 android:layout_weight="1"
                 app:i18nKey='@{"key_manage_new_key_title"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <ImageView
                 android:id="@+id/close_iv"
@@ -36,7 +36,7 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/divider_line_space"
-            android:background="?attr/colorBlack" />
+            android:background="?attr/colorDivider" />
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
@@ -154,18 +154,20 @@
                 app:layout_constraintStart_toEndOf="@+id/status_tv"
                 app:layout_constraintTop_toTopOf="@+id/status_tv">
 
-                <RadioButton
+                <com.google.android.material.radiobutton.MaterialRadioButton
                     android:id="@+id/activate_rb"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/iscs_space_3"
+                    app:useMaterialThemeColors="true"
                     app:i18nKey='@{"normal"}'
                     android:textSize="@dimen/iscs_text_md" />
 
-                <RadioButton
+                <com.google.android.material.radiobutton.MaterialRadioButton
                     android:id="@+id/deactivate_rb"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    app:useMaterialThemeColors="true"
                     android:layout_marginLeft="@dimen/iscs_space_3"
                     app:i18nKey='@{"abnormal"}'
                     android:textSize="@dimen/iscs_text_md" />
@@ -220,7 +222,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"confirm"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <TextView
                 android:id="@+id/cancel"
@@ -235,7 +237,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"cancel"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
     </LinearLayout>
 </layout>

app/src/main/res/layout/dialog_add_lock.xml

@@ -24,7 +24,7 @@
                 android:layout_weight="1"
                 app:i18nKey='@{"lock_manage_new_lock_title"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <ImageView
                 android:id="@+id/close_iv"
@@ -37,7 +37,7 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/divider_line_space"
-            android:background="?attr/colorBlack" />
+            android:background="?attr/colorDivider" />
 
         <!-- 内容区 -->
         <androidx.constraintlayout.widget.ConstraintLayout
@@ -125,18 +125,20 @@
                 app:layout_constraintStart_toEndOf="@+id/status_tv"
                 app:layout_constraintTop_toTopOf="@+id/status_tv">
 
-                <RadioButton
+                <com.google.android.material.radiobutton.MaterialRadioButton
                     android:id="@+id/activate_rb"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    app:useMaterialThemeColors="true"
                     android:layout_marginStart="@dimen/iscs_space_3"
                     app:i18nKey='@{"normal"}'
                     android:textSize="@dimen/iscs_text_md" />
 
-                <RadioButton
+                <com.google.android.material.radiobutton.MaterialRadioButton
                     android:id="@+id/deactivate_rb"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    app:useMaterialThemeColors="true"
                     android:layout_marginStart="@dimen/iscs_space_3"
                     app:i18nKey='@{"abnormal"}'
                     android:textSize="@dimen/iscs_text_md" />
@@ -193,7 +195,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"confirm"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <TextView
                 android:id="@+id/cancel"
@@ -208,7 +210,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"cancel"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
     </LinearLayout>
 </layout>

app/src/main/res/layout/dialog_add_point.xml

@@ -22,7 +22,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size"
+                android:textSize="@dimen/iscs_text_md"
                 app:i18nKey='@{"point_manage_add_title"}' />
 
             <ImageView
@@ -36,7 +36,7 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/divider_line_space"
-            android:background="?attr/colorBlack" />
+            android:background="?attr/colorDivider" />
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
@@ -249,7 +249,7 @@
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size"
+                android:textSize="@dimen/iscs_text_md"
                 app:i18nKey='@{"confirm"}' />
 
             <TextView
@@ -264,7 +264,7 @@
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size"
+                android:textSize="@dimen/iscs_text_md"
                 app:i18nKey='@{"cancel"}' />
         </LinearLayout>
     </LinearLayout>

app/src/main/res/layout/dialog_add_rfid_token.xml

@@ -24,7 +24,7 @@
                 android:layout_weight="1"
                 app:i18nKey='@{"rfid_token_manage_new_rfid_token_title"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <ImageView
                 android:id="@+id/close_iv"
@@ -37,7 +37,7 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/divider_line_space"
-            android:background="?attr/colorBlack" />
+            android:background="?attr/colorDivider" />
 
         <!-- 内容区 -->
         <androidx.constraintlayout.widget.ConstraintLayout
@@ -125,18 +125,20 @@
                 app:layout_constraintStart_toEndOf="@+id/status_tv"
                 app:layout_constraintTop_toTopOf="@+id/status_tv">
 
-                <RadioButton
+                <com.google.android.material.radiobutton.MaterialRadioButton
                     android:id="@+id/activate_rb"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    app:useMaterialThemeColors="true"
                     android:layout_marginStart="@dimen/iscs_space_3"
                     app:i18nKey='@{"normal"}'
                     android:textSize="@dimen/iscs_text_md" />
 
-                <RadioButton
+                <com.google.android.material.radiobutton.MaterialRadioButton
                     android:id="@+id/deactivate_rb"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    app:useMaterialThemeColors="true"
                     android:layout_marginStart="@dimen/iscs_space_3"
                     app:i18nKey='@{"abnormal"}'
                     android:textSize="@dimen/iscs_text_md" />
@@ -193,7 +195,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"confirm"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <TextView
                 android:id="@+id/cancel"
@@ -208,7 +210,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"cancel"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
     </LinearLayout>
 </layout>

app/src/main/res/layout/dialog_add_role.xml

@@ -23,7 +23,7 @@
                 android:layout_weight="1"
                 app:i18nKey='@{"role_manage_add_title"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <ImageView
                 android:id="@+id/close_iv"
@@ -36,7 +36,7 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/divider_line_space"
-            android:background="?attr/colorBlack" />
+            android:background="?attr/colorDivider" />
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
@@ -132,18 +132,20 @@
                 app:layout_constraintStart_toEndOf="@+id/status_tv"
                 app:layout_constraintTop_toTopOf="@+id/status_tv">
 
-                <RadioButton
+                <com.google.android.material.radiobutton.MaterialRadioButton
                     android:id="@+id/activate_rb"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    app:useMaterialThemeColors="true"
                     android:layout_marginLeft="@dimen/normal_margin_left"
                     app:i18nKey='@{"user_manage_filter_activate"}'
                     android:textSize="@dimen/iscs_text_md" />
 
-                <RadioButton
+                <com.google.android.material.radiobutton.MaterialRadioButton
                     android:id="@+id/deactivate_rb"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    app:useMaterialThemeColors="true"
                     android:layout_marginLeft="@dimen/normal_margin_left"
                     app:i18nKey='@{"user_manage_filter_deactivate"}'
                     android:textSize="@dimen/iscs_text_md" />
@@ -224,7 +226,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"confirm"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <TextView
                 android:id="@+id/cancel"
@@ -239,7 +241,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"cancel"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
     </LinearLayout>
 </layout>

app/src/main/res/layout/dialog_add_user.xml

@@ -24,7 +24,7 @@
                 android:layout_weight="1"
                 app:i18nKey='@{"user_manage_new_user_title"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <ImageView
                 android:id="@+id/close_iv"
@@ -222,19 +222,21 @@
                 app:layout_constraintStart_toEndOf="@+id/status_tv"
                 app:layout_constraintTop_toTopOf="@+id/status_tv">
 
-                <RadioButton
+                <com.google.android.material.radiobutton.MaterialRadioButton
                     android:id="@+id/activate_rb"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     app:i18nKey='@{"user_manage_filter_activate"}'
+                    app:useMaterialThemeColors="true"
                     android:textSize="@dimen/iscs_text_md" />
 
-                <RadioButton
+                <com.google.android.material.radiobutton.MaterialRadioButton
                     android:id="@+id/deactivate_rb"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/iscs_space_3"
                     app:i18nKey='@{"user_manage_filter_deactivate"}'
+                    app:useMaterialThemeColors="true"
                     android:textSize="@dimen/iscs_text_md" />
             </RadioGroup>
         </androidx.constraintlayout.widget.ConstraintLayout>
@@ -259,7 +261,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"confirm"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <TextView
                 android:id="@+id/cancel"
@@ -274,7 +276,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"cancel"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
     </LinearLayout>
 </layout>

app/src/main/res/layout/dialog_add_workstation.xml

@@ -23,7 +23,7 @@
                 android:layout_weight="1"
                 app:i18nKey='@{"workstation_manage_new_workstation"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <ImageView
                 android:id="@+id/close_iv"
@@ -36,7 +36,7 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/divider_line_space"
-            android:background="?attr/colorBlack" />
+            android:background="?attr/colorDivider" />
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -97,7 +97,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"confirm"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <TextView
                 android:id="@+id/cancel"
@@ -112,7 +112,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"cancel"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
     </LinearLayout>
 </layout>

app/src/main/res/layout/dialog_check_face.xml

@@ -20,14 +20,14 @@
 
             <ImageView
                 android:id="@+id/iv_icon"
-                android:layout_width="@dimen/dialog_common_root_height_normal"
-                android:layout_height="@dimen/dialog_common_root_height_normal"
+                android:layout_width="@dimen/dialog_common_root_height_small"
+                android:layout_height="@dimen/dialog_common_root_height_small"
                 android:layout_marginBottom="@dimen/iscs_space_1" />
 
             <TextView
                 android:id="@+id/tv_tip"
                 style="@style/CommonTextView"
-                android:textSize="@dimen/common_text_size_big" />
+                android:textSize="@dimen/iscs_text_xl" />
         </LinearLayout>
 
         <FrameLayout

app/src/main/res/layout/dialog_colock_operation_tip.xml

@@ -27,7 +27,7 @@
             <TextView
                 android:id="@+id/tv_tip"
                 style="@style/CommonTextView"
-                android:textSize="@dimen/common_text_size_big" />
+                android:textSize="@dimen/iscs_text_xl" />
         </LinearLayout>
 
         <FrameLayout

app/src/main/res/layout/dialog_filter_card.xml

@@ -23,7 +23,7 @@
                 android:layout_weight="1"
                 app:i18nKey='@{"user_manage_filter_title"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <ImageView
                 android:id="@+id/close_iv"
@@ -36,7 +36,7 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/divider_line_space"
-            android:background="?attr/colorBlack" />
+            android:background="?attr/colorDivider" />
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
@@ -128,18 +128,20 @@
                 app:layout_constraintStart_toEndOf="@+id/status_tv"
                 app:layout_constraintTop_toTopOf="@+id/status_tv">
 
-                <RadioButton
+                <com.google.android.material.radiobutton.MaterialRadioButton
                     android:id="@+id/activate_rb"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    app:useMaterialThemeColors="true"
                     android:layout_marginLeft="@dimen/iscs_space_3"
                     app:i18nKey='@{"normal"}'
                     android:textSize="@dimen/iscs_text_md" />
 
-                <RadioButton
+                <com.google.android.material.radiobutton.MaterialRadioButton
                     android:id="@+id/deactivate_rb"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    app:useMaterialThemeColors="true"
                     android:layout_marginLeft="@dimen/iscs_space_3"
                     app:i18nKey='@{"abnormal"}'
                     android:textSize="@dimen/iscs_text_md" />
@@ -166,7 +168,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"confirm"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <TextView
                 android:id="@+id/cancel"
@@ -181,7 +183,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"cancel"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
     </LinearLayout>
 </layout>

app/src/main/res/layout/dialog_filter_key.xml

@@ -23,7 +23,7 @@
                 android:layout_weight="1"
                 app:i18nKey='@{"user_manage_filter_title"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <ImageView
                 android:id="@+id/close_iv"
@@ -154,18 +154,20 @@
                 app:layout_constraintStart_toEndOf="@+id/status_tv"
                 app:layout_constraintTop_toTopOf="@+id/status_tv">
 
-                <RadioButton
+                <com.google.android.material.radiobutton.MaterialRadioButton
                     android:id="@+id/activate_rb"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    app:useMaterialThemeColors="true"
                     android:layout_marginLeft="@dimen/iscs_space_3"
                     app:i18nKey='@{"normal"}'
                     android:textSize="@dimen/iscs_text_md" />
 
-                <RadioButton
+                <com.google.android.material.radiobutton.MaterialRadioButton
                     android:id="@+id/deactivate_rb"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    app:useMaterialThemeColors="true"
                     android:layout_marginLeft="@dimen/iscs_space_3"
                     app:i18nKey='@{"abnormal"}'
                     android:textSize="@dimen/iscs_text_md" />
@@ -192,7 +194,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"confirm"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <TextView
                 android:id="@+id/cancel"
@@ -207,7 +209,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"cancel"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
     </LinearLayout>
 </layout>

app/src/main/res/layout/dialog_filter_lock.xml

@@ -21,9 +21,9 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                app:i18nKey='@{"user_manage_filter_title"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md"
+                app:i18nKey='@{"user_manage_filter_title"}' />
 
             <ImageView
                 android:id="@+id/close_iv"
@@ -36,7 +36,7 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/divider_line_space"
-            android:background="?attr/colorBlack" />
+            android:background="?attr/colorDivider" />
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
@@ -51,9 +51,9 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
-                app:i18nKey='@{"lock_code"}'
                 android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
+                app:i18nKey='@{"lock_code"}'
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
@@ -63,13 +63,13 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/iscs_space_3"
                 android:background="@drawable/bg_common_input"
-                app:i18nHint='@{"please_input_lock_code"}'
                 android:maxLines="1"
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
                 android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
+                app:i18nHint='@{"please_input_lock_code"}'
                 app:layout_constraintBottom_toBottomOf="@+id/lock_code_tv"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toEndOf="@+id/lock_code_tv"
@@ -81,9 +81,9 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
-                app:i18nKey='@{"lock_nfc"}'
                 android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
+                app:i18nKey='@{"lock_nfc"}'
                 app:layout_constraintEnd_toEndOf="@+id/lock_code_tv"
                 app:layout_constraintTop_toBottomOf="@+id/lock_code_tv" />
 
@@ -93,13 +93,13 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/iscs_space_3"
                 android:background="@drawable/bg_common_input"
-                app:i18nHint='@{"please_input_lock_nfc"}'
                 android:maxLines="1"
                 android:paddingHorizontal="@dimen/iscs_space_3"
                 android:paddingVertical="2dp"
                 android:singleLine="true"
                 android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
+                app:i18nHint='@{"please_input_lock_nfc"}'
                 app:layout_constraintBottom_toBottomOf="@+id/lock_nfc_tv"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toEndOf="@+id/lock_nfc_tv"
@@ -111,9 +111,9 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/iscs_space_4"
-                app:i18nKey='@{"manage_filter_status"}'
                 android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md"
+                app:i18nKey='@{"manage_filter_status"}'
                 app:layout_constraintEnd_toEndOf="@+id/lock_nfc_tv"
                 app:layout_constraintTop_toBottomOf="@+id/lock_nfc_tv" />
 
@@ -127,21 +127,23 @@
                 app:layout_constraintStart_toEndOf="@+id/status_tv"
                 app:layout_constraintTop_toTopOf="@+id/status_tv">
 
-                <RadioButton
+                <com.google.android.material.radiobutton.MaterialRadioButton
                     android:id="@+id/activate_rb"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/iscs_space_3"
+                    android:textSize="@dimen/iscs_text_md"
                     app:i18nKey='@{"normal"}'
-                    android:textSize="@dimen/iscs_text_md" />
+                    app:useMaterialThemeColors="true" />
 
-                <RadioButton
+                <com.google.android.material.radiobutton.MaterialRadioButton
                     android:id="@+id/deactivate_rb"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/iscs_space_3"
+                    android:textSize="@dimen/iscs_text_md"
                     app:i18nKey='@{"abnormal"}'
-                    android:textSize="@dimen/iscs_text_md" />
+                    app:useMaterialThemeColors="true" />
             </RadioGroup>
         </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -163,9 +165,9 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/iscs_space_4"
-                app:i18nKey='@{"confirm"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md"
+                app:i18nKey='@{"confirm"}' />
 
             <TextView
                 android:id="@+id/cancel"
@@ -178,9 +180,9 @@
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/iscs_space_4"
-                app:i18nKey='@{"cancel"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md"
+                app:i18nKey='@{"cancel"}' />
         </LinearLayout>
     </LinearLayout>
 </layout>

app/src/main/res/layout/dialog_filter_point.xml

@@ -22,7 +22,7 @@
                 android:layout_weight="1"
                 app:i18nKey='@{"filter"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <ImageView
                 android:id="@+id/close_iv"
@@ -35,7 +35,7 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/divider_line_space"
-            android:background="?attr/colorBlack" />
+            android:background="?attr/colorDivider" />
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
@@ -229,7 +229,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"confirm"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <TextView
                 android:id="@+id/cancel"
@@ -244,7 +244,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"cancel"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
     </LinearLayout>
 </layout>

app/src/main/res/layout/dialog_filter_rfid_token.xml

@@ -23,7 +23,7 @@
                 android:layout_weight="1"
                 app:i18nKey='@{"user_manage_filter_title"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <ImageView
                 android:id="@+id/close_iv"
@@ -127,20 +127,22 @@
                 app:layout_constraintStart_toEndOf="@+id/status_tv"
                 app:layout_constraintTop_toTopOf="@+id/status_tv">
 
-                <RadioButton
+                <com.google.android.material.radiobutton.MaterialRadioButton
                     android:id="@+id/activate_rb"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/iscs_space_3"
                     app:i18nKey='@{"normal"}'
+                    app:useMaterialThemeColors="true"
                     android:textSize="@dimen/iscs_text_md" />
 
-                <RadioButton
+                <com.google.android.material.radiobutton.MaterialRadioButton
                     android:id="@+id/deactivate_rb"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/iscs_space_3"
                     app:i18nKey='@{"abnormal"}'
+                    app:useMaterialThemeColors="true"
                     android:textSize="@dimen/iscs_text_md" />
             </RadioGroup>
         </androidx.constraintlayout.widget.ConstraintLayout>
@@ -165,7 +167,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"confirm"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <TextView
                 android:id="@+id/cancel"
@@ -180,7 +182,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"cancel"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
     </LinearLayout>
 </layout>

app/src/main/res/layout/dialog_filter_role.xml

@@ -23,7 +23,7 @@
                 android:layout_weight="1"
                 app:i18nKey='@{"user_manage_filter_title"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <ImageView
                 android:id="@+id/close_iv"
@@ -36,7 +36,7 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/divider_line_space"
-            android:background="?attr/colorBlack" />
+            android:background="?attr/colorDivider" />
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -125,20 +125,22 @@
                     android:layout_height="wrap_content"
                     android:orientation="horizontal">
 
-                    <RadioButton
+                    <com.google.android.material.radiobutton.MaterialRadioButton
                         android:id="@+id/activate_rb"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/iscs_space_3"
                         android:textSize="@dimen/iscs_text_md"
+                        app:useMaterialThemeColors="true"
                         app:i18nKey='@{"user_manage_filter_activate"}' />
 
-                    <RadioButton
+                    <com.google.android.material.radiobutton.MaterialRadioButton
                         android:id="@+id/deactivate_rb"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/iscs_space_3"
                         android:textSize="@dimen/iscs_text_md"
+                        app:useMaterialThemeColors="true"
                         app:i18nKey='@{"user_manage_filter_deactivate"}' />
                 </RadioGroup>
             </LinearLayout>
@@ -164,7 +166,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"confirm"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <TextView
                 android:id="@+id/cancel"
@@ -179,7 +181,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"cancel"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
     </LinearLayout>
 </layout>

app/src/main/res/layout/dialog_filter_user.xml

@@ -4,7 +4,7 @@
 
     <LinearLayout
         android:layout_width="@dimen/dialog_common_root_width"
-        android:layout_height="@dimen/dialog_common_root_height_normal"
+        android:layout_height="@dimen/dialog_common_root_height_md"
         android:background="@drawable/common_card_bg"
         android:orientation="vertical">
 
@@ -23,7 +23,7 @@
                 android:layout_weight="1"
                 app:i18nKey='@{"user_manage_filter_title"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <ImageView
                 android:id="@+id/close_iv"
@@ -36,7 +36,7 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/divider_line_space"
-            android:background="?attr/colorBlack" />
+            android:background="?attr/colorDivider" />
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -156,20 +156,22 @@
                     android:layout_height="wrap_content"
                     android:orientation="horizontal">
 
-                    <RadioButton
+                    <com.google.android.material.radiobutton.MaterialRadioButton
                         android:id="@+id/activate_rb"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/iscs_space_3"
                         android:textSize="@dimen/iscs_text_md"
+                        app:useMaterialThemeColors="true"
                         app:i18nKey='@{"user_manage_filter_activate"}' />
 
-                    <RadioButton
+                    <com.google.android.material.radiobutton.MaterialRadioButton
                         android:id="@+id/deactivate_rb"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/iscs_space_3"
                         android:textSize="@dimen/iscs_text_md"
+                        app:useMaterialThemeColors="true"
                         app:i18nKey='@{"user_manage_filter_deactivate"}' />
                 </RadioGroup>
             </LinearLayout>
@@ -195,7 +197,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"confirm"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <TextView
                 android:id="@+id/cancel"
@@ -210,7 +212,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"cancel"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
     </LinearLayout>
 </layout>

app/src/main/res/layout/dialog_login.xml

@@ -20,8 +20,8 @@
 
             <ImageView
                 android:id="@+id/iv_icon"
-                android:layout_width="@dimen/dialog_common_root_height_normal"
-                android:layout_height="@dimen/dialog_common_root_height_normal"
+                android:layout_width="@dimen/dialog_common_root_height_small"
+                android:layout_height="@dimen/dialog_common_root_height_small"
                 android:layout_marginBottom="@dimen/iscs_space_1" />
 
             <TextView

app/src/main/res/layout/dialog_quick_entrance_config.xml

@@ -21,7 +21,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 android:paddingVertical="@dimen/iscs_space_1"
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size"
+                android:textSize="@dimen/iscs_text_md"
                 app:i18nKey='@{"cancel"}' />
 
             <TextView
@@ -31,7 +31,7 @@
                 android:layout_centerHorizontal="true"
                 android:paddingVertical="@dimen/iscs_space_1"
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size"
+                android:textSize="@dimen/iscs_text_md"
                 app:i18nKey='@{"quick_entrance_title"}' />
 
             <TextView
@@ -43,7 +43,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 android:paddingVertical="@dimen/iscs_space_1"
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size"
+                android:textSize="@dimen/iscs_text_md"
                 app:i18nKey='@{"save"}' />
         </RelativeLayout>
 
@@ -62,7 +62,7 @@
                 android:layout_centerHorizontal="true"
                 android:paddingVertical="@dimen/iscs_space_1"
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size"
+                android:textSize="@dimen/iscs_text_md"
                 app:i18nKey='@{"selected_quick_entrance"}' />
 
             <androidx.recyclerview.widget.RecyclerView
@@ -77,7 +77,7 @@
                 android:layout_centerHorizontal="true"
                 android:paddingVertical="@dimen/iscs_space_1"
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size"
+                android:textSize="@dimen/iscs_text_md"
                 app:i18nKey='@{"all_quick_entrance"}' />
 
             <androidx.recyclerview.widget.RecyclerView

app/src/main/res/layout/dialog_slots_exception_report.xml

@@ -17,7 +17,7 @@
             android:paddingHorizontal="@dimen/iscs_space_3"
             app:i18nKey='@{"slots_exception_report"}'
             android:textColor="?attr/colorTextPrimary"
-            android:textSize="@dimen/common_btn_text_size" />
+            android:textSize="@dimen/iscs_text_md" />
 
 
         <androidx.constraintlayout.widget.ConstraintLayout
@@ -82,7 +82,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"confirm"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <TextView
                 android:id="@+id/cancel_btn"
@@ -97,7 +97,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"cancel"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
     </RelativeLayout>
 </layout>

app/src/main/res/layout/dialog_update_card.xml

@@ -24,7 +24,7 @@
                 android:layout_weight="1"
                 app:i18nKey='@{"card_manage_card_detail_title"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <ImageView
                 android:id="@+id/close_iv"
@@ -125,20 +125,22 @@
                 app:layout_constraintStart_toEndOf="@+id/status_tv"
                 app:layout_constraintTop_toTopOf="@+id/status_tv">
 
-                <RadioButton
+                <com.google.android.material.radiobutton.MaterialRadioButton
                     android:id="@+id/activate_rb"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/iscs_space_3"
                     app:i18nKey='@{"normal"}'
+                    app:useMaterialThemeColors="true"
                     android:textSize="@dimen/iscs_text_md" />
 
-                <RadioButton
+                <com.google.android.material.radiobutton.MaterialRadioButton
                     android:id="@+id/deactivate_rb"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/iscs_space_3"
                     app:i18nKey='@{"abnormal"}'
+                    app:useMaterialThemeColors="true"
                     android:textSize="@dimen/iscs_text_md" />
             </RadioGroup>
 
@@ -191,7 +193,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"confirm"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <TextView
                 android:id="@+id/cancel"
@@ -206,7 +208,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"cancel"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
     </LinearLayout>
 </layout>

app/src/main/res/layout/dialog_update_key.xml

@@ -23,7 +23,7 @@
                 android:layout_weight="1"
                 app:i18nKey='@{"key_manage_key_detail_title"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <ImageView
                 android:id="@+id/close_iv"
@@ -36,7 +36,7 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/divider_line_space"
-            android:background="?attr/colorBlack" />
+            android:background="?attr/colorDivider" />
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
@@ -154,20 +154,22 @@
                 app:layout_constraintStart_toEndOf="@+id/status_tv"
                 app:layout_constraintTop_toTopOf="@+id/status_tv">
 
-                <RadioButton
+                <com.google.android.material.radiobutton.MaterialRadioButton
                     android:id="@+id/activate_rb"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/iscs_space_3"
                     app:i18nKey='@{"normal"}'
+                    app:useMaterialThemeColors="true"
                     android:textSize="@dimen/iscs_text_md" />
 
-                <RadioButton
+                <com.google.android.material.radiobutton.MaterialRadioButton
                     android:id="@+id/deactivate_rb"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/iscs_space_3"
                     app:i18nKey='@{"abnormal"}'
+                    app:useMaterialThemeColors="true"
                     android:textSize="@dimen/iscs_text_md" />
             </RadioGroup>
 
@@ -220,7 +222,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"confirm"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <TextView
                 android:id="@+id/cancel"
@@ -235,7 +237,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"cancel"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
     </LinearLayout>
 </layout>

app/src/main/res/layout/dialog_update_lock.xml

@@ -24,7 +24,7 @@
                 android:layout_weight="1"
                 app:i18nKey='@{"lock_manage_lock_detail_title"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <ImageView
                 android:id="@+id/close_iv"
@@ -37,7 +37,7 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/divider_line_space"
-            android:background="?attr/colorBlack" />
+            android:background="?attr/colorDivider" />
 
         <!-- 内容区 -->
         <androidx.constraintlayout.widget.ConstraintLayout
@@ -124,20 +124,22 @@
                 app:layout_constraintStart_toEndOf="@+id/status_tv"
                 app:layout_constraintTop_toTopOf="@+id/status_tv">
 
-                <RadioButton
+                <com.google.android.material.radiobutton.MaterialRadioButton
                     android:id="@+id/activate_rb"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/iscs_space_3"
                     app:i18nKey='@{"normal"}'
+                    app:useMaterialThemeColors="true"
                     android:textSize="@dimen/iscs_text_md" />
 
-                <RadioButton
+                <com.google.android.material.radiobutton.MaterialRadioButton
                     android:id="@+id/deactivate_rb"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/iscs_space_3"
                     app:i18nKey='@{"abnormal"}'
+                    app:useMaterialThemeColors="true"
                     android:textSize="@dimen/iscs_text_md" />
             </RadioGroup>
 
@@ -190,7 +192,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"confirm"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <TextView
                 android:id="@+id/cancel"
@@ -205,7 +207,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"cancel"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
     </LinearLayout>
 </layout>

app/src/main/res/layout/dialog_update_point.xml

@@ -4,7 +4,7 @@
 
     <LinearLayout
         android:layout_width="@dimen/dialog_common_root_width"
-        android:layout_height="@dimen/dialog_common_root_height_md"
+        android:layout_height="@dimen/dialog_common_root_height_normal"
         android:background="@drawable/common_card_bg"
         android:orientation="vertical">
 
@@ -23,7 +23,7 @@
                 android:layout_weight="1"
                 app:i18nKey='@{"point_manage_update_title"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <ImageView
                 android:id="@+id/close_iv"
@@ -36,7 +36,7 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/divider_line_space"
-            android:background="?attr/colorBlack" />
+            android:background="?attr/colorDivider" />
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
@@ -250,7 +250,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"confirm"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <TextView
                 android:id="@+id/cancel"
@@ -265,7 +265,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"cancel"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
     </LinearLayout>
 </layout>

app/src/main/res/layout/dialog_update_rfid_token.xml

@@ -24,7 +24,7 @@
                 android:layout_weight="1"
                 app:i18nKey='@{"rfid_token_manage_rfid_token_detail_title"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <ImageView
                 android:id="@+id/close_iv"
@@ -37,7 +37,7 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/divider_line_space"
-            android:background="?attr/colorBlack" />
+            android:background="?attr/colorDivider" />
 
         <!-- 内容区 -->
         <androidx.constraintlayout.widget.ConstraintLayout
@@ -124,20 +124,22 @@
                 app:layout_constraintStart_toEndOf="@+id/status_tv"
                 app:layout_constraintTop_toTopOf="@+id/status_tv">
 
-                <RadioButton
+                <com.google.android.material.radiobutton.MaterialRadioButton
                     android:id="@+id/activate_rb"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/iscs_space_3"
                     app:i18nKey='@{"normal"}'
+                    app:useMaterialThemeColors="true"
                     android:textSize="@dimen/iscs_text_md" />
 
-                <RadioButton
+                <com.google.android.material.radiobutton.MaterialRadioButton
                     android:id="@+id/deactivate_rb"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/iscs_space_3"
                     app:i18nKey='@{"abnormal"}'
+                    app:useMaterialThemeColors="true"
                     android:textSize="@dimen/iscs_text_md" />
             </RadioGroup>
 
@@ -190,7 +192,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"confirm"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <TextView
                 android:id="@+id/cancel"
@@ -205,7 +207,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"cancel"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
     </LinearLayout>
 </layout>

app/src/main/res/layout/dialog_update_role.xml

@@ -23,7 +23,7 @@
                 android:layout_weight="1"
                 app:i18nKey='@{"user_manage_filter_title"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <ImageView
                 android:id="@+id/close_iv"
@@ -36,7 +36,7 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/divider_line_space"
-            android:background="?attr/colorBlack" />
+            android:background="?attr/colorDivider" />
 
 
         <androidx.constraintlayout.widget.ConstraintLayout
@@ -133,20 +133,22 @@
                 app:layout_constraintStart_toEndOf="@+id/status_tv"
                 app:layout_constraintTop_toTopOf="@+id/status_tv">
 
-                <RadioButton
+                <com.google.android.material.radiobutton.MaterialRadioButton
                     android:id="@+id/activate_rb"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/normal_margin_left"
                     app:i18nKey='@{"user_manage_filter_activate"}'
+                    app:useMaterialThemeColors="true"
                     android:textSize="@dimen/iscs_text_md" />
 
-                <RadioButton
+                <com.google.android.material.radiobutton.MaterialRadioButton
                     android:id="@+id/deactivate_rb"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/normal_margin_left"
                     app:i18nKey='@{"user_manage_filter_deactivate"}'
+                    app:useMaterialThemeColors="true"
                     android:textSize="@dimen/iscs_text_md" />
             </RadioGroup>
 
@@ -225,7 +227,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"confirm"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <TextView
                 android:id="@+id/cancel"
@@ -240,7 +242,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"cancel"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
     </LinearLayout>
 </layout>

app/src/main/res/layout/dialog_update_user.xml

@@ -23,7 +23,7 @@
                 android:layout_weight="1"
                 app:i18nKey='@{"user_manage_user_detail_title"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <ImageView
                 android:id="@+id/close_iv"
@@ -36,7 +36,7 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/divider_line_space"
-            android:background="?attr/colorBlack" />
+            android:background="?attr/colorDivider" />
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
@@ -211,19 +211,21 @@
                 app:layout_constraintStart_toEndOf="@+id/status_tv"
                 app:layout_constraintTop_toTopOf="@+id/status_tv">
 
-                <RadioButton
+                <com.google.android.material.radiobutton.MaterialRadioButton
                     android:id="@+id/activate_rb"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     app:i18nKey='@{"user_manage_filter_activate"}'
+                    app:useMaterialThemeColors="true"
                     android:textSize="@dimen/iscs_text_md" />
 
-                <RadioButton
+                <com.google.android.material.radiobutton.MaterialRadioButton
                     android:id="@+id/deactivate_rb"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/iscs_space_3"
                     app:i18nKey='@{"user_manage_filter_deactivate"}'
+                    app:useMaterialThemeColors="true"
                     android:textSize="@dimen/iscs_text_md" />
             </RadioGroup>
         </androidx.constraintlayout.widget.ConstraintLayout>
@@ -248,7 +250,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"confirm"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <TextView
                 android:id="@+id/cancel"
@@ -263,7 +265,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"cancel"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
     </LinearLayout>
 </layout>

app/src/main/res/layout/dialog_update_workstation.xml

@@ -23,7 +23,7 @@
                 android:layout_weight="1"
                 app:i18nKey='@{"workstation_manage_workstation_name"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <ImageView
                 android:id="@+id/close_iv"
@@ -97,7 +97,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"confirm"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <TextView
                 android:id="@+id/cancel"
@@ -112,7 +112,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"cancel"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
     </LinearLayout>
 </layout>

app/src/main/res/layout/fragment_backup_and_restore.xml

@@ -34,7 +34,7 @@
                 android:layout_marginLeft="@dimen/iscs_space_3"
                 android:layout_weight="1"
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/normal_text_size_25"
+                android:textSize="@dimen/iscs_text_lg"
                 android:textStyle="bold"
                 app:i18nKey='@{"backup_title"}' />
 
@@ -52,7 +52,7 @@
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size"
+                android:textSize="@dimen/iscs_text_md"
                 app:i18nKey='@{"back"}' />
         </LinearLayout>
 
@@ -84,7 +84,7 @@
                         android:layout_gravity="center_vertical"
                         android:layout_marginLeft="@dimen/iscs_space_3"
                         android:textColor="?attr/colorTextPrimary"
-                        android:textSize="@dimen/normal_text_size_25"
+                        android:textSize="@dimen/iscs_text_lg"
                         android:textStyle="bold"
                         app:i18nKey='@{"backup"}' />
 
@@ -105,7 +105,7 @@
                         android:minHeight="@dimen/common_btn_height"
                         android:paddingHorizontal="@dimen/iscs_space_4"
                         android:textColor="?attr/colorTextPrimary"
-                        android:textSize="@dimen/common_btn_text_size"
+                        android:textSize="@dimen/iscs_text_md"
                         app:i18nKey='@{"backup_now"}' />
                 </LinearLayout>
 
@@ -208,21 +208,23 @@
                         app:layout_constraintStart_toEndOf="@+id/end_line"
                         app:layout_constraintTop_toTopOf="@+id/status_tv">
 
-                        <RadioButton
+                        <com.google.android.material.radiobutton.MaterialRadioButton
                             android:id="@+id/enable_rb"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="@dimen/iscs_space_3"
                             android:textSize="@dimen/iscs_text_md"
+                            app:useMaterialThemeColors="true"
                             android:textColor="?attr/colorTextPrimary"
                             app:i18nKey='@{"common_enable"}' />
 
-                        <RadioButton
+                        <com.google.android.material.radiobutton.MaterialRadioButton
                             android:id="@+id/disable_rb"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="@dimen/iscs_space_3"
                             android:textSize="@dimen/iscs_text_md"
+                            app:useMaterialThemeColors="true"
                             android:textColor="?attr/colorTextPrimary"
                             app:i18nKey='@{"common_disable"}' />
                     </RadioGroup>
@@ -317,7 +319,7 @@
                         android:minHeight="@dimen/common_btn_height"
                         android:paddingHorizontal="@dimen/iscs_space_4"
                         android:textColor="?attr/colorTextPrimary"
-                        android:textSize="@dimen/common_btn_text_size"
+                        android:textSize="@dimen/iscs_text_md"
                         app:i18nKey='@{"save"}'
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent" />
@@ -342,7 +344,7 @@
                         android:layout_gravity="center_vertical"
                         android:layout_marginLeft="@dimen/iscs_space_3"
                         android:textColor="?attr/colorTextPrimary"
-                        android:textSize="@dimen/normal_text_size_25"
+                        android:textSize="@dimen/iscs_text_lg"
                         android:textStyle="bold"
                         app:i18nKey='@{"restore"}' />
 
@@ -361,7 +363,7 @@
                         android:minHeight="@dimen/common_btn_height"
                         android:paddingHorizontal="@dimen/iscs_space_4"
                         android:textColor="?attr/colorTextPrimary"
-                        android:textSize="@dimen/common_btn_text_size"
+                        android:textSize="@dimen/iscs_text_md"
                         app:i18nKey='@{"common_batch_export"}' />
 
                     <TextView
@@ -376,7 +378,7 @@
                         android:minHeight="@dimen/common_btn_height"
                         android:paddingHorizontal="@dimen/iscs_space_4"
                         android:textColor="?attr/colorTextPrimary"
-                        android:textSize="@dimen/common_btn_text_size"
+                        android:textSize="@dimen/iscs_text_md"
                         app:i18nKey='@{"common_batch_delete"}' />
                 </LinearLayout>
 
@@ -392,7 +394,7 @@
                     android:layout_marginTop="@dimen/iscs_space_3"
                     android:background="@drawable/common_card_bg"
                     android:divider="@drawable/divider_table"
-                    android:paddingVertical="@dimen/iscs_space_3"
+                    android:paddingVertical="@dimen/iscs_space_1"
                     android:showDividers="middle">
 
                     <com.google.android.material.checkbox.MaterialCheckBox

app/src/main/res/layout/fragment_card_manage.xml

@@ -29,7 +29,7 @@
                 android:layout_weight="1"
                 app:i18nKey='@{"card_manage_title"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/normal_text_size_25"
+                android:textSize="@dimen/iscs_text_lg"
                 android:textStyle="bold" />
 
             <TextView
@@ -47,13 +47,13 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"back"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
 
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/divider_line_space"
-            android:background="?attr/colorBlack" />
+            android:background="?attr/colorDivider" />
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -72,7 +72,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"insert"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
 
             <TextView
@@ -84,7 +84,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"delete"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <TextView
                 android:id="@+id/reset"
@@ -95,7 +95,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"reset"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <View
                 android:layout_width="0dp"
@@ -111,7 +111,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"filter"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
 
         <LinearLayout

app/src/main/res/layout/fragment_create_job.xml

@@ -29,7 +29,7 @@
                 android:layout_weight="1"
                 app:i18nKey='@{"create_job_title"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/normal_text_size_25"
+                android:textSize="@dimen/iscs_text_lg"
                 android:textStyle="bold" />
 
             <TextView
@@ -47,13 +47,13 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"back"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
 
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/divider_line_space"
-            android:background="?attr/colorBlack" />
+            android:background="?attr/colorDivider" />
 
         <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
@@ -84,12 +84,12 @@
                         android:layout_weight="1"
                         app:i18nKey='@{"base_info_title"}'
                         android:textColor="?attr/colorTextPrimary"
-                        android:textSize="@dimen/normal_text_size_18" />
+                        android:textSize="@dimen/iscs_text_md" />
 
                     <View
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/divider_line_space"
-                        android:background="?attr/colorBlack" />
+                        android:background="?attr/colorDivider" />
 
 
                     <LinearLayout
@@ -216,7 +216,7 @@
                                 android:layout_weight="1"
                                 app:i18nKey='@{"workflow_mode"}'
                                 android:textColor="?attr/colorTextPrimary"
-                                android:textSize="@dimen/normal_text_size_18" />
+                                android:textSize="@dimen/iscs_text_md" />
 
                             <TextView
                                 android:id="@+id/workflow_mode_setting_tv"
@@ -227,13 +227,13 @@
                                 android:paddingHorizontal="@dimen/iscs_space_4"
                                 app:i18nKey='@{"settings"}'
                                 android:textColor="?attr/colorTextPrimary"
-                                android:textSize="@dimen/common_btn_text_size" />
+                                android:textSize="@dimen/iscs_text_md" />
                         </LinearLayout>
 
                         <View
                             android:layout_width="match_parent"
                             android:layout_height="@dimen/divider_line_space"
-                            android:background="?attr/colorBlack" />
+                            android:background="?attr/colorDivider" />
 
                         <FrameLayout
                             android:layout_width="match_parent"
@@ -256,8 +256,8 @@
                                 android:paddingHorizontal="@dimen/iscs_space_4"
                                 android:paddingVertical="@dimen/iscs_space_3"
                                 app:i18nKey='@{"please_select_workflow_mode"}'
-                                android:textColor="?attr/colorBlack50"
-                                android:textSize="@dimen/normal_text_size_18" />
+                                android:textColor="?attr/colorTextSecondary"
+                                android:textSize="@dimen/iscs_text_md" />
                         </FrameLayout>
                     </LinearLayout>
 
@@ -285,7 +285,7 @@
                                 android:layout_weight="1"
                                 app:i18nKey='@{"point_info_title"}'
                                 android:textColor="?attr/colorTextPrimary"
-                                android:textSize="@dimen/normal_text_size_18" />
+                                android:textSize="@dimen/iscs_text_md" />
 
                             <TextView
                                 android:id="@+id/select_point_tv"
@@ -296,13 +296,13 @@
                                 android:paddingHorizontal="@dimen/iscs_space_4"
                                 app:i18nKey='@{"select"}'
                                 android:textColor="?attr/colorTextPrimary"
-                                android:textSize="@dimen/common_btn_text_size" />
+                                android:textSize="@dimen/iscs_text_md" />
                         </LinearLayout>
 
                         <View
                             android:layout_width="match_parent"
                             android:layout_height="@dimen/divider_line_space"
-                            android:background="?attr/colorBlack" />
+                            android:background="?attr/colorDivider" />
 
                         <FrameLayout
                             android:layout_width="match_parent"
@@ -334,8 +334,8 @@
                                     android:paddingHorizontal="@dimen/iscs_space_4"
                                     android:paddingVertical="@dimen/iscs_space_3"
                                     app:i18nKey='@{"please_must_select_at_least_one_point"}'
-                                    android:textColor="?attr/colorBlack50"
-                                    android:textSize="@dimen/normal_text_size_18" />
+                                    android:textColor="?attr/colorTextSecondary"
+                                    android:textSize="@dimen/iscs_text_md" />
                             </LinearLayout>
                         </FrameLayout>
                     </LinearLayout>
@@ -364,7 +364,7 @@
                                 android:layout_weight="1"
                                 app:i18nKey='@{"member_info_title"}'
                                 android:textColor="?attr/colorTextPrimary"
-                                android:textSize="@dimen/normal_text_size_18" />
+                                android:textSize="@dimen/iscs_text_md" />
 
                             <TextView
                                 android:id="@+id/select_member_tv"
@@ -375,13 +375,13 @@
                                 android:paddingHorizontal="@dimen/iscs_space_4"
                                 app:i18nKey='@{"select"}'
                                 android:textColor="?attr/colorTextPrimary"
-                                android:textSize="@dimen/common_btn_text_size" />
+                                android:textSize="@dimen/iscs_text_md" />
                         </LinearLayout>
 
                         <View
                             android:layout_width="match_parent"
                             android:layout_height="@dimen/divider_line_space"
-                            android:background="?attr/colorBlack" />
+                            android:background="?attr/colorDivider" />
 
                         <FrameLayout
                             android:layout_width="match_parent"
@@ -409,12 +409,12 @@
                                         android:paddingVertical="@dimen/iscs_space_3"
                                         app:i18nKey='@{"locker"}'
                                         android:textColor="?attr/colorTextPrimary"
-                                        android:textSize="@dimen/normal_text_size_18" />
+                                        android:textSize="@dimen/iscs_text_md" />
 
                                     <View
                                         android:layout_width="match_parent"
                                         android:layout_height="@dimen/divider_line_space"
-                                        android:background="?attr/colorBlack" />
+                                        android:background="?attr/colorDivider" />
 
 
                                     <androidx.recyclerview.widget.RecyclerView
@@ -441,12 +441,12 @@
                                         android:paddingVertical="@dimen/iscs_space_3"
                                         app:i18nKey='@{"colocker"}'
                                         android:textColor="?attr/colorTextPrimary"
-                                        android:textSize="@dimen/normal_text_size_18" />
+                                        android:textSize="@dimen/iscs_text_md" />
 
                                     <View
                                         android:layout_width="match_parent"
                                         android:layout_height="@dimen/divider_line_space"
-                                        android:background="?attr/colorBlack" />
+                                        android:background="?attr/colorDivider" />
 
                                     <androidx.recyclerview.widget.RecyclerView
                                         android:id="@+id/colocker_rv"
@@ -476,8 +476,8 @@
                                     android:paddingHorizontal="@dimen/iscs_space_4"
                                     android:paddingVertical="@dimen/iscs_space_3"
                                     app:i18nKey='@{"please_select_member"}'
-                                    android:textColor="?attr/colorBlack50"
-                                    android:textSize="@dimen/normal_text_size_18" />
+                                    android:textColor="?attr/colorTextSecondary"
+                                    android:textSize="@dimen/iscs_text_md" />
                             </LinearLayout>
                         </FrameLayout>
                     </LinearLayout>
@@ -498,7 +498,7 @@
                 android:layout_marginLeft="@dimen/iscs_space_3"
                 app:i18nKey='@{"save_sop_check"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <View
                 android:layout_width="0dp"
@@ -518,7 +518,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"save_and_execute"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <TextView
                 android:id="@+id/save"
@@ -532,7 +532,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"save"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <TextView
                 android:id="@+id/cancel"
@@ -548,7 +548,7 @@
                 app:i18nKey='@{"cancel"}'
                 android:layout_marginRight="@dimen/iscs_space_4"
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
     </LinearLayout>
 </layout>

app/src/main/res/layout/fragment_create_sop.xml

@@ -29,7 +29,7 @@
                 android:layout_weight="1"
                 app:i18nKey='@{"create_sop_title"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/normal_text_size_25"
+                android:textSize="@dimen/iscs_text_lg"
                 android:textStyle="bold" />
 
             <TextView
@@ -47,13 +47,13 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"back"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
 
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/divider_line_space"
-            android:background="?attr/colorBlack" />
+            android:background="?attr/colorDivider" />
 
         <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
@@ -84,12 +84,12 @@
                         android:layout_weight="1"
                         app:i18nKey='@{"base_info_title"}'
                         android:textColor="?attr/colorTextPrimary"
-                        android:textSize="@dimen/normal_text_size_18" />
+                        android:textSize="@dimen/iscs_text_md" />
 
                     <View
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/divider_line_space"
-                        android:background="?attr/colorBlack" />
+                        android:background="?attr/colorDivider" />
 
 
                     <LinearLayout
@@ -216,7 +216,7 @@
                                 android:layout_weight="1"
                                 app:i18nKey='@{"workflow_mode"}'
                                 android:textColor="?attr/colorTextPrimary"
-                                android:textSize="@dimen/normal_text_size_18" />
+                                android:textSize="@dimen/iscs_text_md" />
 
                             <TextView
                                 android:id="@+id/workflow_mode_setting_tv"
@@ -229,13 +229,13 @@
                                 android:paddingHorizontal="@dimen/iscs_space_4"
                                 app:i18nKey='@{"settings"}'
                                 android:textColor="?attr/colorTextPrimary"
-                                android:textSize="@dimen/common_btn_text_size" />
+                                android:textSize="@dimen/iscs_text_md" />
                         </LinearLayout>
 
                         <View
                             android:layout_width="match_parent"
                             android:layout_height="@dimen/divider_line_space"
-                            android:background="?attr/colorBlack" />
+                            android:background="?attr/colorDivider" />
 
                         <FrameLayout
                             android:layout_width="match_parent"
@@ -259,7 +259,7 @@
                                 android:paddingVertical="@dimen/iscs_space_3"
                                 app:i18nKey='@{"please_select_workflow_mode"}'
                                 android:textColor="?attr/colorTextPrimary"
-                                android:textSize="@dimen/normal_text_size_18" />
+                                android:textSize="@dimen/iscs_text_md" />
                         </FrameLayout>
                     </LinearLayout>
 
@@ -287,7 +287,7 @@
                                 android:layout_weight="1"
                                 app:i18nKey='@{"point_info_title"}'
                                 android:textColor="?attr/colorTextPrimary"
-                                android:textSize="@dimen/normal_text_size_18" />
+                                android:textSize="@dimen/iscs_text_md" />
 
                             <TextView
                                 android:id="@+id/select_point_tv"
@@ -300,13 +300,13 @@
                                 android:paddingHorizontal="@dimen/iscs_space_4"
                                 app:i18nKey='@{"select"}'
                                 android:textColor="?attr/colorTextPrimary"
-                                android:textSize="@dimen/common_btn_text_size" />
+                                android:textSize="@dimen/iscs_text_md" />
                         </LinearLayout>
 
                         <View
                             android:layout_width="match_parent"
                             android:layout_height="@dimen/divider_line_space"
-                            android:background="?attr/colorBlack" />
+                            android:background="?attr/colorDivider" />
 
                         <FrameLayout
                             android:layout_width="match_parent"
@@ -338,8 +338,8 @@
                                     android:paddingHorizontal="@dimen/iscs_space_4"
                                     android:paddingVertical="@dimen/iscs_space_3"
                                     app:i18nKey='@{"please_must_select_at_least_one_point"}'
-                                    android:textColor="?attr/colorBlack50"
-                                    android:textSize="@dimen/normal_text_size_18" />
+                                    android:textColor="?attr/colorTextSecondary"
+                                    android:textSize="@dimen/iscs_text_md" />
                             </LinearLayout>
                         </FrameLayout>
 
@@ -370,7 +370,7 @@
                                 android:layout_weight="1"
                                 app:i18nKey='@{"member_info_title"}'
                                 android:textColor="?attr/colorTextPrimary"
-                                android:textSize="@dimen/normal_text_size_18" />
+                                android:textSize="@dimen/iscs_text_md" />
 
                             <TextView
                                 android:id="@+id/select_member_tv"
@@ -383,7 +383,7 @@
                                 android:paddingHorizontal="@dimen/iscs_space_4"
                                 app:i18nKey='@{"select"}'
                                 android:textColor="?attr/colorTextPrimary"
-                                android:textSize="@dimen/common_btn_text_size" />
+                                android:textSize="@dimen/iscs_text_md" />
                         </LinearLayout>
 
                         <View
@@ -417,7 +417,7 @@
                                         android:paddingVertical="@dimen/iscs_space_3"
                                         app:i18nKey='@{"locker"}'
                                         android:textColor="?attr/colorTextPrimary"
-                                        android:textSize="@dimen/normal_text_size_18" />
+                                        android:textSize="@dimen/iscs_text_md" />
 
                                     <View
                                         android:layout_width="match_parent"
@@ -449,7 +449,7 @@
                                         android:paddingVertical="@dimen/iscs_space_3"
                                         app:i18nKey='@{"colocker"}'
                                         android:textColor="?attr/colorTextPrimary"
-                                        android:textSize="@dimen/normal_text_size_18" />
+                                        android:textSize="@dimen/iscs_text_md" />
 
                                     <View
                                         android:layout_width="match_parent"
@@ -484,8 +484,8 @@
                                     android:paddingHorizontal="@dimen/iscs_space_4"
                                     android:paddingVertical="@dimen/iscs_space_3"
                                     app:i18nKey='@{"please_select_member"}'
-                                    android:textColor="?attr/colorBlack50"
-                                    android:textSize="@dimen/normal_text_size_18" />
+                                    android:textColor="?attr/colorTextSecondary"
+                                    android:textSize="@dimen/iscs_text_md" />
                             </LinearLayout>
                         </FrameLayout>
                     </LinearLayout>
@@ -515,7 +515,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"confirm"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <TextView
                 android:id="@+id/cancel"
@@ -530,7 +530,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"cancel"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
     </LinearLayout>
 </layout>

app/src/main/res/layout/fragment_create_sop_job.xml

@@ -29,7 +29,7 @@
                 android:layout_weight="1"
                 app:i18nKey='@{"create_sop_job_title"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/normal_text_size_25"
+                android:textSize="@dimen/iscs_text_lg"
                 android:textStyle="bold" />
 
             <TextView
@@ -47,13 +47,13 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"back"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
 
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/divider_line_space"
-            android:background="?attr/colorBlack" />
+            android:background="?attr/colorDivider" />
 
         <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
@@ -83,12 +83,12 @@
                         android:layout_marginLeft="@dimen/iscs_space_3"
                         app:i18nKey='@{"base_info_title"}'
                         android:textColor="?attr/colorTextPrimary"
-                        android:textSize="@dimen/normal_text_size_18" />
+                        android:textSize="@dimen/iscs_text_md" />
 
                     <View
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/divider_line_space"
-                        android:background="?attr/colorBlack" />
+                        android:background="?attr/colorDivider" />
 
                     <androidx.constraintlayout.widget.ConstraintLayout
                         android:layout_width="match_parent"
@@ -217,7 +217,7 @@
                                 android:layout_weight="1"
                                 app:i18nKey='@{"workflow_mode"}'
                                 android:textColor="?attr/colorTextPrimary"
-                                android:textSize="@dimen/normal_text_size_18" />
+                                android:textSize="@dimen/iscs_text_md" />
 
                             <TextView
                                 android:id="@+id/workflow_mode_setting_tv"
@@ -229,13 +229,13 @@
                                 android:paddingHorizontal="@dimen/iscs_space_4"
                                 app:i18nKey='@{"settings"}'
                                 android:textColor="?attr/colorTextPrimary"
-                                android:textSize="@dimen/common_btn_text_size" />
+                                android:textSize="@dimen/iscs_text_md" />
                         </LinearLayout>
 
                         <View
                             android:layout_width="match_parent"
                             android:layout_height="@dimen/divider_line_space"
-                            android:background="?attr/colorBlack" />
+                            android:background="?attr/colorDivider" />
 
                         <FrameLayout
                             android:layout_width="match_parent"
@@ -259,7 +259,7 @@
                                 android:paddingVertical="@dimen/iscs_space_3"
                                 app:i18nKey='@{"please_select_workflow_mode"}'
                                 android:textColor="?attr/colorTextPrimary"
-                                android:textSize="@dimen/normal_text_size_18" />
+                                android:textSize="@dimen/iscs_text_md" />
                         </FrameLayout>
                     </LinearLayout>
 
@@ -286,14 +286,14 @@
                                 android:layout_weight="1"
                                 app:i18nKey='@{"point_info_title"}'
                                 android:textColor="?attr/colorTextPrimary"
-                                android:textSize="@dimen/normal_text_size_18" />
+                                android:textSize="@dimen/iscs_text_md" />
 
                         </LinearLayout>
 
                         <View
                             android:layout_width="match_parent"
                             android:layout_height="@dimen/divider_line_space"
-                            android:background="?attr/colorBlack" />
+                            android:background="?attr/colorDivider" />
 
                         <FrameLayout
                             android:layout_width="match_parent"
@@ -321,7 +321,7 @@
                                     android:paddingVertical="@dimen/iscs_space_3"
                                     app:i18nKey='@{"show_points_when_selected_sop"}'
                                     android:textColor="?attr/colorTextPrimary"
-                                    android:textSize="@dimen/common_btn_text_size" />
+                                    android:textSize="@dimen/iscs_text_md" />
                             </LinearLayout>
                         </FrameLayout>
 
@@ -350,7 +350,7 @@
                                 android:layout_weight="1"
                                 app:i18nKey='@{"member_info_title"}'
                                 android:textColor="?attr/colorTextPrimary"
-                                android:textSize="@dimen/normal_text_size_18" />
+                                android:textSize="@dimen/iscs_text_md" />
 
                             <TextView
                                 android:id="@+id/select_member_tv"
@@ -362,13 +362,13 @@
                                 android:paddingHorizontal="@dimen/iscs_space_4"
                                 app:i18nKey='@{"select"}'
                                 android:textColor="?attr/colorTextPrimary"
-                                android:textSize="@dimen/common_btn_text_size" />
+                                android:textSize="@dimen/iscs_text_md" />
                         </LinearLayout>
 
                         <View
                             android:layout_width="match_parent"
                             android:layout_height="@dimen/divider_line_space"
-                            android:background="?attr/colorBlack" />
+                            android:background="?attr/colorDivider" />
 
                         <FrameLayout
                             android:layout_width="match_parent"
@@ -396,12 +396,12 @@
                                         android:paddingVertical="@dimen/iscs_space_3"
                                         app:i18nKey='@{"locker"}'
                                         android:textColor="?attr/colorTextPrimary"
-                                        android:textSize="@dimen/normal_text_size_18" />
+                                        android:textSize="@dimen/iscs_text_md" />
 
                                     <View
                                         android:layout_width="match_parent"
                                         android:layout_height="@dimen/divider_line_space"
-                                        android:background="?attr/colorBlack" />
+                                        android:background="?attr/colorDivider" />
 
 
                                     <androidx.recyclerview.widget.RecyclerView
@@ -428,12 +428,12 @@
                                         android:paddingVertical="@dimen/iscs_space_3"
                                         app:i18nKey='@{"colocker"}'
                                         android:textColor="?attr/colorTextPrimary"
-                                        android:textSize="@dimen/normal_text_size_18" />
+                                        android:textSize="@dimen/iscs_text_md" />
 
                                     <View
                                         android:layout_width="match_parent"
                                         android:layout_height="@dimen/divider_line_space"
-                                        android:background="?attr/colorBlack" />
+                                        android:background="?attr/colorDivider" />
 
                                     <androidx.recyclerview.widget.RecyclerView
                                         android:id="@+id/colocker_rv"
@@ -459,7 +459,7 @@
                                     android:paddingVertical="@dimen/iscs_space_3"
                                     app:i18nKey='@{"show_member_when_selected_sop"}'
                                     android:textColor="?attr/colorTextPrimary"
-                                    android:textSize="@dimen/common_btn_text_size" />
+                                    android:textSize="@dimen/iscs_text_md" />
                             </LinearLayout>
                         </FrameLayout>
                     </LinearLayout>
@@ -488,7 +488,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"save_and_execute"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <TextView
                 android:id="@+id/save"
@@ -502,7 +502,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"save"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <TextView
                 android:id="@+id/cancel"
@@ -518,7 +518,7 @@
                 app:i18nKey='@{"cancel"}'
                 android:layout_marginRight="@dimen/iscs_space_3"
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
     </LinearLayout>
 </layout>

app/src/main/res/layout/fragment_edit_job.xml

@@ -29,7 +29,7 @@
                 android:layout_weight="1"
                 app:i18nKey='@{"edit_job_title"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/normal_text_size_25"
+                android:textSize="@dimen/iscs_text_lg"
                 android:textStyle="bold" />
 
             <TextView
@@ -47,13 +47,13 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"back"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
 
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/divider_line_space"
-            android:background="?attr/colorBlack" />
+            android:background="?attr/colorDivider" />
 
         <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
@@ -84,12 +84,12 @@
                         android:layout_weight="1"
                         app:i18nKey='@{"base_info_title"}'
                         android:textColor="?attr/colorTextPrimary"
-                        android:textSize="@dimen/normal_text_size_18" />
+                        android:textSize="@dimen/iscs_text_md" />
 
                     <View
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/divider_line_space"
-                        android:background="?attr/colorBlack" />
+                        android:background="?attr/colorDivider" />
 
 
                     <LinearLayout
@@ -215,7 +215,7 @@
                                 android:layout_weight="1"
                                 app:i18nKey='@{"workflow_mode"}'
                                 android:textColor="?attr/colorTextPrimary"
-                                android:textSize="@dimen/normal_text_size_18" />
+                                android:textSize="@dimen/iscs_text_md" />
 
                             <TextView
                                 android:id="@+id/workflow_mode_setting_tv"
@@ -227,13 +227,13 @@
                                 android:paddingHorizontal="@dimen/iscs_space_4"
                                 app:i18nKey='@{"settings"}'
                                 android:textColor="?attr/colorTextPrimary"
-                                android:textSize="@dimen/common_btn_text_size" />
+                                android:textSize="@dimen/iscs_text_md" />
                         </LinearLayout>
 
                         <View
                             android:layout_width="match_parent"
                             android:layout_height="@dimen/divider_line_space"
-                            android:background="?attr/colorBlack" />
+                            android:background="?attr/colorDivider" />
 
                         <FrameLayout
                             android:layout_width="match_parent"
@@ -272,7 +272,7 @@
                                 android:layout_weight="1"
                                 app:i18nKey='@{"point_info_title"}'
                                 android:textColor="?attr/colorTextPrimary"
-                                android:textSize="@dimen/normal_text_size_18" />
+                                android:textSize="@dimen/iscs_text_md" />
 
                             <TextView
                                 android:id="@+id/select_point_tv"
@@ -284,13 +284,13 @@
                                 android:paddingHorizontal="@dimen/iscs_space_4"
                                 app:i18nKey='@{"select"}'
                                 android:textColor="?attr/colorTextPrimary"
-                                android:textSize="@dimen/common_btn_text_size" />
+                                android:textSize="@dimen/iscs_text_md" />
                         </LinearLayout>
 
                         <View
                             android:layout_width="match_parent"
                             android:layout_height="@dimen/divider_line_space"
-                            android:background="?attr/colorBlack" />
+                            android:background="?attr/colorDivider" />
 
                         <androidx.recyclerview.widget.RecyclerView
                             android:id="@+id/point_rv"
@@ -323,7 +323,7 @@
                                 android:layout_weight="1"
                                 app:i18nKey='@{"member_info_title"}'
                                 android:textColor="?attr/colorTextPrimary"
-                                android:textSize="@dimen/normal_text_size_18" />
+                                android:textSize="@dimen/iscs_text_md" />
 
                             <TextView
                                 android:id="@+id/select_member_tv"
@@ -335,13 +335,13 @@
                                 android:paddingHorizontal="@dimen/iscs_space_4"
                                 app:i18nKey='@{"select"}'
                                 android:textColor="?attr/colorTextPrimary"
-                                android:textSize="@dimen/common_btn_text_size" />
+                                android:textSize="@dimen/iscs_text_md" />
                         </LinearLayout>
 
                         <View
                             android:layout_width="match_parent"
                             android:layout_height="@dimen/divider_line_space"
-                            android:background="?attr/colorBlack" />
+                            android:background="?attr/colorDivider" />
 
 
                         <LinearLayout
@@ -366,12 +366,12 @@
                                     android:paddingVertical="@dimen/iscs_space_3"
                                     app:i18nKey='@{"locker"}'
                                     android:textColor="?attr/colorTextPrimary"
-                                    android:textSize="@dimen/normal_text_size_18" />
+                                    android:textSize="@dimen/iscs_text_md" />
 
                                 <View
                                     android:layout_width="match_parent"
                                     android:layout_height="@dimen/divider_line_space"
-                                    android:background="?attr/colorBlack" />
+                                    android:background="?attr/colorDivider" />
 
 
                                 <androidx.recyclerview.widget.RecyclerView
@@ -398,12 +398,12 @@
                                     android:paddingVertical="@dimen/iscs_space_3"
                                     app:i18nKey='@{"colocker"}'
                                     android:textColor="?attr/colorTextPrimary"
-                                    android:textSize="@dimen/normal_text_size_18" />
+                                    android:textSize="@dimen/iscs_text_md" />
 
                                 <View
                                     android:layout_width="match_parent"
                                     android:layout_height="@dimen/divider_line_space"
-                                    android:background="?attr/colorBlack" />
+                                    android:background="?attr/colorDivider" />
 
                                 <androidx.recyclerview.widget.RecyclerView
                                     android:id="@+id/colocker_rv"
@@ -427,6 +427,7 @@
             <View
                 android:layout_width="0dp"
                 android:layout_height="@dimen/divider_line_space"
+                android:background="?attr/colorDivider"
                 android:layout_weight="1" />
 
             <TextView
@@ -442,7 +443,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"save_and_execute"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <TextView
                 android:id="@+id/save"
@@ -456,7 +457,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"save"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <TextView
                 android:id="@+id/cancel"
@@ -472,7 +473,7 @@
                 app:i18nKey='@{"cancel"}'
                 android:layout_marginRight="@dimen/iscs_space_3"
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
     </LinearLayout>
 </layout>

app/src/main/res/layout/fragment_edit_sop.xml

@@ -29,7 +29,7 @@
                 android:layout_weight="1"
                 app:i18nKey='@{"edit_sop_title"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/normal_text_size_25"
+                android:textSize="@dimen/iscs_text_lg"
                 android:textStyle="bold" />
 
             <TextView
@@ -47,13 +47,13 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"back"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
 
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/divider_line_space"
-            android:background="?attr/colorBlack" />
+            android:background="?attr/colorDivider" />
 
         <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
@@ -84,12 +84,12 @@
                         android:layout_weight="1"
                         app:i18nKey='@{"base_info_title"}'
                         android:textColor="?attr/colorTextPrimary"
-                        android:textSize="@dimen/normal_text_size_18" />
+                        android:textSize="@dimen/iscs_text_md" />
 
                     <View
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/divider_line_space"
-                        android:background="?attr/colorBlack" />
+                        android:background="?attr/colorDivider" />
 
 
                     <LinearLayout
@@ -215,7 +215,7 @@
                                 android:layout_weight="1"
                                 app:i18nKey='@{"workflow_mode"}'
                                 android:textColor="?attr/colorTextPrimary"
-                                android:textSize="@dimen/normal_text_size_18" />
+                                android:textSize="@dimen/iscs_text_md" />
 
                             <TextView
                                 android:id="@+id/workflow_mode_setting_tv"
@@ -227,13 +227,13 @@
                                 android:paddingHorizontal="@dimen/iscs_space_4"
                                 app:i18nKey='@{"settings"}'
                                 android:textColor="?attr/colorTextPrimary"
-                                android:textSize="@dimen/common_btn_text_size" />
+                                android:textSize="@dimen/iscs_text_md" />
                         </LinearLayout>
 
                         <View
                             android:layout_width="match_parent"
                             android:layout_height="@dimen/divider_line_space"
-                            android:background="?attr/colorBlack" />
+                            android:background="?attr/colorDivider" />
 
                         <FrameLayout
                             android:layout_width="match_parent"
@@ -272,7 +272,7 @@
                                 android:layout_weight="1"
                                 app:i18nKey='@{"point_info_title"}'
                                 android:textColor="?attr/colorTextPrimary"
-                                android:textSize="@dimen/normal_text_size_18" />
+                                android:textSize="@dimen/iscs_text_md" />
 
                             <TextView
                                 android:id="@+id/select_point_tv"
@@ -284,13 +284,13 @@
                                 android:paddingHorizontal="@dimen/iscs_space_4"
                                 app:i18nKey='@{"select"}'
                                 android:textColor="?attr/colorTextPrimary"
-                                android:textSize="@dimen/common_btn_text_size" />
+                                android:textSize="@dimen/iscs_text_md" />
                         </LinearLayout>
 
                         <View
                             android:layout_width="match_parent"
                             android:layout_height="@dimen/divider_line_space"
-                            android:background="?attr/colorBlack" />
+                            android:background="?attr/colorDivider" />
 
 
                         <androidx.recyclerview.widget.RecyclerView
@@ -324,7 +324,7 @@
                                 android:layout_weight="1"
                                 app:i18nKey='@{"member_info_title"}'
                                 android:textColor="?attr/colorTextPrimary"
-                                android:textSize="@dimen/normal_text_size_18" />
+                                android:textSize="@dimen/iscs_text_md" />
 
                             <TextView
                                 android:id="@+id/select_member_tv"
@@ -336,13 +336,13 @@
                                 android:paddingHorizontal="@dimen/iscs_space_4"
                                 app:i18nKey='@{"select"}'
                                 android:textColor="?attr/colorTextPrimary"
-                                android:textSize="@dimen/common_btn_text_size" />
+                                android:textSize="@dimen/iscs_text_md" />
                         </LinearLayout>
 
                         <View
                             android:layout_width="match_parent"
                             android:layout_height="@dimen/divider_line_space"
-                            android:background="?attr/colorBlack" />
+                            android:background="?attr/colorDivider" />
 
                         <LinearLayout
                             android:layout_width="match_parent"
@@ -366,12 +366,12 @@
                                     android:paddingVertical="@dimen/iscs_space_3"
                                     app:i18nKey='@{"locker"}'
                                     android:textColor="?attr/colorTextPrimary"
-                                    android:textSize="@dimen/normal_text_size_18" />
+                                    android:textSize="@dimen/iscs_text_md" />
 
                                 <View
                                     android:layout_width="match_parent"
                                     android:layout_height="@dimen/divider_line_space"
-                                    android:background="?attr/colorBlack" />
+                                    android:background="?attr/colorDivider" />
 
 
                                 <androidx.recyclerview.widget.RecyclerView
@@ -398,12 +398,12 @@
                                     android:paddingVertical="@dimen/iscs_space_3"
                                     app:i18nKey='@{"colocker"}'
                                     android:textColor="?attr/colorTextPrimary"
-                                    android:textSize="@dimen/normal_text_size_18" />
+                                    android:textSize="@dimen/iscs_text_md" />
 
                                 <View
                                     android:layout_width="match_parent"
                                     android:layout_height="@dimen/divider_line_space"
-                                    android:background="?attr/colorBlack" />
+                                    android:background="?attr/colorDivider" />
 
                                 <androidx.recyclerview.widget.RecyclerView
                                     android:id="@+id/colocker_rv"
@@ -438,7 +438,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"confirm"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <TextView
                 android:id="@+id/cancel"
@@ -453,7 +453,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"cancel"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
     </LinearLayout>
 </layout>

app/src/main/res/layout/fragment_edit_sop_job.xml

@@ -29,7 +29,7 @@
                 android:layout_weight="1"
                 app:i18nKey='@{"edit_sop_job_title"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/normal_text_size_25"
+                android:textSize="@dimen/iscs_text_lg"
                 android:textStyle="bold" />
 
             <TextView
@@ -47,13 +47,13 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"back"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
 
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/divider_line_space"
-            android:background="?attr/colorBlack" />
+            android:background="?attr/colorDivider" />
 
         <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
@@ -84,12 +84,12 @@
                         android:layout_weight="1"
                         app:i18nKey='@{"base_info_title"}'
                         android:textColor="?attr/colorTextPrimary"
-                        android:textSize="@dimen/normal_text_size_18" />
+                        android:textSize="@dimen/iscs_text_md" />
 
                     <View
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/divider_line_space"
-                        android:background="?attr/colorBlack" />
+                        android:background="?attr/colorDivider" />
 
 
                     <androidx.constraintlayout.widget.ConstraintLayout
@@ -218,7 +218,7 @@
                                 android:layout_weight="1"
                                 app:i18nKey='@{"workflow_mode"}'
                                 android:textColor="?attr/colorTextPrimary"
-                                android:textSize="@dimen/normal_text_size_18" />
+                                android:textSize="@dimen/iscs_text_md" />
 
                             <TextView
                                 android:id="@+id/workflow_mode_setting_tv"
@@ -230,7 +230,7 @@
                                 android:paddingHorizontal="@dimen/iscs_space_4"
                                 app:i18nKey='@{"settings"}'
                                 android:textColor="?attr/colorTextPrimary"
-                                android:textSize="@dimen/common_btn_text_size" />
+                                android:textSize="@dimen/iscs_text_md" />
                         </LinearLayout>
 
                         <View
@@ -275,7 +275,7 @@
                                 android:layout_weight="1"
                                 app:i18nKey='@{"point_info_title"}'
                                 android:textColor="?attr/colorTextPrimary"
-                                android:textSize="@dimen/normal_text_size_18" />
+                                android:textSize="@dimen/iscs_text_md" />
 
                         </LinearLayout>
 
@@ -315,7 +315,7 @@
                                 android:layout_weight="1"
                                 app:i18nKey='@{"member_info_title"}'
                                 android:textColor="?attr/colorTextPrimary"
-                                android:textSize="@dimen/normal_text_size_18" />
+                                android:textSize="@dimen/iscs_text_md" />
 
                             <TextView
                                 android:id="@+id/select_member_tv"
@@ -327,7 +327,7 @@
                                 android:paddingHorizontal="@dimen/iscs_space_4"
                                 app:i18nKey='@{"select"}'
                                 android:textColor="?attr/colorTextPrimary"
-                                android:textSize="@dimen/common_btn_text_size" />
+                                android:textSize="@dimen/iscs_text_md" />
                         </LinearLayout>
 
                         <View
@@ -357,7 +357,7 @@
                                     android:paddingVertical="@dimen/iscs_space_3"
                                     app:i18nKey='@{"locker"}'
                                     android:textColor="?attr/colorTextPrimary"
-                                    android:textSize="@dimen/normal_text_size_18" />
+                                    android:textSize="@dimen/iscs_text_md" />
 
                                 <View
                                     android:layout_width="match_parent"
@@ -389,7 +389,7 @@
                                     android:paddingVertical="@dimen/iscs_space_3"
                                     app:i18nKey='@{"colocker"}'
                                     android:textColor="?attr/colorTextPrimary"
-                                    android:textSize="@dimen/normal_text_size_18" />
+                                    android:textSize="@dimen/iscs_text_md" />
 
                                 <View
                                     android:layout_width="match_parent"
@@ -428,7 +428,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"save_and_execute"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <TextView
                 android:id="@+id/save"
@@ -442,7 +442,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"save"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <TextView
                 android:id="@+id/cancel"
@@ -458,7 +458,7 @@
                 app:i18nKey='@{"cancel"}'
                 android:layout_marginRight="@dimen/iscs_space_3"
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
     </LinearLayout>
 </layout>

app/src/main/res/layout/fragment_exception_detail.xml

@@ -31,7 +31,7 @@
                 android:layout_weight="1"
                 app:i18nKey='@{"exception_detail_title"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/normal_text_size_25"
+                android:textSize="@dimen/iscs_text_lg"
                 android:textStyle="bold" />
 
             <TextView
@@ -49,7 +49,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"back"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
 
         <View
@@ -176,7 +176,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"cancel_exception"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size"
+                android:textSize="@dimen/iscs_text_md"
                 android:visibility="gone" />
 
             <TextView
@@ -191,7 +191,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"handle_exception"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size"
+                android:textSize="@dimen/iscs_text_md"
                 android:visibility="gone" />
         </LinearLayout>
     </LinearLayout>

app/src/main/res/layout/fragment_exception_job.xml

@@ -33,7 +33,7 @@
                 android:layout_weight="1"
                 app:i18nKey='@{"exception_job_title"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/normal_text_size_25"
+                android:textSize="@dimen/iscs_text_lg"
                 android:textStyle="bold" />
 
             <TextView
@@ -51,7 +51,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"back"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
 
         <View
@@ -441,7 +441,7 @@
                         app:i18nKey='@{"cancel_exception"}'
                         android:visibility="gone"
                         android:textColor="?attr/colorTextPrimary"
-                        android:textSize="@dimen/common_btn_text_size" />
+                        android:textSize="@dimen/iscs_text_md" />
 
                     <TextView
                         android:id="@+id/handle_exception"
@@ -457,7 +457,7 @@
                         app:i18nKey='@{"handle_exception"}'
                         android:visibility="gone"
                         android:textColor="?attr/colorTextPrimary"
-                        android:textSize="@dimen/common_btn_text_size" />
+                        android:textSize="@dimen/iscs_text_md" />
 
                 </LinearLayout>
             </LinearLayout>

app/src/main/res/layout/fragment_exception_job_manage.xml

@@ -29,7 +29,7 @@
                 android:layout_weight="1"
                 app:i18nKey='@{"exception_job_title"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/normal_text_size_25"
+                android:textSize="@dimen/iscs_text_lg"
                 android:textStyle="bold" />
 
             <TextView
@@ -47,13 +47,13 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"back"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
 
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/divider_line_space"
-            android:background="?attr/colorBlack" />
+            android:background="?attr/colorDivider" />
 
         <LinearLayout
             android:layout_width="match_parent"

app/src/main/res/layout/fragment_exception_manage.xml

@@ -30,7 +30,7 @@
                 android:layout_weight="1"
                 app:i18nKey='@{"exception_manage_title"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/normal_text_size_25"
+                android:textSize="@dimen/iscs_text_lg"
                 android:textStyle="bold" />
 
             <TextView
@@ -48,7 +48,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"back"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
 
         <View
@@ -73,7 +73,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"one_key_handle"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
 
             <TextView
@@ -85,7 +85,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"one_key_cancel"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
 
         <LinearLayout

app/src/main/res/layout/fragment_exception_report.xml

@@ -30,7 +30,7 @@
                 android:layout_weight="1"
                 app:i18nKey='@{"exception_report"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/normal_text_size_25"
+                android:textSize="@dimen/iscs_text_lg"
                 android:textStyle="bold" />
 
             <TextView
@@ -48,7 +48,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"back"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
 
         <View
@@ -74,7 +74,7 @@
                 android:paddingVertical="@dimen/iscs_space_1"
                 app:i18nKey='@{"exception_info"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/normal_text_size_18" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <View
                 android:layout_width="match_parent"
@@ -238,7 +238,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"confirm"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <TextView
                 android:id="@+id/cancel"
@@ -253,7 +253,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"cancel"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
     </LinearLayout>
 </layout>

app/src/main/res/layout/fragment_home.xml

@@ -78,7 +78,7 @@
                         android:paddingVertical="@dimen/iscs_space_1"
                         android:paddingLeft="@dimen/iscs_space_3"
                         android:textColor="?attr/colorTextPrimary"
-                        android:textSize="@dimen/normal_text_size_18"
+                        android:textSize="@dimen/iscs_text_md"
                         app:i18nKey='@{"home_realtime_data_title"}' />
 
                     <LinearLayout
@@ -183,7 +183,7 @@
                                 android:gravity="center"
                                 android:padding="@dimen/iscs_space_3"
                                 android:textColor="?attr/colorTextPrimary"
-                                android:textSize="@dimen/iscs_text_h1"
+                                android:textSize="@dimen/iscs_text_h2"
                                 android:textStyle="bold"
                                 tools:text="80" />
                         </LinearLayout>
@@ -216,7 +216,7 @@
                                 android:gravity="center"
                                 android:padding="@dimen/iscs_space_3"
                                 android:textColor="?attr/colorTextPrimary"
-                                android:textSize="@dimen/iscs_text_h1"
+                                android:textSize="@dimen/iscs_text_h2"
                                 android:textStyle="bold" />
                         </LinearLayout>
 
@@ -248,7 +248,7 @@
                                 android:gravity="center"
                                 android:padding="@dimen/iscs_space_3"
                                 android:textColor="?attr/colorTextPrimary"
-                                android:textSize="@dimen/iscs_text_h1"
+                                android:textSize="@dimen/iscs_text_h2"
                                 android:textStyle="bold" />
                         </LinearLayout>
                     </LinearLayout>
@@ -268,7 +268,7 @@
                         android:paddingVertical="@dimen/iscs_space_1"
                         android:paddingLeft="@dimen/iscs_space_3"
                         android:textColor="?attr/colorTextPrimary"
-                        android:textSize="@dimen/normal_text_size_18"
+                        android:textSize="@dimen/iscs_text_md"
                         app:i18nKey='@{"home_overview_data_title"}' />
 
                     <LinearLayout
@@ -395,7 +395,7 @@
                                 android:gravity="center"
                                 android:padding="@dimen/iscs_space_3"
                                 android:textColor="?attr/colorTextPrimary"
-                                android:textSize="@dimen/iscs_text_h1"
+                                android:textSize="@dimen/iscs_text_h2"
                                 android:textStyle="bold" />
                         </LinearLayout>
 
@@ -427,7 +427,7 @@
                                 android:gravity="center"
                                 android:padding="@dimen/iscs_space_3"
                                 android:textColor="?attr/colorTextPrimary"
-                                android:textSize="@dimen/iscs_text_h1"
+                                android:textSize="@dimen/iscs_text_h2"
                                 android:textStyle="bold" />
                         </LinearLayout>
 
@@ -459,7 +459,7 @@
                                 android:gravity="center"
                                 android:padding="@dimen/iscs_space_3"
                                 android:textColor="?attr/colorTextPrimary"
-                                android:textSize="@dimen/iscs_text_h1"
+                                android:textSize="@dimen/iscs_text_h2"
                                 android:textStyle="bold" />
                         </LinearLayout>
                     </LinearLayout>

app/src/main/res/layout/fragment_in_progress_job_manage.xml

@@ -29,7 +29,7 @@
                 android:layout_weight="1"
                 app:i18nKey='@{"in_progress_job_manage_title"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/normal_text_size_25"
+                android:textSize="@dimen/iscs_text_lg"
                 android:textStyle="bold" />
 
             <TextView
@@ -47,13 +47,13 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"back"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
 
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/divider_line_space"
-            android:background="?attr/colorBlack" />
+            android:background="?attr/colorDivider" />
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -71,6 +71,7 @@
                 android:gravity="center"
                 android:paddingVertical="@dimen/iscs_space_3"
                 app:i18nKey='@{"job_name"}'
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md" />
 
             <TextView
@@ -79,6 +80,7 @@
                 android:layout_weight="1"
                 android:gravity="center"
                 app:i18nKey='@{"status"}'
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md" />
 
             <TextView
@@ -87,6 +89,7 @@
                 android:layout_weight="1"
                 android:gravity="center"
                 app:i18nKey='@{"detail"}'
+                android:textColor="?attr/colorTextPrimary"
                 android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
 

app/src/main/res/layout/fragment_init_card_registration.xml

@@ -33,7 +33,7 @@
                 android:gravity="center"
                 app:i18nKey='@{"init_card_registration_step"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/normal_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <TextView
                 android:id="@+id/step_tip"
@@ -42,7 +42,7 @@
                 android:layout_marginLeft="@dimen/iscs_space_3"
                 app:i18nKey='@{"init_card_registration_step_tip"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_text_size_big" />
+                android:textSize="@dimen/iscs_text_xl" />
         </LinearLayout>
 
         <TextView
@@ -110,7 +110,7 @@
             android:paddingHorizontal="@dimen/iscs_space_4"
             app:i18nKey='@{"previous"}'
             android:textColor="?attr/colorTextPrimary"
-            android:textSize="@dimen/common_btn_text_size"
+            android:textSize="@dimen/iscs_text_md"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/btn_space" />
 
@@ -133,7 +133,7 @@
             android:paddingHorizontal="@dimen/iscs_space_4"
             app:i18nKey='@{"next"}'
             android:textColor="?attr/colorTextPrimary"
-            android:textSize="@dimen/common_btn_text_size"
+            android:textSize="@dimen/iscs_text_md"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toEndOf="@+id/btn_space" />
 
@@ -148,7 +148,7 @@
             android:paddingHorizontal="@dimen/iscs_space_4"
             app:i18nKey='@{"ski_step"}'
             android:textColor="?attr/colorTextPrimary"
-            android:textSize="@dimen/common_btn_text_size"
+            android:textSize="@dimen/iscs_text_md"
             app:layout_constraintEnd_toEndOf="@+id/next_btn"
             app:layout_constraintStart_toStartOf="@+id/previous_btn"
             app:layout_constraintTop_toBottomOf="@+id/next_btn" />

app/src/main/res/layout/fragment_init_device_registration_key_and_lock.xml

@@ -26,7 +26,7 @@
                 android:gravity="center"
                 app:i18nKey='@{"init_device_registration_key_and_lock_step"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/normal_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <TextView
                 android:id="@+id/step_tip"
@@ -35,7 +35,7 @@
                 android:layout_marginLeft="@dimen/iscs_space_3"
                 app:i18nKey='@{"init_device_registration_key_and_lock_step_tip"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_text_size_big" />
+                android:textSize="@dimen/iscs_text_xl" />
         </LinearLayout>
 
         <TextView
@@ -91,7 +91,7 @@
             android:paddingHorizontal="@dimen/iscs_space_4"
             app:i18nKey='@{"previous"}'
             android:textColor="?attr/colorTextPrimary"
-            android:textSize="@dimen/common_btn_text_size"
+            android:textSize="@dimen/iscs_text_md"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/btn_space" />
 
@@ -114,7 +114,7 @@
             android:paddingHorizontal="@dimen/iscs_space_4"
             app:i18nKey='@{"next"}'
             android:textColor="?attr/colorTextPrimary"
-            android:textSize="@dimen/common_btn_text_size"
+            android:textSize="@dimen/iscs_text_md"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toEndOf="@+id/btn_space" />
 
@@ -129,7 +129,7 @@
             android:paddingHorizontal="@dimen/iscs_space_4"
             app:i18nKey='@{"re_recognize"}'
             android:textColor="?attr/colorTextPrimary"
-            android:textSize="@dimen/common_btn_text_size"
+            android:textSize="@dimen/iscs_text_md"
             android:visibility="gone"
             app:layout_constraintEnd_toEndOf="@+id/next_btn"
             app:layout_constraintStart_toStartOf="@+id/previous_btn"

app/src/main/res/layout/fragment_init_point_rfid_registration.xml

@@ -33,7 +33,7 @@
                 android:gravity="center"
                 app:i18nKey='@{"init_point_rfid_registration_step"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/normal_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <TextView
                 android:id="@+id/step_tip"
@@ -42,7 +42,7 @@
                 android:layout_marginLeft="@dimen/iscs_space_3"
                 app:i18nKey='@{"init_point_rfid_registration_step_tip"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_text_size_big" />
+                android:textSize="@dimen/iscs_text_xl" />
         </LinearLayout>
 
         <TextView
@@ -110,7 +110,7 @@
             android:paddingHorizontal="@dimen/iscs_space_4"
             app:i18nKey='@{"previous"}'
             android:textColor="?attr/colorTextPrimary"
-            android:textSize="@dimen/common_btn_text_size"
+            android:textSize="@dimen/iscs_text_md"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/btn_space" />
 
@@ -133,7 +133,7 @@
             android:paddingHorizontal="@dimen/iscs_space_4"
             app:i18nKey='@{"next"}'
             android:textColor="?attr/colorTextPrimary"
-            android:textSize="@dimen/common_btn_text_size"
+            android:textSize="@dimen/iscs_text_md"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toEndOf="@+id/btn_space" />
 
@@ -148,7 +148,7 @@
             android:paddingHorizontal="@dimen/iscs_space_4"
             app:i18nKey='@{"skip_and_complete"}'
             android:textColor="?attr/colorTextPrimary"
-            android:textSize="@dimen/common_btn_text_size"
+            android:textSize="@dimen/iscs_text_md"
             app:layout_constraintEnd_toEndOf="@+id/next_btn"
             app:layout_constraintStart_toStartOf="@+id/previous_btn"
             app:layout_constraintTop_toBottomOf="@+id/next_btn" />

app/src/main/res/layout/fragment_init_set_admin_account.xml

@@ -27,7 +27,7 @@
                 android:gravity="center"
                 app:i18nKey='@{"init_set_admin_account_step"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/normal_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <TextView
                 android:id="@+id/step_tip"
@@ -36,7 +36,7 @@
                 android:layout_marginLeft="@dimen/iscs_space_3"
                 app:i18nKey='@{"init_set_admin_account_step_tip"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_text_size_big" />
+                android:textSize="@dimen/iscs_text_xl" />
         </LinearLayout>
 
         <TextView
@@ -176,7 +176,7 @@
             android:paddingHorizontal="@dimen/iscs_space_4"
             app:i18nKey='@{"previous"}'
             android:textColor="?attr/colorTextPrimary"
-            android:textSize="@dimen/common_btn_text_size"
+            android:textSize="@dimen/iscs_text_md"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/btn_space" />
 
@@ -199,7 +199,7 @@
             android:paddingHorizontal="@dimen/iscs_space_4"
             app:i18nKey='@{"next"}'
             android:textColor="?attr/colorTextPrimary"
-            android:textSize="@dimen/common_btn_text_size"
+            android:textSize="@dimen/iscs_text_md"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toEndOf="@+id/btn_space" />
     </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/fragment_init_set_remote_server.xml

@@ -26,7 +26,7 @@
                 android:gravity="center"
                 app:i18nKey='@{"init_set_remote_server_step"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/normal_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <TextView
                 android:id="@+id/step_tip"
@@ -35,7 +35,7 @@
                 android:layout_marginLeft="@dimen/iscs_space_3"
                 app:i18nKey='@{"init_set_remote_server_step_tip"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_text_size_big" />
+                android:textSize="@dimen/iscs_text_xl" />
         </LinearLayout>
 
         <TextView
@@ -103,7 +103,7 @@
             android:paddingHorizontal="@dimen/iscs_space_4"
             app:i18nKey='@{"confirm"}'
             android:textColor="?attr/colorTextPrimary"
-            android:textSize="@dimen/common_btn_text_size"
+            android:textSize="@dimen/iscs_text_md"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/btn_space"
             app:layout_constraintStart_toStartOf="parent" />
@@ -127,7 +127,7 @@
             android:paddingHorizontal="@dimen/iscs_space_4"
             app:i18nKey='@{"change_to_standard"}'
             android:textColor="?attr/colorTextPrimary"
-            android:textSize="@dimen/common_btn_text_size"
+            android:textSize="@dimen/iscs_text_md"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/btn_space" />

app/src/main/res/layout/fragment_init_welcome.xml

@@ -15,7 +15,7 @@
             android:layout_marginTop="@dimen/init_margin_space"
             app:i18nKey='@{"welcome_tip"}'
             android:textColor="?attr/colorTextPrimary"
-            android:textSize="@dimen/login_sub_title_text_size"
+            android:textSize="@dimen/iscs_text_h1"
             android:textStyle="bold" />
 
         <TextView
@@ -28,7 +28,7 @@
             android:layout_marginTop="@dimen/common_margin_spacing_big"
             app:i18nKey='@{"loto"}'
             android:textColor="?attr/colorTextPrimary"
-            android:textSize="@dimen/login_main_title_text_size"
+            android:textSize="@dimen/iscs_text_h1"
             android:textStyle="bold" />
 
         <TextView
@@ -41,7 +41,7 @@
             android:layout_marginTop="@dimen/login_sub_title_margin_top"
             app:i18nKey='@{"loto_en"}'
             android:textColor="?attr/colorTextPrimary"
-            android:textSize="@dimen/login_sub_title_text_size"
+            android:textSize="@dimen/iscs_text_h2"
             android:textStyle="bold" />
 
 
@@ -52,7 +52,7 @@
             android:layout_above="@+id/start_btn"
             android:layout_centerHorizontal="true"
             android:layout_marginBottom="@dimen/iscs_space_4"
-            android:textSize="@dimen/common_btn_text_size"
+            android:textSize="@dimen/iscs_text_md"
             app:i18nKey='@{"start_tip"}' />
 
         <TextView
@@ -66,6 +66,6 @@
             android:paddingHorizontal="@dimen/iscs_space_4"
             app:i18nKey='@{"start"}'
             android:textColor="?attr/colorTextPrimary"
-            android:textSize="@dimen/common_btn_text_size" />
+            android:textSize="@dimen/iscs_text_md" />
     </RelativeLayout>
 </layout>

app/src/main/res/layout/fragment_job_execute.xml

@@ -31,7 +31,7 @@
                 android:layout_weight="1"
                 app:i18nKey='@{"job_execute_title"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/normal_text_size_25"
+                android:textSize="@dimen/iscs_text_lg"
                 android:textStyle="bold" />
 
             <TextView
@@ -49,13 +49,13 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"back"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
 
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/divider_line_space"
-            android:background="?attr/colorBlack" />
+            android:background="?attr/colorDivider" />
 
         <FrameLayout
             android:id="@+id/full_screen_root_layout"
@@ -393,7 +393,7 @@
                         android:paddingHorizontal="@dimen/iscs_space_3"
                         app:i18nKey='@{"go_locking"}'
                         android:textColor="?attr/colorTextPrimary"
-                        android:textSize="@dimen/common_btn_text_size"
+                        android:textSize="@dimen/iscs_text_md"
                         android:visibility="gone" />
 
                     <TextView
@@ -410,7 +410,7 @@
                         android:paddingHorizontal="@dimen/iscs_space_3"
                         app:i18nKey='@{"go_unlocking"}'
                         android:textColor="?attr/colorTextPrimary"
-                        android:textSize="@dimen/common_btn_text_size"
+                        android:textSize="@dimen/iscs_text_md"
                         android:visibility="gone" />
 
                     <TextView
@@ -427,7 +427,7 @@
                         android:paddingHorizontal="@dimen/iscs_space_3"
                         app:i18nKey='@{"cancel_job"}'
                         android:textColor="?attr/colorTextPrimary"
-                        android:textSize="@dimen/common_btn_text_size"
+                        android:textSize="@dimen/iscs_text_md"
                         android:visibility="gone" />
 
                     <TextView
@@ -444,7 +444,7 @@
                         android:paddingHorizontal="@dimen/iscs_space_3"
                         app:i18nKey='@{"finish_the_job"}'
                         android:textColor="?attr/colorTextPrimary"
-                        android:textSize="@dimen/common_btn_text_size"
+                        android:textSize="@dimen/iscs_text_md"
                         android:visibility="gone" />
                 </LinearLayout>
             </LinearLayout>

app/src/main/res/layout/fragment_job_manage.xml

@@ -29,7 +29,7 @@
                 android:layout_weight="1"
                 app:i18nKey='@{"job_manage_title"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/normal_text_size_25"
+                android:textSize="@dimen/iscs_text_lg"
                 android:textStyle="bold" />
 
             <TextView
@@ -47,13 +47,13 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"back"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
 
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/divider_line_space"
-            android:background="?attr/colorBlack" />
+            android:background="?attr/colorDivider" />
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -71,7 +71,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"delete"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
 
         <LinearLayout

app/src/main/res/layout/fragment_key_manage.xml

@@ -29,7 +29,7 @@
                 android:layout_weight="1"
                 app:i18nKey='@{"key_manage_title"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/normal_text_size_25"
+                android:textSize="@dimen/iscs_text_lg"
                 android:textStyle="bold" />
 
             <TextView
@@ -47,13 +47,13 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"back"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
 
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/divider_line_space"
-            android:background="?attr/colorBlack" />
+            android:background="?attr/colorDivider" />
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -72,7 +72,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"insert"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
 
             <TextView
@@ -84,7 +84,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"delete"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <TextView
                 android:id="@+id/reset"
@@ -95,7 +95,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"reset"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <View
                 android:layout_width="0dp"
@@ -111,7 +111,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"filter"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
 
         <LinearLayout

app/src/main/res/layout/fragment_lock_manage.xml

@@ -30,7 +30,7 @@
                 app:i18nKey='@{"lock_manage_title"}'
                 android:textStyle="bold"
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/normal_text_size_25" />
+                android:textSize="@dimen/iscs_text_lg" />
 
             <TextView
                 android:id="@+id/back"
@@ -47,7 +47,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"back"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
 
         <View
@@ -72,7 +72,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"insert"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
 
             <TextView
@@ -84,7 +84,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"delete"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <TextView
                 android:id="@+id/reset"
@@ -95,7 +95,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"reset"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <View
                 android:layout_width="0dp"
@@ -111,7 +111,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"filter"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
 
         <LinearLayout

app/src/main/res/layout/fragment_locked_point.xml

@@ -29,7 +29,7 @@
                 android:layout_weight="1"
                 app:i18nKey='@{"locked_points_title"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/normal_text_size_25"
+                android:textSize="@dimen/iscs_text_lg"
                 android:textStyle="bold" />
 
             <TextView
@@ -47,13 +47,13 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"back"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
 
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/divider_line_space"
-            android:background="?attr/colorBlack" />
+            android:background="?attr/colorDivider" />
 
         <LinearLayout
             android:layout_width="match_parent"

app/src/main/res/layout/fragment_my_todo_list.xml

@@ -27,10 +27,10 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/iscs_space_3"
                 android:layout_weight="1"
-                app:i18nKey='@{"my_todo_title"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/normal_text_size_25"
-                android:textStyle="bold" />
+                android:textSize="@dimen/iscs_text_lg"
+                android:textStyle="bold"
+                app:i18nKey='@{"my_todo_title"}' />
 
             <TextView
                 android:id="@+id/back"
@@ -40,20 +40,20 @@
                 android:layout_marginLeft="@dimen/iscs_space_3"
                 android:background="@drawable/common_btn_secondary"
                 android:drawableLeft="@mipmap/icon_back"
-                android:drawableTint="?attr/colorPrimary"
                 android:drawablePadding="@dimen/iscs_space_3"
+                android:drawableTint="?attr/colorPrimary"
                 android:gravity="center"
                 android:minHeight="@dimen/common_btn_height"
                 android:paddingHorizontal="@dimen/iscs_space_4"
-                app:i18nKey='@{"back"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md"
+                app:i18nKey='@{"back"}' />
         </LinearLayout>
 
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/divider_line_space"
-            android:background="?attr/colorBlack" />
+            android:background="?attr/colorDivider" />
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -65,13 +65,16 @@
                 android:id="@+id/tabLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@drawable/card_white_bg"
-                android:elevation="4dp"
-                android:paddingVertical="@dimen/iscs_space_3"
+                android:background="@drawable/bg_tabbar"
+                android:paddingVertical="@dimen/iscs_space_1"
                 app:tabGravity="fill"
-                app:tabMaxWidth="0dp"
+                app:tabIndicator="@drawable/tab_indicator"
+                app:tabIndicatorAnimationMode="elastic"
+                app:tabIndicatorFullWidth="false"
                 app:tabMode="fixed"
-                app:tabTextAppearance="@style/TabTextStyle" />
+                app:tabRippleColor="?attr/rippleColor"
+                app:tabTextColor="@color/tab_text_color" />
+
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/handle_time_layout"
@@ -83,12 +86,12 @@
                     android:id="@+id/handle_time_tv"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    app:i18nKey='@{"handle_time"}'
+                    android:layout_marginTop="@dimen/iscs_space_3"
                     android:textColor="?attr/colorTextPrimary"
                     android:textSize="@dimen/iscs_text_md"
-                    android:layout_marginTop="@dimen/iscs_space_3"
-                    app:layout_constraintTop_toTopOf="parent"
+                    app:i18nKey='@{"handle_time"}'
                     app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
                     app:markPosition="end"
                     app:required="false" />
 
@@ -99,14 +102,15 @@
                     android:layout_marginLeft="@dimen/iscs_space_3"
                     android:layout_marginRight="@dimen/dialog_content_normal_padding_horizontal"
                     android:background="@drawable/bg_common_input"
-                    android:drawableRight="@mipmap/icon_drop_down"
-                    app:i18nHint='@{"please_select_handle_time"}'
                     android:maxLines="1"
+                    android:drawableRight="@mipmap/icon_drop_down"
+                    android:drawablePadding="@dimen/iscs_space_2"
+                    android:textColor="?attr/colorTextPrimary"
                     android:paddingHorizontal="@dimen/iscs_space_3"
                     android:paddingVertical="2dp"
                     android:singleLine="true"
-                    android:textColor="?attr/colorTextPrimary"
                     android:textSize="@dimen/iscs_text_md"
+                    app:i18nHint='@{"please_select_handle_time"}'
                     app:layout_constraintBottom_toBottomOf="@+id/handle_time_tv"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toEndOf="@+id/handle_time_tv"

app/src/main/res/layout/fragment_point_manage.xml

@@ -29,7 +29,7 @@
                 android:layout_weight="1"
                 app:i18nKey='@{"point_manage_title"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/normal_text_size_25"
+                android:textSize="@dimen/iscs_text_lg"
                 android:textStyle="bold" />
 
             <TextView
@@ -47,7 +47,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"back"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
 
         <View
@@ -72,7 +72,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"insert"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
 
             <TextView
@@ -84,7 +84,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"delete"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <TextView
                 android:id="@+id/reset"
@@ -95,7 +95,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"reset"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <View
                 android:layout_width="0dp"
@@ -111,7 +111,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"filter"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
 
         <LinearLayout

app/src/main/res/layout/fragment_reset_password.xml

@@ -30,7 +30,7 @@
                 android:layout_weight="1"
                 app:i18nKey='@{"reset_password_title"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/normal_text_size_25"
+                android:textSize="@dimen/iscs_text_lg"
                 android:textStyle="bold" />
 
             <TextView
@@ -48,13 +48,13 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"back"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
 
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/divider_line_space"
-            android:background="?attr/colorBlack" />
+            android:background="?attr/colorDivider" />
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
@@ -183,7 +183,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"confirm"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <TextView
                 android:id="@+id/cancel"
@@ -198,7 +198,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"cancel"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
     </LinearLayout>
 </layout>

app/src/main/res/layout/fragment_rfid_token_manage.xml

@@ -29,7 +29,7 @@
                 android:layout_weight="1"
                 app:i18nKey='@{"rfid_token_manage_title"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/normal_text_size_25"
+                android:textSize="@dimen/iscs_text_lg"
                 android:textStyle="bold" />
 
             <TextView
@@ -47,7 +47,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"back"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
 
         <View
@@ -72,7 +72,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"insert"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
 
             <TextView
@@ -84,7 +84,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"delete"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <TextView
                 android:id="@+id/reset"
@@ -95,7 +95,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"reset"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <View
                 android:layout_width="0dp"
@@ -111,7 +111,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"filter"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
 
         <LinearLayout

app/src/main/res/layout/fragment_role_manage.xml

@@ -30,7 +30,7 @@
                 app:i18nKey='@{"role_manage_title"}'
                 android:textColor="?attr/colorTextPrimary"
                 android:textStyle="bold"
-                android:textSize="@dimen/normal_text_size_25" />
+                android:textSize="@dimen/iscs_text_lg" />
 
             <TextView
                 android:id="@+id/back"
@@ -47,7 +47,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"back"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
 
         <View
@@ -72,7 +72,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"insert"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
 
             <TextView
@@ -84,7 +84,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"delete"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <TextView
                 android:id="@+id/reset"
@@ -95,7 +95,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"reset"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <View
                 android:layout_width="0dp"
@@ -111,7 +111,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"filter"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
 
         <LinearLayout

app/src/main/res/layout/fragment_select_memeber.xml

@@ -29,7 +29,7 @@
                 android:layout_marginLeft="@dimen/iscs_space_3"
                 app:i18nKey='@{"create_sop_title"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/normal_text_size_25"
+                android:textSize="@dimen/iscs_text_lg"
                 android:textStyle="bold" />
 
             <ImageView
@@ -52,7 +52,7 @@
                 android:layout_marginLeft="@dimen/iscs_space_3"
                 app:i18nKey='@{"select_member_title"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/normal_text_size_25"
+                android:textSize="@dimen/iscs_text_lg"
                 android:textStyle="bold" />
 
             <View
@@ -75,13 +75,13 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"back"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
 
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/divider_line_space"
-            android:background="?attr/colorBlack" />
+            android:background="?attr/colorDivider" />
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -123,7 +123,7 @@
                             android:paddingVertical="@dimen/iscs_space_3"
                             app:i18nKey='@{"locker"}'
                             android:textColor="?attr/colorTextPrimary"
-                            android:textSize="@dimen/normal_text_size_18" />
+                            android:textSize="@dimen/iscs_text_md" />
 
                     </LinearLayout>
 
@@ -160,7 +160,7 @@
                             android:paddingVertical="@dimen/iscs_space_3"
                             app:i18nKey='@{"colocker"}'
                             android:textColor="?attr/colorTextPrimary"
-                            android:textSize="@dimen/normal_text_size_18" />
+                            android:textSize="@dimen/iscs_text_md" />
 
                         <TextView
                             android:id="@+id/select_colocker_tv"
@@ -172,7 +172,7 @@
                             android:paddingVertical="@dimen/iscs_space_1"
                             app:i18nKey='@{"select"}'
                             android:textColor="?attr/colorTextPrimary"
-                            android:textSize="@dimen/common_btn_text_size" />
+                            android:textSize="@dimen/iscs_text_md" />
                     </LinearLayout>
 
 
@@ -223,7 +223,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"confirm"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
 
             <TextView
                 android:id="@+id/cancel"
@@ -238,7 +238,7 @@
                 android:paddingHorizontal="@dimen/iscs_space_4"
                 app:i18nKey='@{"cancel"}'
                 android:textColor="?attr/colorTextPrimary"
-                android:textSize="@dimen/common_btn_text_size" />
+                android:textSize="@dimen/iscs_text_md" />
         </LinearLayout>
     </LinearLayout>
 </layout>