Browse Source

1.优化布局UI

王鹏鹏 2 years ago
parent
commit
d6f31cc766

+ 1 - 3
workbenches/src/main/res/layout/activity_free_train.xml

@@ -58,9 +58,7 @@
             app:layout_constraintStart_toEndOf="@id/rvTrainType"
             app:layout_constraintTop_toTopOf="parent">
 
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
+            <androidx.constraintlayout.widget.ConstraintLayout style="@style/layout_properties_specify_width_geight">
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/tvTitle"

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

@@ -5,8 +5,7 @@
     tools:ignore="ResourceName">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        style="@style/layout_properties_specify_width_geight"
         android:background="@mipmap/icon_uniform_background">
 
         <LinearLayout
@@ -25,8 +24,7 @@
                 android:background="@mipmap/bg_home" />
 
             <androidx.appcompat.widget.AppCompatTextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                style="@style/layout_properties_self_adaption"
                 android:layout_marginStart="@dimen/divider_14px"
                 android:layout_marginTop="@dimen/divider_38px"
                 android:text="@string/home_pager"
@@ -61,14 +59,11 @@
             app:layout_constraintStart_toEndOf="@id/rvLeisureBrainType"
             app:layout_constraintTop_toTopOf="parent">
 
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
+            <androidx.constraintlayout.widget.ConstraintLayout style="@style/layout_properties_specify_width_geight">
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/tvTitle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    style="@style/layout_properties_self_adaption"
                     android:layout_marginTop="@dimen/divider_31px"
                     android:text="@string/all_training"
                     android:textColor="@color/color_FF4A76FF"

+ 8 - 14
workbenches/src/main/res/layout/activity_order_list.xml

@@ -1,17 +1,14 @@
 <?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:tools="http://schemas.android.com/tools">
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        style="@style/layout_properties_specify_width_geight"
         android:background="@mipmap/icon_uniform_background">
 
         <LinearLayout
             android:id="@+id/layoutHead"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            style="@style/layout_properties_self_adaption"
             android:layout_marginStart="@dimen/divider_65px"
             android:layout_marginTop="@dimen/divider_35px"
             android:gravity="center"
@@ -25,8 +22,7 @@
                 android:background="@mipmap/icon_back" />
 
             <androidx.appcompat.widget.AppCompatTextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                style="@style/layout_properties_self_adaption"
                 android:layout_marginStart="@dimen/divider_14px"
                 android:text="@string/back_pager"
                 android:textColor="@android:color/white"
@@ -37,16 +33,15 @@
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/tvTitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            style="@style/layout_properties_self_adaption"
             android:layout_gravity="center"
             android:layout_marginTop="@dimen/divider_40px"
             android:text="@string/order_list"
             android:textColor="@android:color/white"
             android:textSize="@dimen/divider_34px"
             android:textStyle="bold"
-            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
         <androidx.cardview.widget.CardView
@@ -59,14 +54,13 @@
             app:cardBackgroundColor="@android:color/white"
             app:cardCornerRadius="@dimen/divider_28px"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/tvTitle">
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/rvOrderList"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                style="@style/layout_properties_specify_width_geight"
                 android:layout_marginStart="@dimen/divider_33px"
                 android:layout_marginTop="@dimen/divider_12px"
                 android:layout_marginEnd="@dimen/divider_31px"

+ 8 - 14
workbenches/src/main/res/layout/activity_service_package.xml

@@ -9,8 +9,7 @@
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        style="@style/layout_properties_specify_width_geight"
         android:background="@mipmap/icon_uniform_background">
 
         <LinearLayout
@@ -30,8 +29,7 @@
                 android:background="@mipmap/bg_home" />
 
             <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                style="@style/layout_properties_self_adaption"
                 android:layout_marginStart="@dimen/divider_14px"
                 android:layout_marginTop="@dimen/divider_38px"
                 android:text="@string/home_pager"
@@ -48,13 +46,12 @@
             app:cardBackgroundColor="@android:color/white"
             app:cardCornerRadius="@dimen/divider_39px"
             app:cardElevation="@dimen/divider_4px"
-            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
             <androidx.appcompat.widget.AppCompatTextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                style="@style/layout_properties_self_adaption"
                 android:layout_gravity="center"
                 android:text="@string/service_package"
                 android:textColor="@color/color_FF4974FF"
@@ -65,8 +62,7 @@
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/tvOrderList"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            style="@style/layout_properties_self_adaption"
             android:layout_marginTop="@dimen/divider_42px"
             android:layout_marginEnd="@dimen/divider_49px"
             android:text="@string/order_list"
@@ -86,13 +82,12 @@
             app:cardBackgroundColor="@android:color/white"
             app:cardCornerRadius="@dimen/divider_20px"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/titleLayout">
 
             <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                style="@style/layout_properties_specify_width_geight"
                 android:layout_gravity="center"
                 android:orientation="vertical">
 
@@ -128,8 +123,7 @@
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/rvTrainingPackage"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
+                    style="@style/layout_properties_specify_width_geight"
                     android:layout_marginStart="@dimen/divider_46px"
                     android:layout_marginEnd="@dimen/divider_46px" />
 

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

@@ -7,18 +7,42 @@
         <item name="android:layout_height">wrap_content</item>
     </style>
 
+    <!--自适应高度 居中-->
+    <style name="layout_properties_self_adaption_center" parent="layout_properties_self_adaption" tools:ignore="ResourceName">
+        <item name="layout_constraintStart_toStartOf">parent</item>
+        <item name="layout_constraintEnd_toEndOf">parent</item>
+        <item name="layout_constraintTop_toTopOf">parent</item>
+        <item name="layout_constraintBottom_toBottomOf">parent</item>
+    </style>
+
     <!--指定宽度和高度-->
     <style name="layout_properties_specify_width_geight" tools:ignore="ResourceName">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">match_parent</item>
     </style>
 
+    <!--指定宽度和高度-->
+    <style name="layout_properties_specify_width_geight_center" parent="layout_properties_specify_width_geight" tools:ignore="ResourceName">
+        <item name="layout_constraintStart_toStartOf">parent</item>
+        <item name="layout_constraintEnd_toEndOf">parent</item>
+        <item name="layout_constraintTop_toTopOf">parent</item>
+        <item name="layout_constraintBottom_toBottomOf">parent</item>
+    </style>
+
     <!--指定宽度-->
     <style name="layout_properties_specify_width" tools:ignore="ResourceName">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
     </style>
 
+    <!--指定宽度-->
+    <style name="layout_properties_specify_width_center" parent="layout_properties_specify_width" tools:ignore="ResourceName">
+        <item name="layout_constraintStart_toStartOf">parent</item>
+        <item name="layout_constraintEnd_toEndOf">parent</item>
+        <item name="layout_constraintTop_toTopOf">parent</item>
+        <item name="layout_constraintBottom_toBottomOf">parent</item>
+    </style>
+
     <style name="text_personal_center" tools:ignore="ResourceName">
         <item name="android:layout_width">0dp</item>
         <item name="android:layout_height">wrap_content</item>