Merge branch 'add' into dev

This commit is contained in:
liujing
2020-11-24 21:13:44 +08:00
9 changed files with 16 additions and 15 deletions

View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/service_car_panel_call_pressed" android:state_pressed="true" />
<item android:drawable="@drawable/service_car_panel_call_normal" android:state_pressed="false" />
<item android:drawable="@drawable/service_car_panel_call_normal" />
</selector>

View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/service_car_panel_details_pressed" android:state_pressed="true" />
<item android:drawable="@drawable/service_car_panel_details_normal" android:state_pressed="false" />
<item android:drawable="@drawable/service_car_panel_details_normal" />
</selector>

View File

@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/service_car_pannel_call_pressed" android:state_pressed="true" />
<item android:drawable="@drawable/service_car_pannel_call_nomal" android:state_pressed="false" />
<item android:drawable="@drawable/service_car_pannel_call_nomal" />
</selector>

View File

@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/service_car_pannel_detials_pressed" android:state_pressed="true" />
<item android:drawable="@drawable/service_car_pannel_detials_nomal" android:state_pressed="false" />
<item android:drawable="@drawable/service_car_pannel_detials_nomal" />
</selector>

View File

@@ -12,6 +12,7 @@
android:id="@+id/module_services_id_panel_item_avatar"
android:layout_width="@dimen/module_services_panel_item_avatar_size"
android:layout_height="@dimen/module_services_panel_item_avatar_size"
android:layout_marginStart="@dimen/dp_40"
android:src="@drawable/module_common_default_user_head"
app:civ_border_color="@color/module_services_id_panel_item_avatar_border_color"
app:civ_border_width="@dimen/module_services_id_panel_item_avatar_border_width"
@@ -60,7 +61,7 @@
android:layout_width="@dimen/modle_car_panel_call"
android:layout_height="@dimen/modle_car_panel_call"
android:layout_marginEnd="@dimen/modle_car_panel_call_margin"
android:background="@drawable/selector_service_car_pannel_call"
android:background="@drawable/selector_service_car_panel_call"
android:padding="@dimen/module_services_panel_item_detail_padding"
android:textColor="@color/module_services_panel_item_detail_textColor"
android:textSize="@dimen/module_services_panel_item_detail_textSize"
@@ -74,13 +75,13 @@
<TextView
android:id="@+id/module_services_id_panel_item_detail"
android:layout_width="@dimen/modle_car_panel_call"
android:background="@drawable/selector_service_car_pannel_detials"
android:background="@drawable/selector_service_car_panel_details"
android:layout_height="@dimen/modle_car_panel_call"
android:padding="@dimen/module_services_panel_item_detail_padding"
android:textStyle="bold"
android:textColor="@color/module_services_panel_item_detail_textColor"
android:textSize="@dimen/module_services_panel_item_detail_textSize"
android:layout_marginEnd="@dimen/dp_40"
android:layout_marginRight="@dimen/dp_40"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />