[6.5.0] passenger cross road ui
This commit is contained in:
@@ -63,7 +63,6 @@ class RoadCrossLiveView @JvmOverloads constructor(
|
||||
init {
|
||||
val res = when (CallerSkinModeListenerManager.getMode()) {
|
||||
0 -> R.layout.view_road_cross_live
|
||||
// 0 -> R.layout.view_road_cross_live_light //todo test
|
||||
1 -> R.layout.view_road_cross_live_light
|
||||
else -> R.layout.view_road_cross_live
|
||||
}
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 20 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 14 KiB |
@@ -1,5 +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/dp_12"/>
|
||||
<solid android:color="@color/color_252B3F"/>
|
||||
<corners android:radius="@dimen/dp_16"/>
|
||||
<solid android:color="@color/color_B2BED9"/>
|
||||
</shape>
|
||||
@@ -4,13 +4,14 @@
|
||||
android:layout_height="match_parent"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:background="@drawable/bg_nor_light">
|
||||
android:background="@drawable/bg_light">
|
||||
|
||||
<TextView
|
||||
android:text="@string/road_cross_live_tip"
|
||||
android:textColor="@color/color_131415"
|
||||
android:textSize="@dimen/dp_28"
|
||||
android:layout_marginStart="@dimen/dp_41"
|
||||
android:layout_marginStart="@dimen/dp_34"
|
||||
android:layout_marginTop="@dimen/dp_28"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
@@ -18,10 +19,11 @@
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/roadCrossLiveClose"
|
||||
android:layout_width="@dimen/dp_26"
|
||||
android:layout_height="@dimen/dp_26"
|
||||
android:layout_marginTop="@dimen/dp_16"
|
||||
android:layout_marginEnd="@dimen/dp_20"
|
||||
android:layout_width="@dimen/dp_40"
|
||||
android:layout_height="@dimen/dp_40"
|
||||
android:scaleType="center"
|
||||
android:layout_marginTop="@dimen/dp_14"
|
||||
android:layout_marginEnd="@dimen/dp_14"
|
||||
android:src="@drawable/bg_close_nor_light"
|
||||
app:layout_constraintRight_toRightOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
@@ -64,7 +66,7 @@
|
||||
style="?android:attr/progressBarStyleSmall"
|
||||
android:layout_width="@dimen/dp_55"
|
||||
android:layout_height="@dimen/dp_55"
|
||||
android:layout_marginTop="@dimen/dp_214"
|
||||
android:layout_marginTop="@dimen/dp_210"
|
||||
android:visibility="visible"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
|
||||
@@ -26,6 +26,7 @@
|
||||
<color name="color_50E8E4">#50E8E4</color>
|
||||
<color name="color_252B3F">#252B3F</color>
|
||||
<color name="color_131415">#131415</color>
|
||||
<color name="color_B2BED9">#B2BED9</color>
|
||||
<color name="color_27FFFFFF">#27FFFFFF</color>
|
||||
<color name="color_1E111111">#1E111111</color>
|
||||
<color name="color_FF213757">#FF213757</color>
|
||||
|
||||
Reference in New Issue
Block a user