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_road_train.xml | 147 +++++++++++++++++++++++++++++++++---------------
1 files changed, 101 insertions(+), 46 deletions(-)
diff --git a/app/src/main/res/layout/layout_road_train.xml b/app/src/main/res/layout/layout_road_train.xml
index fd77b47..62475ff 100644
--- a/app/src/main/res/layout/layout_road_train.xml
+++ b/app/src/main/res/layout/layout_road_train.xml
@@ -8,96 +8,151 @@
<TableLayout
android:layout_width="match_parent"
- android:layout_height="wrap_content"
-
- android:background="@color/train_item_bg"
+ android:layout_height="45dp"
+ android:padding="@dimen/ui_margin_5dp"
android:gravity="bottom">
-<TableRow android:layout_width="wrap_content"
+<TableRow android:layout_width="match_parent"
android:id="@+id/first"
android:layout_height="35dp">
<Button android:id="@+id/btn_1"
- android:layout_width="wrap_content"
+ android:layout_width="0dp"
+ android:layout_weight="1"
android:layout_height="wrap_content"
+ android:textColor="#FFFFFF"
+ style="@style/ui_exam_font"
+ android:layout_marginRight="@dimen/ui_margin_10dp"
+ android:background="@drawable/btn_exam_item_bg"
android:text="@string/straight_line"/>
<Button android:id="@+id/btn_2"
- android:layout_width="wrap_content"
+ android:layout_width="0dp"
+ android:layout_weight="1"
android:layout_height="wrap_content"
+ android:textColor="#FFFFFF"
+ android:background="@drawable/btn_exam_item_bg"
+ android:layout_marginRight="@dimen/ui_margin_10dp"
+ style="@style/ui_exam_font"
android:text="@string/add_subtract"/>
<Button android:id="@+id/btn_3"
- android:layout_width="wrap_content"
+ android:layout_width="0dp"
+ android:layout_weight="1"
android:layout_height="wrap_content"
+ android:textColor="#FFFFFF"
+ android:background="@drawable/btn_exam_item_bg"
+ android:layout_marginRight="@dimen/ui_margin_10dp"
+ style="@style/ui_exam_font"
android:text="@string/pull_over"/>
<Button android:id="@+id/btn_4"
- android:layout_width="wrap_content"
+ android:layout_width="0dp"
+ android:layout_weight="1"
android:layout_height="wrap_content"
+ android:textColor="#FFFFFF"
+ android:background="@drawable/btn_exam_item_bg"
+ android:layout_marginRight="@dimen/ui_margin_10dp"
+ style="@style/ui_exam_font"
android:text="@string/by_crossing"/>
<Button android:id="@+id/btn_5"
- android:layout_width="wrap_content"
+ android:layout_width="0dp"
+ android:layout_weight="1"
android:layout_height="wrap_content"
+ android:textColor="#FFFFFF"
+ style="@style/ui_exam_font"
+ android:background="@drawable/btn_exam_item_bg"
+ android:layout_marginRight="@dimen/ui_margin_10dp"
android:text="@string/junction_left"/>
<Button android:id="@+id/btn_6"
- android:layout_width="wrap_content"
+ android:layout_width="0dp"
+ android:layout_weight="1"
android:layout_height="wrap_content"
+ android:textColor="#FFFFFF"
+ android:background="@drawable/btn_exam_item_bg"
+ android:layout_marginRight="@dimen/ui_margin_10dp"
+ style="@style/ui_exam_font"
android:text="@string/junction_right"/>
+ <Button android:id="@+id/btn_12"
+ android:layout_width="0dp"
+ android:layout_weight="1"
+ android:layout_height="wrap_content"
+ android:textColor="#FFFFFF"
+ android:background="@drawable/btn_exam_item_bg"
+
+ style="@style/ui_exam_font"
+ android:text="@string/lane_change"/>
</TableRow>
- <TableRow android:layout_width="wrap_content"
+ <TableRow android:layout_width="match_parent"
android:id="@+id/second"
android:layout_height="35dp">
<Button android:id="@+id/btn_7"
- android:layout_width="wrap_content"
+ android:layout_width="0dp"
+ android:layout_weight="1"
android:layout_height="wrap_content"
+ android:textColor="#FFFFFF"
+ android:background="@drawable/btn_exam_item_bg"
+ android:layout_marginRight="@dimen/ui_margin_10dp"
+ style="@style/ui_exam_font"
android:text="@string/crosswalk"/>
<Button android:id="@+id/btn_8"
- android:layout_width="wrap_content"
+ android:layout_width="0dp"
+ android:layout_weight="1"
android:layout_height="wrap_content"
- android:text="@string/school_area"/>
+ android:textColor="#FFFFFF"
+ style="@style/ui_exam_font"
+ android:background="@drawable/btn_exam_item_bg"
+ android:layout_marginRight="@dimen/ui_margin_10dp"
+ android:text="@string/school_area"/>
<Button android:id="@+id/btn_9"
- android:layout_width="wrap_content"
+ android:layout_width="0dp"
+ android:layout_weight="1"
android:layout_height="wrap_content"
+ android:textColor="#FFFFFF"
+ style="@style/ui_exam_font"
+ android:background="@drawable/btn_exam_item_bg"
+ android:layout_marginRight="@dimen/ui_margin_10dp"
android:text="@string/bus_area"/>
<Button android:id="@+id/btn_10"
- android:layout_width="wrap_content"
+ android:layout_width="0dp"
+ android:layout_weight="1"
android:layout_height="wrap_content"
+ android:textColor="#FFFFFF"
+ style="@style/ui_exam_font"
+ android:background="@drawable/btn_exam_item_bg"
+ android:layout_marginRight="@dimen/ui_margin_10dp"
android:text="@string/turn_around"/>
- <Button android:id="@+id/btn_11"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:visibility="gone"
- android:text="@string/turn_around"/>
- <Button android:id="@+id/btn_12"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:visibility="gone"
- android:text="@string/lane_change"/>
- <Button android:id="@+id/btn_13"
- android:layout_width="wrap_content"
+ <Button android:id="@+id/btn_14"
+ android:layout_width="0dp"
+ android:layout_weight="1"
android:layout_height="wrap_content"
- android:visibility="gone"
+ android:textColor="#FFFFFF"
+ android:background="@drawable/btn_exam_item_bg"
+ android:layout_marginRight="@dimen/ui_margin_10dp"
+ style="@style/ui_exam_font"
+ android:text="@string/start_vehicle"/>
+ <Button android:id="@+id/btn_16"
+ android:textColor="#FFFFFF"
+ style="@style/ui_exam_font"
+ android:background="@drawable/btn_exam_item_bg"
+ android:layout_marginRight="@dimen/ui_margin_10dp"
+ android:layout_width="0dp"
+ android:layout_weight="1"
+ android:layout_height="wrap_content"
+ android:text="@string/pull_over"/>
+
+
+ <Button android:id="@+id/btn_13"
+ android:layout_width="0dp"
+ android:layout_weight="1"
+ android:layout_height="@dimen/ui_margin_45dp"
+ android:textColor="#FFFFFF"
+ android:background="@drawable/btn_exam_item_bg"
+
+ style="@style/ui_exam_font"
android:text="@string/night_driving"/>
</TableRow>
- <TableRow android:layout_width="wrap_content"
- android:visibility="gone"
- android:id="@+id/third"
- android:layout_height="35dp">
- <Button android:id="@+id/btn_14"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/junction_right"/>
- <Button android:id="@+id/btn_15"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/turn_around"/>
- <Button android:id="@+id/btn_16"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/pull_over"/>
- </TableRow>
</TableLayout>
</ScrollView>
\ No newline at end of file
--
Gitblit v1.8.0