From 7815e8d838fcd1bca3792671dc20dde77125a343 Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期一, 20 四月 2020 17:16:30 +0800
Subject: [PATCH] 基本完成联网考试和单机训练界面

---
 app/src/main/res/layout/layout_road_train.xml |   64 +++++++++++++++++++++++++++++++-
 1 files changed, 62 insertions(+), 2 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..20d1c7d 100644
--- a/app/src/main/res/layout/layout_road_train.xml
+++ b/app/src/main/res/layout/layout_road_train.xml
@@ -10,7 +10,6 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
 
-    android:background="@color/train_item_bg"
     android:gravity="bottom">
 
 
@@ -21,26 +20,46 @@
     <Button android:id="@+id/btn_1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:textColor="#FFFFFF"
+        style="@style/ui_exam_font"
+        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_height="wrap_content"
+        android:textColor="#FFFFFF"
+        android:background="@drawable/btn_exam_item_bg"
+
+        style="@style/ui_exam_font"
         android:text="@string/add_subtract"/>
     <Button android:id="@+id/btn_3"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:textColor="#FFFFFF"
+        android:background="@drawable/btn_exam_item_bg"
+        style="@style/ui_exam_font"
         android:text="@string/pull_over"/>
     <Button android:id="@+id/btn_4"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:textColor="#FFFFFF"
+        android:background="@drawable/btn_exam_item_bg"
+
+        style="@style/ui_exam_font"
         android:text="@string/by_crossing"/>
     <Button android:id="@+id/btn_5"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:textColor="#FFFFFF"
+        style="@style/ui_exam_font"
+        android:background="@drawable/btn_exam_item_bg"
         android:text="@string/junction_left"/>
     <Button android:id="@+id/btn_6"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:textColor="#FFFFFF"
+        android:background="@drawable/btn_exam_item_bg"
+        style="@style/ui_exam_font"
         android:text="@string/junction_right"/>
 </TableRow>
 
@@ -51,34 +70,63 @@
     <Button android:id="@+id/btn_7"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:textColor="#FFFFFF"
+        android:background="@drawable/btn_exam_item_bg"
+
+        style="@style/ui_exam_font"
         android:text="@string/crosswalk"/>
         <Button android:id="@+id/btn_8"
         android:layout_width="wrap_content"
         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:text="@string/school_area"/>
 
     <Button android:id="@+id/btn_9"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:textColor="#FFFFFF"
+        style="@style/ui_exam_font"
+        android:background="@drawable/btn_exam_item_bg"
+
         android:text="@string/bus_area"/>
     <Button android:id="@+id/btn_10"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:textColor="#FFFFFF"
+        style="@style/ui_exam_font"
+        android:background="@drawable/btn_exam_item_bg"
+
         android:text="@string/turn_around"/>
     <Button android:id="@+id/btn_11"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:textColor="#FFFFFF"
+        style="@style/ui_exam_font"
+        android:background="@drawable/btn_exam_item_bg"
+
         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:textColor="#FFFFFF"
+        android:background="@drawable/btn_exam_item_bg"
+
+        style="@style/ui_exam_font"
         android:text="@string/lane_change"/>
         <Button android:id="@+id/btn_13"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:visibility="gone"
+            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"
@@ -89,12 +137,24 @@
     <Button android:id="@+id/btn_14"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:textColor="#FFFFFF"
+        android:background="@drawable/btn_exam_item_bg"
+
+        style="@style/ui_exam_font"
         android:text="@string/junction_right"/>
     <Button android:id="@+id/btn_15"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:textColor="#FFFFFF"
+        android:background="@drawable/btn_exam_item_bg"
+
+        style="@style/ui_exam_font"
         android:text="@string/turn_around"/>
     <Button android:id="@+id/btn_16"
+        android:textColor="#FFFFFF"
+        style="@style/ui_exam_font"
+        android:background="@drawable/btn_exam_item_bg"
+
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/pull_over"/>

--
Gitblit v1.8.0