Browse Source

1.替换UI

王鹏鹏 2 years ago
parent
commit
d3d6eee23d

+ 34 - 30
workbenches/src/main/res/layout/activity_free_train.xml

@@ -6,7 +6,7 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         style="@style/layout_properties_specify_width_geight"
-        android:background="@mipmap/icon_bg_live_broadcast">
+        android:background="@mipmap/icon_uniform_background">
 
         <LinearLayout
             android:id="@+id/layoutHead"
@@ -29,49 +29,53 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/layoutHead" />
 
-        <androidx.constraintlayout.widget.ConstraintLayout
+        <androidx.cardview.widget.CardView
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_marginStart="@dimen/divider_38px"
             android:layout_marginTop="@dimen/divider_18px"
             android:layout_marginEnd="@dimen/divider_18px"
             android:layout_marginBottom="@dimen/divider_18px"
-            android:background="@mipmap/icon_bg_pushmeaage"
+            app:cardBackgroundColor="@color/color_ccffffff"
+            app:cardCornerRadius="@dimen/divider_38px"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/rvTrainType"
             app:layout_constraintTop_toTopOf="parent">
 
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/tvTitle"
-                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_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+            <androidx.constraintlayout.widget.ConstraintLayout style="@style/layout_properties_specify_width_geight">
 
-            <com.scwang.smartrefresh.layout.SmartRefreshLayout
-                android:id="@+id/freeTrainSwipe"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/tvTitle">
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/tvTitle"
+                    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_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
 
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/rvTrain"
-                    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" />
+                <com.scwang.smartrefresh.layout.SmartRefreshLayout
+                    android:id="@+id/freeTrainSwipe"
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/tvTitle">
 
-            </com.scwang.smartrefresh.layout.SmartRefreshLayout>
-        </androidx.constraintlayout.widget.ConstraintLayout>
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/rvTrain"
+                        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" />
+
+                </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </androidx.cardview.widget.CardView>
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </layout>

+ 29 - 25
workbenches/src/main/res/layout/activity_leisure_brain.xml

@@ -6,7 +6,7 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         style="@style/layout_properties_specify_width_geight"
-        android:background="@mipmap/icon_bg_live_broadcast">
+        android:background="@mipmap/icon_uniform_background">
 
         <LinearLayout
             android:id="@+id/layoutHead"
@@ -30,42 +30,46 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/layoutHead" />
 
-        <androidx.constraintlayout.widget.ConstraintLayout
+        <androidx.cardview.widget.CardView
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_marginStart="@dimen/divider_38px"
             android:layout_marginTop="@dimen/divider_18px"
             android:layout_marginEnd="@dimen/divider_18px"
             android:layout_marginBottom="@dimen/divider_18px"
-            android:background="@mipmap/icon_bg_pushmeaage"
+            app:cardBackgroundColor="@color/color_ccffffff"
+            app:cardCornerRadius="@dimen/divider_38px"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/rvLeisureBrainType"
             app:layout_constraintTop_toTopOf="parent">
 
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/tvTitle"
-                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_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+            <androidx.constraintlayout.widget.ConstraintLayout style="@style/layout_properties_specify_width_geight">
 
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/rvLeisureBrain"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_margin="@dimen/divider_28px"
-                android:layout_marginTop="@dimen/divider_8px"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/tvTitle" />
-        </androidx.constraintlayout.widget.ConstraintLayout>
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/tvTitle"
+                    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_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/rvLeisureBrain"
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_margin="@dimen/divider_28px"
+                    android:layout_marginTop="@dimen/divider_8px"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/tvTitle" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </androidx.cardview.widget.CardView>
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </layout>

+ 1 - 0
workbenches/src/main/res/values/colors.xml

@@ -63,4 +63,5 @@
     <color name="color_ddfbe01" tools:ignore="ResourceName">#ddfbe0</color>
     <color name="color_cdf4f7" tools:ignore="ResourceName">#cdf4f7</color>
     <color name="color_0a374a" tools:ignore="ResourceName">#0a374a</color>
+    <color name="color_ccffffff" tools:ignore="ResourceName">#ccffffff</color>
 </resources>