Browse Source

1.优化布局UI

王鹏鹏 2 years ago
parent
commit
6a0fdd7df6

+ 4 - 19
workbenches/src/main/res/layout/activity_free_train.xml

@@ -10,27 +10,12 @@
 
         <LinearLayout
             android:id="@+id/layoutHead"
-            android:layout_width="@dimen/divider_195px"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
+            style="@style/back_home_layout"
+            tools:ignore="MissingConstraints">
 
-            <androidx.appcompat.widget.AppCompatImageView
-                android:layout_width="@dimen/divider_48px"
-                android:layout_height="@dimen/divider_43px"
-                android:layout_marginStart="@dimen/divider_65px"
-                android:layout_marginTop="@dimen/divider_35px"
-                android:background="@mipmap/bg_home" />
+            <androidx.appcompat.widget.AppCompatImageView style="@style/back_home_image" />
 
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/layout_properties_self_adaption"
-                android:layout_marginStart="@dimen/divider_14px"
-                android:layout_marginTop="@dimen/divider_38px"
-                android:text="@string/home_pager"
-                android:textColor="@android:color/white"
-                android:textSize="@dimen/divider_28px"
-                android:textStyle="bold" />
+            <androidx.appcompat.widget.AppCompatTextView style="@style/back_home_text" />
         </LinearLayout>
 
         <androidx.recyclerview.widget.RecyclerView

+ 4 - 19
workbenches/src/main/res/layout/activity_leisure_brain.xml

@@ -10,27 +10,12 @@
 
         <LinearLayout
             android:id="@+id/layoutHead"
-            android:layout_width="@dimen/divider_195px"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
+            style="@style/back_home_layout"
+            tools:ignore="MissingConstraints">
 
-            <androidx.appcompat.widget.AppCompatImageView
-                android:layout_width="@dimen/divider_48px"
-                android:layout_height="@dimen/divider_43px"
-                android:layout_marginStart="@dimen/divider_65px"
-                android:layout_marginTop="@dimen/divider_35px"
-                android:background="@mipmap/bg_home" />
+            <androidx.appcompat.widget.AppCompatImageView style="@style/back_home_image" />
 
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/layout_properties_self_adaption"
-                android:layout_marginStart="@dimen/divider_14px"
-                android:layout_marginTop="@dimen/divider_38px"
-                android:text="@string/home_pager"
-                android:textColor="@android:color/white"
-                android:textSize="@dimen/divider_28px"
-                android:textStyle="bold" />
+            <androidx.appcompat.widget.AppCompatTextView style="@style/back_home_text" />
         </LinearLayout>
 
         <androidx.recyclerview.widget.RecyclerView

+ 7 - 20
workbenches/src/main/res/layout/activity_order_list.xml

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="ResourceName">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         style="@style/layout_properties_specify_width_geight"
@@ -8,27 +10,12 @@
 
         <LinearLayout
             android:id="@+id/layoutHead"
-            style="@style/layout_properties_self_adaption"
-            android:layout_marginStart="@dimen/divider_65px"
-            android:layout_marginTop="@dimen/divider_35px"
-            android:gravity="center"
-            android:orientation="horizontal"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <androidx.appcompat.widget.AppCompatImageView
-                android:layout_width="@dimen/divider_48px"
-                android:layout_height="@dimen/divider_48px"
-                android:background="@mipmap/icon_back" />
+            style="@style/back_home_layout"
+            tools:ignore="MissingConstraints">
 
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/layout_properties_self_adaption"
-                android:layout_marginStart="@dimen/divider_14px"
-                android:text="@string/back_pager"
-                android:textColor="@android:color/white"
-                android:textSize="@dimen/divider_28px"
-                android:textStyle="bold" />
+            <androidx.appcompat.widget.AppCompatImageView style="@style/back_home_image" />
 
+            <androidx.appcompat.widget.AppCompatTextView style="@style/back_home_text" />
         </LinearLayout>
 
         <androidx.appcompat.widget.AppCompatTextView

+ 4 - 20
workbenches/src/main/res/layout/activity_service_package.xml

@@ -14,28 +14,12 @@
 
         <LinearLayout
             android:id="@+id/layoutHead"
-            android:layout_width="@dimen/divider_195px"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:ignore="UseCompoundDrawables">
+            style="@style/back_home_layout"
+            tools:ignore="MissingConstraints">
 
-            <ImageView
-                android:layout_width="@dimen/divider_48px"
-                android:layout_height="@dimen/divider_43px"
-                android:layout_marginStart="@dimen/divider_65px"
-                android:layout_marginTop="@dimen/divider_35px"
-                android:background="@mipmap/bg_home" />
+            <androidx.appcompat.widget.AppCompatImageView style="@style/back_home_image" />
 
-            <TextView
-                style="@style/layout_properties_self_adaption"
-                android:layout_marginStart="@dimen/divider_14px"
-                android:layout_marginTop="@dimen/divider_38px"
-                android:text="@string/home_pager"
-                android:textColor="@android:color/white"
-                android:textSize="@dimen/divider_28px"
-                android:textStyle="bold" />
+            <androidx.appcompat.widget.AppCompatTextView style="@style/back_home_text" />
         </LinearLayout>
 
         <androidx.cardview.widget.CardView

+ 6 - 22
workbenches/src/main/res/layout/activity_train_content_details.xml

@@ -15,28 +15,12 @@
 
         <LinearLayout
             android:id="@+id/layoutHead"
-            android:layout_width="@dimen/divider_195px"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <ImageView
-                android:layout_width="@dimen/divider_48px"
-                android:layout_height="@dimen/divider_43px"
-                android:layout_marginStart="@dimen/divider_65px"
-                android:layout_marginTop="@dimen/divider_35px"
-                android:background="@mipmap/bg_home" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/divider_14px"
-                android:layout_marginTop="@dimen/divider_38px"
-                android:text="@string/home_pager"
-                android:textColor="@android:color/white"
-                android:textSize="@dimen/divider_28px"
-                android:textStyle="bold" />
+            style="@style/back_home_layout"
+            tools:ignore="MissingConstraints">
+
+            <androidx.appcompat.widget.AppCompatImageView style="@style/back_home_image" />
+
+            <androidx.appcompat.widget.AppCompatTextView style="@style/back_home_text" />
         </LinearLayout>
 
         <androidx.cardview.widget.CardView

+ 5 - 21
workbenches/src/main/res/layout/activity_train_data.xml

@@ -15,28 +15,12 @@
 
         <LinearLayout
             android:id="@+id/layoutHead"
-            android:layout_width="@dimen/divider_195px"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
+            style="@style/back_home_layout"
+            tools:ignore="MissingConstraints">
+
+            <androidx.appcompat.widget.AppCompatImageView style="@style/back_home_image" />
 
-            <ImageView
-                android:layout_width="@dimen/divider_48px"
-                android:layout_height="@dimen/divider_43px"
-                android:layout_marginStart="@dimen/divider_65px"
-                android:layout_marginTop="@dimen/divider_35px"
-                android:background="@mipmap/bg_home" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/divider_14px"
-                android:layout_marginTop="@dimen/divider_38px"
-                android:text="@string/home_pager"
-                android:textColor="@android:color/white"
-                android:textSize="@dimen/divider_28px"
-                android:textStyle="bold" />
+            <androidx.appcompat.widget.AppCompatTextView style="@style/back_home_text" />
         </LinearLayout>
 
         <RadioGroup

+ 25 - 0
workbenches/src/main/res/values/styles.xml

@@ -227,4 +227,29 @@
         <item name="android:textSize">@dimen/divider_24px</item>
     </style>
 
+    <style name="back_home_layout" tools:ignore="ResourceName">
+        <item name="android:layout_width">@dimen/divider_195px</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:orientation">horizontal</item>
+        <item name="layout_constraintStart_toStartOf">parent</item>
+        <item name="layout_constraintTop_toTopOf">parent</item>
+    </style>
+
+    <style name="back_home_image" tools:ignore="ResourceName">
+        <item name="android:layout_width">@dimen/divider_48px</item>
+        <item name="android:layout_height">@dimen/divider_43px</item>
+        <item name="android:layout_marginStart">@dimen/divider_65px</item>
+        <item name="android:layout_marginTop">@dimen/divider_35px</item>
+        <item name="android:background">@mipmap/bg_home</item>
+    </style>
+
+    <style name="back_home_text" parent="layout_properties_self_adaption" tools:ignore="ResourceName">
+        <item name="android:layout_marginStart">@dimen/divider_14px</item>
+        <item name="android:layout_marginTop">@dimen/divider_38px</item>
+        <item name="android:textSize">@dimen/divider_28px</item>
+        <item name="android:textStyle">bold</item>
+        <item name="android:textColor">@android:color/white</item>
+        <item name="android:text">@string/home_pager</item>
+    </style>
+
 </resources>