Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS
This commit is contained in:
@@ -4,7 +4,7 @@
|
||||
<shape>
|
||||
<padding android:bottom="2dp" android:left="@dimen/default_widget_padding" android:right="@dimen/default_widget_padding" android:top="2dp"></padding>
|
||||
<solid android:color="@color/cv_gray_153" />
|
||||
<corners android:radius="@dimen/default_btn_corner"></corners>
|
||||
<corners android:radius="@dimen/default_widget_padding"></corners>
|
||||
<stroke android:width="1.1dp" android:color="@color/cv_gray_153" />
|
||||
</shape>
|
||||
</item>
|
||||
@@ -12,7 +12,7 @@
|
||||
<shape>
|
||||
<padding android:bottom="2dp" android:left="@dimen/default_widget_padding" android:right="@dimen/default_widget_padding" android:top="2dp"></padding>
|
||||
<solid android:color="@color/white" />
|
||||
<corners android:radius="@dimen/default_btn_corner"></corners>
|
||||
<corners android:radius="@dimen/default_widget_padding"></corners>
|
||||
<stroke android:width="1.1dp" android:color="@color/colorSecondary" />
|
||||
</shape>
|
||||
</item>
|
||||
@@ -20,7 +20,7 @@
|
||||
<shape>
|
||||
<padding android:bottom="2dp" android:left="@dimen/default_widget_padding" android:right="@dimen/default_widget_padding" android:top="2dp"></padding>
|
||||
<solid android:color="@color/white" />
|
||||
<corners android:radius="@dimen/default_btn_corner"></corners>
|
||||
<corners android:radius="@dimen/default_widget_padding"></corners>
|
||||
<stroke android:width="1.1dp" android:color="@color/colorSecondary" />
|
||||
</shape>
|
||||
</item>
|
||||
@@ -28,7 +28,7 @@
|
||||
<shape>
|
||||
<padding android:bottom="2dp" android:left="@dimen/default_widget_padding" android:right="@dimen/default_widget_padding" android:top="2dp"></padding>
|
||||
<solid android:color="@color/cvm_red" />
|
||||
<corners android:radius="@dimen/default_btn_corner"></corners>
|
||||
<corners android:radius="@dimen/default_widget_padding"></corners>
|
||||
<stroke android:width="1.1dp" android:color="@color/cvm_red" />
|
||||
</shape>
|
||||
</item>
|
||||
@@ -36,7 +36,7 @@
|
||||
<shape>
|
||||
<padding android:bottom="@dimen/default_widget_padding" android:left="@dimen/default_widget_padding" android:right="@dimen/default_widget_padding" android:top="@dimen/default_widget_padding"></padding>
|
||||
<solid android:color="@color/transp" />
|
||||
<corners android:radius="@dimen/default_btn_corner"></corners>
|
||||
<corners android:radius="@dimen/default_widget_padding"></corners>
|
||||
<stroke android:width="1.1dp" android:color="@color/colorPrimary" />
|
||||
</shape>
|
||||
</item>
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:state_enabled="false">
|
||||
<shape>
|
||||
<padding android:bottom="2dp" android:left="@dimen/default_widget_padding" android:right="@dimen/default_widget_padding" android:top="2dp"></padding>
|
||||
<solid android:color="@color/cv_gray_153" />
|
||||
<corners android:radius="@dimen/default_btn_corner"></corners>
|
||||
<stroke android:width="1.1dp" android:color="@color/cv_gray_153" />
|
||||
</shape>
|
||||
</item>
|
||||
<item android:state_pressed="true">
|
||||
<shape>
|
||||
<padding android:bottom="2dp" android:left="@dimen/default_widget_padding" android:right="@dimen/default_widget_padding" android:top="2dp"></padding>
|
||||
<solid android:color="@color/white" />
|
||||
<corners android:radius="@dimen/default_btn_corner"></corners>
|
||||
<stroke android:width="1.1dp" android:color="@color/colorSecondary" />
|
||||
</shape>
|
||||
</item>
|
||||
<item android:state_checked="true">
|
||||
<shape>
|
||||
<padding android:bottom="2dp" android:left="@dimen/default_widget_padding" android:right="@dimen/default_widget_padding" android:top="2dp"></padding>
|
||||
<solid android:color="@color/white" />
|
||||
<corners android:radius="@dimen/default_btn_corner"></corners>
|
||||
<stroke android:width="1.1dp" android:color="@color/colorSecondary" />
|
||||
</shape>
|
||||
</item>
|
||||
<item android:state_selected="true">
|
||||
<shape>
|
||||
<padding android:bottom="2dp" android:left="@dimen/default_widget_padding" android:right="@dimen/default_widget_padding" android:top="2dp"></padding>
|
||||
<solid android:color="@color/cvm_red" />
|
||||
<corners android:radius="@dimen/default_btn_corner"></corners>
|
||||
<stroke android:width="1.1dp" android:color="@color/cvm_red" />
|
||||
</shape>
|
||||
</item>
|
||||
<item>
|
||||
<shape>
|
||||
<padding android:bottom="@dimen/default_widget_padding" android:left="@dimen/default_widget_padding" android:right="@dimen/default_widget_padding" android:top="@dimen/default_widget_padding"></padding>
|
||||
<solid android:color="@color/transp" />
|
||||
<corners android:radius="@dimen/default_btn_corner"></corners>
|
||||
<stroke android:width="1.1dp" android:color="@color/colorPrimary" />
|
||||
</shape>
|
||||
</item>
|
||||
|
||||
</selector>
|
||||
Reference in New Issue
Block a user