diff --git a/module_base/src/main/res/layout/pda_item_image_select.xml b/module_base/src/main/res/layout/pda_item_image_select.xml index d97e9ad..28eb2a4 100644 --- a/module_base/src/main/res/layout/pda_item_image_select.xml +++ b/module_base/src/main/res/layout/pda_item_image_select.xml @@ -21,7 +21,8 @@ android:layout_height="50dp" android:padding="10dp" android:layout_centerInParent="true" - android:src="@drawable/img_add" /> + android:src="@drawable/img_add" + android:tint="@color/phone_primary" /> + + + + + + + + + + diff --git a/module_p/src/main/res/drawable/img_pda_check_n.xml b/module_p/src/main/res/drawable/img_pda_check_n.xml new file mode 100644 index 0000000..ac0742c --- /dev/null +++ b/module_p/src/main/res/drawable/img_pda_check_n.xml @@ -0,0 +1,5 @@ + + + diff --git a/module_p/src/main/res/drawable/img_pda_check_s.xml b/module_p/src/main/res/drawable/img_pda_check_s.xml new file mode 100644 index 0000000..8ae7865 --- /dev/null +++ b/module_p/src/main/res/drawable/img_pda_check_s.xml @@ -0,0 +1,5 @@ + + + diff --git a/module_p/src/main/res/drawable/p_checkbox_selector.xml b/module_p/src/main/res/drawable/p_checkbox_selector.xml index 421e8b8..f6cbbf1 100644 --- a/module_p/src/main/res/drawable/p_checkbox_selector.xml +++ b/module_p/src/main/res/drawable/p_checkbox_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/module_p/src/main/res/layout/activity_accident_visa_add.xml b/module_p/src/main/res/layout/activity_accident_visa_add.xml index 227d696..2c797f0 100644 --- a/module_p/src/main/res/layout/activity_accident_visa_add.xml +++ b/module_p/src/main/res/layout/activity_accident_visa_add.xml @@ -686,7 +686,7 @@ android:layout_width="120dp" android:layout_height="50dp" android:layout_gravity="end" - android:background="@color/colorPrimary" + android:background="@color/phone_primary" android:gravity="center" android:onClick="@{()-> viewModel.reSet()}" android:text="重置" @@ -701,7 +701,7 @@ android:layout_width="120dp" android:layout_height="50dp" android:layout_gravity="end" - android:background="@color/colorPrimary" + android:background="@color/phone_primary" android:gravity="center" android:onClick="@{()-> viewModel.onSaveClick()}" android:text="保存" diff --git a/module_p/src/main/res/layout/activity_gnc_un_shou_yun.xml b/module_p/src/main/res/layout/activity_gnc_un_shou_yun.xml index 491c946..214fb3f 100644 --- a/module_p/src/main/res/layout/activity_gnc_un_shou_yun.xml +++ b/module_p/src/main/res/layout/activity_gnc_un_shou_yun.xml @@ -73,7 +73,7 @@ + android:src="@drawable/img_daosanjiao" + app:tint="@color/phone_primary" /> @@ -144,7 +145,7 @@ android:onClick="@{()->viewModel.onAddClick()}" android:padding="10dp" android:src="@drawable/add" - app:tint="@color/colorPrimary" /> + app:tint="@color/phone_primary" /> + app:tint="@color/phone_primary" /> diff --git a/module_p/src/main/res/layout/activity_gnj_xie_ji_list.xml b/module_p/src/main/res/layout/activity_gnj_xie_ji_list.xml index 12ae8e7..8c0c0a3 100644 --- a/module_p/src/main/res/layout/activity_gnj_xie_ji_list.xml +++ b/module_p/src/main/res/layout/activity_gnj_xie_ji_list.xml @@ -70,7 +70,7 @@ + android:src="@drawable/img_daosanjiao" + app:tint="@color/phone_primary" /> @@ -130,7 +131,7 @@ android:onClick="@{()->viewModel.onAddClick()}" android:padding="10dp" android:src="@drawable/add" - app:tint="@color/colorPrimary" /> + app:tint="@color/phone_primary" /> diff --git a/module_p/src/main/res/layout/activity_gnj_xieji_add.xml b/module_p/src/main/res/layout/activity_gnj_xieji_add.xml index c0a13df..87ef244 100644 --- a/module_p/src/main/res/layout/activity_gnj_xieji_add.xml +++ b/module_p/src/main/res/layout/activity_gnj_xieji_add.xml @@ -169,7 +169,7 @@ + android:src="@drawable/img_daosanjiao" + app:tint="@color/phone_primary" /> @@ -215,7 +216,7 @@ android:layout_width="120dp" android:layout_height="50dp" android:layout_gravity="end" - android:background="@color/colorPrimary" + android:background="@color/phone_primary" android:gravity="center" android:onClick="@{()-> viewModel.onConfirmClick()}" android:text="确定" diff --git a/module_p/src/main/res/layout/activity_pda_accident_visa_list.xml b/module_p/src/main/res/layout/activity_pda_accident_visa_list.xml index 079e8d8..0b95d17 100644 --- a/module_p/src/main/res/layout/activity_pda_accident_visa_list.xml +++ b/module_p/src/main/res/layout/activity_pda_accident_visa_list.xml @@ -65,7 +65,7 @@ + android:src="@drawable/img_daosanjiao" + app:tint="@color/phone_primary" /> @@ -125,7 +126,7 @@ android:onClick="@{()->viewModel.onAddClick()}" android:padding="10dp" android:src="@drawable/add" - app:tint="@color/colorPrimary" /> + app:tint="@color/phone_primary" /> diff --git a/module_p/src/main/res/layout/activity_pda_document_handover.xml b/module_p/src/main/res/layout/activity_pda_document_handover.xml index 4696268..4882407 100644 --- a/module_p/src/main/res/layout/activity_pda_document_handover.xml +++ b/module_p/src/main/res/layout/activity_pda_document_handover.xml @@ -71,7 +71,7 @@ + android:src="@drawable/img_daosanjiao" + app:tint="@color/phone_primary" /> @@ -137,7 +138,7 @@ + android:textColor="@color/phone_primary" /> + android:textColor="@color/phone_primary" /> + android:textColor="@color/phone_primary" /> + android:src="@drawable/img_daosanjiao" + app:tint="@color/phone_primary" /> @@ -167,7 +168,7 @@ + android:src="@drawable/img_daosanjiao" + app:tint="@color/phone_primary" /> @@ -158,7 +159,7 @@ android:layout_gravity="end" android:layout_marginEnd="10dp" android:layout_marginRight="10dp" - android:background="@color/colorPrimary" + android:background="@color/phone_primary" android:gravity="center" android:onClick="@{()->viewModel.showSyncDialog()}" android:paddingHorizontal="15dp" @@ -179,7 +180,8 @@ android:layout_marginBottom="60dp" android:background="@drawable/bg_white_circle" android:padding="10dp" - android:src="@drawable/img_print_pda" /> + android:src="@drawable/img_print_pda" + app:tint="@color/phone_primary" /> diff --git a/module_p/src/main/res/layout/activity_pda_guo_bang.xml b/module_p/src/main/res/layout/activity_pda_guo_bang.xml index a9b9bf6..981b2e0 100644 --- a/module_p/src/main/res/layout/activity_pda_guo_bang.xml +++ b/module_p/src/main/res/layout/activity_pda_guo_bang.xml @@ -107,7 +107,7 @@ android:textSize="15sp" /> + android:src="@drawable/img_search" + app:tint="@color/phone_primary" /> + android:src="@drawable/img_daosanjiao" + app:tint="@color/phone_primary" /> @@ -146,7 +148,7 @@ android:layout_width="100dp" android:layout_height="50dp" android:layout_gravity="end" - android:background="@color/colorPrimary" + android:background="@color/phone_primary" android:gravity="center" android:onClick="@{()->viewModel.onConfirmClick()}" android:paddingHorizontal="15dp" diff --git a/module_p/src/main/res/layout/activity_pda_set.xml b/module_p/src/main/res/layout/activity_pda_set.xml index 9da3372..45dbfe6 100644 --- a/module_p/src/main/res/layout/activity_pda_set.xml +++ b/module_p/src/main/res/layout/activity_pda_set.xml @@ -98,11 +98,11 @@ android:layout_height="44dp" android:layout_marginHorizontal="15dp" android:layout_marginTop="20dp" - android:background="@color/colorPrimary" + android:background="@color/phone_primary" android:gravity="center" android:onClick="@{()->viewModel.onConfirmClick()}" android:text="提交" - shape_bg_color="@{@color/colorPrimary}" + shape_bg_color="@{@color/phone_primary}" shape_radius="@{8}" android:textSize="18sp" android:textColor="@color/white" /> diff --git a/module_p/src/main/res/layout/activity_pda_shou_yun.xml b/module_p/src/main/res/layout/activity_pda_shou_yun.xml index 20b9069..4e89c9c 100644 --- a/module_p/src/main/res/layout/activity_pda_shou_yun.xml +++ b/module_p/src/main/res/layout/activity_pda_shou_yun.xml @@ -314,7 +314,7 @@ + android:textColor="@color/phone_primary" /> + android:textColor="@color/phone_primary" /> + android:textColor="@color/phone_primary" /> + android:textColor="@color/phone_primary" /> + android:textColor="@color/phone_primary" /> + android:textColor="@color/phone_primary" /> + android:textColor="@color/phone_primary" /> + android:textColor="@color/phone_primary" /> + android:src="@drawable/img_daosanjiao" + app:tint="@color/phone_primary" /> diff --git a/module_p/src/main/res/layout/activity_pda_xie_ji_details.xml b/module_p/src/main/res/layout/activity_pda_xie_ji_details.xml index 6e6370c..cfd15ef 100644 --- a/module_p/src/main/res/layout/activity_pda_xie_ji_details.xml +++ b/module_p/src/main/res/layout/activity_pda_xie_ji_details.xml @@ -180,7 +180,7 @@ android:layout_width="120dp" android:layout_height="60dp" android:layout_gravity="end" - android:background="@color/colorPrimary" + android:background="@color/phone_primary" android:gravity="center" android:onClick="@{()-> viewModel.onDistributionClick()}" android:textColor="@color/white" diff --git a/module_p/src/main/res/layout/activity_pda_zu_zhuang.xml b/module_p/src/main/res/layout/activity_pda_zu_zhuang.xml index 2f6d33b..acc22bf 100644 --- a/module_p/src/main/res/layout/activity_pda_zu_zhuang.xml +++ b/module_p/src/main/res/layout/activity_pda_zu_zhuang.xml @@ -46,7 +46,7 @@ android:textSize="15sp" /> + android:background="@color/phone_primary" /> @@ -69,7 +69,7 @@ android:layout_width="100dp" android:layout_height="40dp" android:layout_gravity="end" - android:background="@color/colorPrimary" + android:background="@color/phone_primary" android:gravity="center" android:onClick="@{()-> model.confirmClick()}" android:text="确定" diff --git a/module_p/src/main/res/layout/dialog_pda_gnj_xieji_detatis_allocation.xml b/module_p/src/main/res/layout/dialog_pda_gnj_xieji_detatis_allocation.xml index a3d2aa3..4df1361 100644 --- a/module_p/src/main/res/layout/dialog_pda_gnj_xieji_detatis_allocation.xml +++ b/module_p/src/main/res/layout/dialog_pda_gnj_xieji_detatis_allocation.xml @@ -81,7 +81,7 @@ android:layout_width="120dp" android:layout_height="50dp" android:layout_gravity="end" - android:background="@color/colorPrimary" + android:background="@color/phone_primary" android:gravity="center" android:onClick="@{()-> model.onConfirmClick()}" android:text="确定" diff --git a/module_p/src/main/res/layout/item_pda_gnc_cunfang_list.xml b/module_p/src/main/res/layout/item_pda_gnc_cunfang_list.xml index d33c2e9..20c0198 100644 --- a/module_p/src/main/res/layout/item_pda_gnc_cunfang_list.xml +++ b/module_p/src/main/res/layout/item_pda_gnc_cunfang_list.xml @@ -182,7 +182,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="10dp" android:text="@{bean.storageArea}" - android:textColor="@color/blue" /> + android:textColor="@color/phone_primary" /> diff --git a/module_p/src/main/res/layout/item_pda_gnj_xieji_add.xml b/module_p/src/main/res/layout/item_pda_gnj_xieji_add.xml index fa9be33..567ed66 100644 --- a/module_p/src/main/res/layout/item_pda_gnj_xieji_add.xml +++ b/module_p/src/main/res/layout/item_pda_gnj_xieji_add.xml @@ -73,7 +73,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="5dp" android:text="kg" - android:textColor="@color/blue" /> + android:textColor="@color/phone_primary" /> diff --git a/module_p/src/main/res/layout/item_pda_gnj_xieji_car_list.xml b/module_p/src/main/res/layout/item_pda_gnj_xieji_car_list.xml index 12c6163..1a89ddc 100644 --- a/module_p/src/main/res/layout/item_pda_gnj_xieji_car_list.xml +++ b/module_p/src/main/res/layout/item_pda_gnj_xieji_car_list.xml @@ -25,7 +25,8 @@ android:layout_width="22dp" android:layout_height="22dp" android:onClick="@{()-> bean.checkedClick()}" - android:src="@drawable/img_p_check_s" /> + android:src="@drawable/img_p_check_s" + android:tint="@color/phone_primary" /> + android:textColor="@color/phone_primary" /> + android:textColor="@color/phone_primary" /> + android:textColor="@color/phone_primary" /> + android:textColor="@color/phone_primary" /> + android:src="@drawable/img_p_check_s" + android:tint="@color/phone_primary" /> + android:textColor="@color/phone_primary" /> + android:textColor="@color/phone_primary" /> + android:textColor="@color/phone_primary" /> + android:textColor="@color/phone_primary" />