From 8735b56eefde751618c819f5b331a56a62274a5c Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期四, 14 五月 2020 18:30:22 +0800
Subject: [PATCH] Merge branch 'newUI'
---
app/src/main/res/layout/layout_signal_conf_item.xml | 71 +++++++++++++++++++----------------
1 files changed, 38 insertions(+), 33 deletions(-)
diff --git a/app/src/main/res/layout/layout_signal_conf_item.xml b/app/src/main/res/layout/layout_signal_conf_item.xml
index 0842db8..668e2ae 100644
--- a/app/src/main/res/layout/layout_signal_conf_item.xml
+++ b/app/src/main/res/layout/layout_signal_conf_item.xml
@@ -1,66 +1,71 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:gravity="center"
- android:layout_height="60dp">
+ android:paddingBottom="8dp"
+ android:gravity="center_vertical"
+ android:layout_height="50dp">
<TextView
android:layout_width="0dp"
android:layout_weight="1"
android:id="@+id/tv_signal_1"
- android:layout_height="wrap_content"
- android:gravity="center"
+ android:textColor="@android:color/white"
+ android:layout_height="32dp"
+ android:textAlignment="center"
+ android:gravity="center_vertical"
+ android:textSize="@dimen/network_train_textsize22px"
android:text="鍠囧彮"/>
- <EditText
+ <androidx.appcompat.widget.AppCompatSpinner
android:layout_width="0dp"
android:layout_weight="1"
+ android:textColor="@android:color/white"
android:gravity="center"
- android:layout_height="wrap_content"
+ android:layout_height="32dp"
+ android:popupBackground="#2B3141"
+ android:background="@drawable/bg_spinner"
android:id="@+id/et_signal1_port"
- android:background="@android:drawable/editbox_background_normal"
+ android:entries="@array/signals_name"
+ android:textSize="@dimen/network_train_textsize22px"
android:text="0"/>
- <CheckBox
+ <safeluck.drive.evaluation.customview.MyCustomCheckbox
android:layout_width="0dp"
android:layout_weight="1"
android:gravity="center"
+ android:button="@null"
+ android:layout_gravity="center_vertical"
+ android:drawableStart="@drawable/ic_check"
android:id="@+id/signal_check_1"
- android:layout_height="wrap_content"
+ android:layout_height="@dimen/ui_margin_30dp"
android:checked="true"/>
- <CheckBox
- android:layout_width="0dp"
- android:layout_weight="1"
- android:gravity="center"
- android:id="@+id/signal_check_2"
- android:layout_height="wrap_content"
- android:checked="true"/>
- <View
- android:layout_width="1px"
- android:layout_height="wrap_content"
- android:background="@color/colorAccent"/>
+
<TextView
android:layout_width="0dp"
android:layout_weight="1"
+ android:textColor="@android:color/white"
+ android:textSize="@dimen/network_train_textsize22px"
android:gravity="center"
android:id="@+id/tv_signal_2"
- android:layout_height="wrap_content"
+ android:layout_height="32dp"
android:text="鍠囧彮"/>
- <EditText
+ <androidx.appcompat.widget.AppCompatSpinner
android:layout_width="0dp"
android:layout_weight="1"
android:gravity="center"
- android:background="@android:drawable/editbox_background_normal"
+ android:textColor="@android:color/white"
+ android:textSize="@dimen/network_train_textsize22px"
+ android:background="@drawable/bg_spinner"
android:id="@+id/et_signal2_port"
- android:layout_height="wrap_content"
+ android:popupBackground="#2B3141"
+ android:layout_height="32dp"
+ android:entries="@array/signals_name"
android:text="0"/>
- <CheckBox
- android:layout_width="0dp"
+ <safeluck.drive.evaluation.customview.MyCustomCheckbox
+ android:layout_width="wrap_content"
android:layout_weight="1"
+ android:button="@null"
+ android:drawableStart="@drawable/ic_check"
+ android:gravity="center"
android:id="@+id/signal_check_3"
- android:layout_height="wrap_content"
+ android:layout_height="@dimen/ui_margin_30dp"
android:checked="true"/>
- <CheckBox
- android:layout_width="0dp"
- android:layout_weight="1"
- android:id="@+id/signal_check_4"
- android:layout_height="wrap_content"
- android:checked="true"/>
+
</LinearLayout>
--
Gitblit v1.8.0