Pārlūkot izejas kodu

1.优化布局UI

王鹏鹏 2 gadi atpakaļ
vecāks
revīzija
2921b0cef8

+ 7 - 11
workbenches/src/main/res/layout/activity_free_train.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"
@@ -56,8 +54,8 @@
             app:cardBackgroundColor="@android:color/white"
             app:cardCornerRadius="@dimen/divider_38px"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@id/rvTrainType"
             app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/rvTrainType"
             app:layout_constraintTop_toTopOf="parent">
 
             <androidx.constraintlayout.widget.ConstraintLayout
@@ -66,15 +64,14 @@
 
                 <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"
                     android:textSize="@dimen/divider_42px"
                     android:textStyle="bold"
-                    app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
                 <com.scwang.smartrefresh.layout.SmartRefreshLayout
@@ -82,14 +79,13 @@
                     android:layout_width="match_parent"
                     android:layout_height="0dp"
                     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/rvTrain"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
+                        style="@style/layout_properties_specify_width_geight"
                         android:layout_marginStart="@dimen/divider_16px"
                         android:layout_marginTop="@dimen/divider_8px"
                         android:layout_marginBottom="@dimen/divider_8px" />

+ 6 - 7
workbenches/src/main/res/layout/item_training_content.xml

@@ -13,8 +13,7 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/contentLayout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        style="@style/layout_properties_specify_width"
         android:minHeight="@dimen/divider_112px">
 
         <androidx.appcompat.widget.AppCompatTextView
@@ -22,9 +21,9 @@
             style="@style/item_training_content_appcompattextview"
             android:gravity="center_horizontal"
             android:text="@{data.taskStartTime}"
+            app:layout_constraintEnd_toStartOf="@id/tvExerciseTherapy"
             app:layout_constraintHorizontal_weight="1"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/tvExerciseTherapy"
             tools:ignore="MissingConstraints" />
 
         <androidx.appcompat.widget.AppCompatTextView
@@ -32,18 +31,18 @@
             style="@style/item_training_content_appcompattextview"
             android:gravity="center_horizontal"
             android:text="@{data.taskName}"
+            app:layout_constraintEnd_toStartOf="@id/tvTrainingProgress"
             app:layout_constraintHorizontal_weight="1"
             app:layout_constraintStart_toEndOf="@id/tvDate"
-            app:layout_constraintEnd_toStartOf="@id/tvTrainingProgress"
             tools:ignore="MissingConstraints" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/tvTrainingProgress"
             style="@style/item_training_content_appcompattextview"
             android:gravity="center_horizontal"
+            app:layout_constraintEnd_toStartOf="@id/tvCognitiveTraining"
             app:layout_constraintHorizontal_weight="1"
             app:layout_constraintStart_toEndOf="@id/tvExerciseTherapy"
-            app:layout_constraintEnd_toStartOf="@id/tvCognitiveTraining"
             tools:ignore="MissingConstraints" />
 
         <androidx.appcompat.widget.AppCompatTextView
@@ -51,9 +50,9 @@
             style="@style/item_training_content_appcompattextview"
             android:layout_marginStart="@dimen/divider_32px"
             android:text="@{data.gameNames}"
+            app:layout_constraintEnd_toStartOf="@id/tvDetail"
             app:layout_constraintHorizontal_weight="2"
             app:layout_constraintStart_toEndOf="@id/tvTrainingProgress"
-            app:layout_constraintEnd_toStartOf="@id/tvDetail"
             tools:ignore="MissingConstraints" />
 
         <androidx.appcompat.widget.AppCompatTextView
@@ -63,9 +62,9 @@
             android:gravity="center_horizontal"
             android:text="@string/detail"
             android:textColor="@color/color_FF383838"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_weight="1"
             app:layout_constraintStart_toEndOf="@id/tvCognitiveTraining"
-            app:layout_constraintEnd_toEndOf="parent"
             tools:ignore="MissingConstraints" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>

+ 3 - 5
workbenches/src/main/res/layout/item_training_content_details.xml

@@ -12,19 +12,17 @@
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        style="@style/layout_properties_specify_width"
         android:minHeight="@dimen/divider_112px">
 
         <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            style="@style/layout_properties_self_adaption"
             android:text="@{data.gameNames}"
             android:textColor="@color/color_FF4A76FF"
             android:textSize="@dimen/divider_26px"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>

+ 1 - 2
workbenches/src/main/res/layout/spinner_list_item.xml

@@ -1,8 +1,7 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/text_view_spinner"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    style="@style/layout_properties_specify_width_geight"
     android:layout_gravity="start|center_vertical"
     android:ellipsize="marquee"
     android:gravity="start|center_vertical"