Merge branch 'ui' into dev

This commit is contained in:
liujing
2020-09-02 17:08:55 +08:00
9 changed files with 23 additions and 9 deletions

View File

@@ -25,7 +25,7 @@
android:layout_marginStart="@dimen/dp_32"
android:layout_marginEnd="@dimen/dp_32"
android:text="没有更多记录了"
android:textColor="#99FFFFFF"
android:textColor="@color/share_event_no_more_color"
android:textSize="@dimen/dp_26"
app:layout_constraintEnd_toStartOf="@+id/viewLinEnd"
app:layout_constraintStart_toEndOf="@+id/viewLinStart"

View File

@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="@dimen/module_v2x_fatigue_driving_window_height_ground"
android:background="@drawable/v2x_alert_window_bg"
android:background="@drawable/v2x_panel_color_bg"
android:paddingStart="@dimen/dp_40"
android:paddingEnd="@dimen/dp_40"
app:roundLayoutRadius="@dimen/dp_40">
@@ -67,7 +67,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:alpha="0.59"
android:textColor="@android:color/white"
android:textColor="@color/v2x_FFF_999_white"
android:textSize="@dimen/dp_26"
app:layout_constraintStart_toStartOf="@id/tvFaultHelpName"
app:layout_constraintTop_toBottomOf="@id/tvFaultHelpName"

View File

@@ -10,7 +10,7 @@
android:paddingStart="@dimen/dp_30"
android:paddingEnd="@dimen/dp_30"
android:visibility="gone"
app:roundLayoutRadius="@dimen/dp_40"
app:roundLayoutRadius="16px"
tools:visibility="visible">
<RadioGroup
@@ -35,7 +35,7 @@
android:textStyle="bold" />
<View
android:layout_width="2dp"
android:layout_width="0.5px"
android:layout_height="@dimen/dp_42"
android:background="#757575" />
@@ -53,7 +53,7 @@
android:textStyle="bold" />
<View
android:layout_width="2dp"
android:layout_width="0.5px"
android:layout_height="@dimen/dp_42"
android:background="#757575" />

View File

@@ -13,6 +13,7 @@
android:layout_height="200px"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:layout_marginTop="133px"
android:background="@drawable/v_to_x_loading_car0000"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintVertical_bias="0.5"

View File

@@ -10,6 +10,10 @@
<color name="share_event_share_time_color">#FFFFFF</color>
<color name="share_event_address_color">#FFFFFF</color>
<color name="panel_shadow_shape_color">#10121E</color>
<color name="share_event_no_more_color">#99FFFFFF</color>
<color name="v2x_FFF_999_white">#FFFFFF</color>
<color name="v2x_FFF_333_white">#FFFFFF</color>
</resources>

View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:angle="270"
android:startColor="@android:color/transparent"
android:endColor="@color/panel_shadow_shape_color_light"/>
</shape>

View File

@@ -1,4 +1,4 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="#757575" android:state_checked="false"/>
<item android:color="#80333333" android:state_checked="false"/>
<item android:color="#333333" android:state_checked="true"/>
</selector>

View File

@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:angle="270"
android:type="linear"
android:startColor="#FFFFFF"
android:endColor="#F5F5F5"/>
<corners android:radius="28.8px"/>

View File

@@ -5,5 +5,8 @@
<color name="share_event_share_time_color_light">#999999</color>
<color name="share_event_address_color_light">#333333</color>
<color name="panel_shadow_shape_color_light">#F5F5F5</color>
<color name="share_event_no_more_color_light">#333333</color>
<color name="v2x_FFF_999_white_light">#999999</color>
<color name="v2x_FFF_333_white_light">#333333</color>
</resources>